diff options
394 files changed, 1441 insertions, 1441 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp index 6048e871..04eb0be7 100644 --- a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp +++ b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp @@ -58,7 +58,7 @@ DictManager::~DictManager() { void DictManager::handleUnsupportedWidget(const TQString & s, TQWidget* w) { w->setEnabled(false); - TQToolTip::add(w,i18n("The option <em>%1</em> is not supported by your Samba version").tqarg(s)); + TQToolTip::add(w,i18n("The option <em>%1</em> is not supported by your Samba version").arg(s)); } void DictManager::add(const TQString & key, TQLineEdit* lineEdit) { diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index 31a642ff..09252315 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -91,7 +91,7 @@ KFileItem* HiddenListViewItem::getFileItem() } -void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg = cg; @@ -101,7 +101,7 @@ void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int col if (isOn(COL_HIDDEN)) _cg.setColor(TQColorGroup::Text,gray); - QMultiCheckListItem::paintCell(p, _cg, column, width, tqalignment); + QMultiCheckListItem::paintCell(p, _cg, column, width, alignment); } @@ -404,7 +404,7 @@ void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQ // TODO remove <b></b> and use <qt> instead int result = KMessageBox::questionYesNo(_dlg,i18n( "<b></b>Some files you have selected are matched by the wildcarded string <b>'%1'</b>; " - "do you want to uncheck all files matching <b>'%1'</b>?").tqarg(rx->pattern()).tqarg(rx->pattern()).tqarg(rx->pattern()), + "do you want to uncheck all files matching <b>'%1'</b>?").arg(rx->pattern()).arg(rx->pattern()).arg(rx->pattern()), i18n("Wildcarded String"),i18n("Uncheck Matches"),i18n("Keep Selected")); TQPtrList<HiddenListViewItem> lst = getMatchingItems( *rx ); @@ -519,7 +519,7 @@ void HiddenFileView::updateView() item->setOn(COL_VETO_OPLOCK,matchVetoOplock(item->text(0))); } - _dlg->hiddenListView->tqrepaint(); + _dlg->hiddenListView->repaint(); } diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h index 27bd7c7b..58e0e056 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h @@ -47,7 +47,7 @@ public: HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden, bool veto, bool vetoOplock ); ~HiddenListViewItem(); - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); KFileItem* getFileItem(); protected: diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index 8b386a4d..df9a6bd3 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -370,7 +370,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> <property name="indent"> @@ -584,7 +584,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="text"> <string>For detailed help about every option please look at:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -4607,7 +4607,7 @@ Only change something if you know what you are doing.</string> <property name="text"> <string>Oplock break &wait time:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui index 200f9eaa..069059bc 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui @@ -25,7 +25,7 @@ <property name='name'> <cstring>KcmPrinterDlg</cstring> </property> - <property name='tqgeometry'> + <property name='geometry'> <rect> <x>0</x> <y>0</y> diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 26b3a194..332f063c 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -1102,7 +1102,7 @@ void KcmSambaConf::joinADomainBtnClicked() { dlg->usernameEdit->text(), dlg->passwordEdit->text())) { - KMessageBox::sorry(0,i18n("Joining the domain %1 failed.").tqarg(dlg->domainEdit->text())); + KMessageBox::sorry(0,i18n("Joining the domain %1 failed.").arg(dlg->domainEdit->text())); } } delete dlg; @@ -1172,7 +1172,7 @@ void KcmSambaConf::addSambaUserBtnClicked() TQCString password; int passResult = KPasswordDialog::getNewPassword(password, - i18n("<qt>Please enter a password for the user <b>%1</b></qt>").tqarg(user.name)); + i18n("<qt>Please enter a password for the user <b>%1</b></qt>").arg(user.name)); if (passResult != KPasswordDialog::Accepted) { list.remove(item); continue; @@ -1180,7 +1180,7 @@ void KcmSambaConf::addSambaUserBtnClicked() if (!passwd.addUser(user,password)) { - KMessageBox::sorry(0,i18n("<qt>Adding the user <b>%1</b> to the Samba user database failed.</qt>").tqarg(user.name)); + KMessageBox::sorry(0,i18n("<qt>Adding the user <b>%1</b> to the Samba user database failed.</qt>").arg(user.name)); break; } @@ -1211,7 +1211,7 @@ void KcmSambaConf::removeSambaUserBtnClicked() SambaUser user( item->text(0), item->text(1).toInt() ); if (!passwd.removeUser(user)) { - KMessageBox::sorry(0,i18n("Removing the user %1 from the Samba user database failed.").tqarg(user.name)); + KMessageBox::sorry(0,i18n("Removing the user %1 from the Samba user database failed.").arg(user.name)); continue; } @@ -1235,13 +1235,13 @@ void KcmSambaConf::sambaUserPasswordBtnClicked() TQCString password; int passResult = KPasswordDialog::getNewPassword(password, - i18n("Please enter a password for the user %1").tqarg(user.name)); + i18n("Please enter a password for the user %1").arg(user.name)); if (passResult != KPasswordDialog::Accepted) return; if (!passwd.changePassword(user,password)) { - KMessageBox::sorry(0,i18n("Changing the password of the user %1 failed.").tqarg(user.name)); + KMessageBox::sorry(0,i18n("Changing the password of the user %1 failed.").arg(user.name)); } else { static_cast<QMultiCheckListItem*>(item)->setOn(COL_NOPASSWORD,false); } diff --git a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp index 5bac2fdf..83ea5180 100644 --- a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp +++ b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp @@ -115,7 +115,7 @@ bool LinuxPermissionChecker::checkPublicPermissions() { 0L,i18n( "<qt>You have specified <b>public read access</b> for this directory, but " "the guest account <b>%1</b> does not have the necessary read permissions;<br>" - "do you want to continue anyway?</qt>").tqarg(guestAccount) + "do you want to continue anyway?</qt>").arg(guestAccount) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_guestAccountHasNoReadPermissionsWarning")) @@ -129,7 +129,7 @@ bool LinuxPermissionChecker::checkPublicPermissions() { 0L,i18n( "<qt>You have specified <b>public write access</b> for this directory, but " "the guest account <b>%1</b> does not have the necessary write permissions;<br>" - "do you want to continue anyway?</qt>").tqarg(guestAccount) + "do you want to continue anyway?</qt>").arg(guestAccount) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_guestAccountHasNoWritePermissionsWarning")) @@ -166,7 +166,7 @@ bool LinuxPermissionChecker::checkUserWritePermissions(const TQString & user, bo 0L,i18n( "<qt>You have specified <b>write access</b> to the user <b>%1</b> for this directory, but " "the user does not have the necessary write permissions;<br>" - "do you want to continue anyway?</qt>").tqarg(user) + "do you want to continue anyway?</qt>").arg(user) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_userHasNoWritePermissionsWarning")) @@ -189,7 +189,7 @@ bool LinuxPermissionChecker::checkUserReadPermissions(const TQString & user, boo 0L,i18n( "<qt>You have specified <b>read access</b> to the user <b>%1</b> for this directory, but " "the user does not have the necessary read permissions;<br>" - "do you want to continue anyway?</qt>").tqarg(user) + "do you want to continue anyway?</qt>").arg(user) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_userHasNoReadPermissionsWarning")) diff --git a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp index 1600aa7c..187289b6 100644 --- a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp +++ b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp @@ -53,7 +53,7 @@ void QMultiCheckListItem::setOn(int column, bool b) { checkStates.setBit(column,b); checkBoxColumns.setBit(column); kdDebug(5009) << "setOn : " << column << endl; - tqrepaint(); + repaint(); } bool QMultiCheckListItem::isOn(int column) { @@ -74,7 +74,7 @@ void QMultiCheckListItem::toggle(int column) { checkStates.toggleBit(column); emit stateChanged(column,checkStates.testBit(column)); - tqrepaint(); + repaint(); } void QMultiCheckListItem::setDisabled(int column, bool b) { @@ -83,8 +83,8 @@ void QMultiCheckListItem::setDisabled(int column, bool b) { } disableStates.setBit(column,b); -// KMessageBox::information(0L,TQString("setDisabled"),TQString("disable %1 ").tqarg(column)); - tqrepaint(); +// KMessageBox::information(0L,TQString("setDisabled"),TQString("disable %1 ").arg(column)); + repaint(); } void QMultiCheckListItem::paintCell(TQPainter *p,const TQColorGroup & cg, int col, int width, int align) diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 2ee7f03e..ca0d86b8 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -174,14 +174,14 @@ bool SambaFile::slotApply() kdDebug(5009) << "SambaFile::slotApply: is local file!" << endl; TQString suCommand=TQString("cp %1 %2; rm %3") - .tqarg(_tempFile->name()) - .tqarg(path) - .tqarg(_tempFile->name()); + .arg(_tempFile->name()) + .arg(path) + .arg(_tempFile->name()); proc << "kdesu" << "-d" << suCommand; if (! proc.start(KProcess::Block)) { kdDebug(5009) << "SambaFile::slotApply: saving to " << path << " failed!" << endl; - //KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").tqarg(path)); + //KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").arg(path)); delete _tempFile; _tempFile = 0; return false; @@ -506,7 +506,7 @@ bool SambaFile::openFile() { TQFile f(localPath); if (!f.open(IO_ReadOnly)) { - //throw SambaFileLoadException(TQString("<qt>Could not open file <em>%1</em> for reading.</qt>").tqarg(path)); + //throw SambaFileLoadException(TQString("<qt>Could not open file <em>%1</em> for reading.</qt>").arg(path)); return false; } diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp index 3805429b..46a8bc8b 100644 --- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp @@ -72,7 +72,7 @@ void SmbConfConfigWidget::btnPressed() { if (smbConf.isEmpty()) return; if ( ! TQFileInfo(smbConf).isReadable() ) { - KMessageBox::sorry(this,i18n("<qt>The file <i>%1</i> could not be read.</qt>").tqarg(smbConf),i18n("Could Not Read File")); + KMessageBox::sorry(this,i18n("<qt>The file <i>%1</i> could not be read.</qt>").arg(smbConf),i18n("Could Not Read File")); return; } diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui index 1851fad6..4fa41052 100644 --- a/filesharing/advanced/nfs/hostprops.ui +++ b/filesharing/advanced/nfs/hostprops.ui @@ -302,7 +302,7 @@ Early NFS client implementations did not send credentials with lock requests, an <property name="title"> <string>User Mapping</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> <vbox> diff --git a/filesharing/advanced/nfs/nfsentry.cpp b/filesharing/advanced/nfs/nfsentry.cpp index b54a3169..397e19b4 100644 --- a/filesharing/advanced/nfs/nfsentry.cpp +++ b/filesharing/advanced/nfs/nfsentry.cpp @@ -125,10 +125,10 @@ TQString NFSHost::paramString() const if (!hide) s+="nohide,"; if (anongid!=65534) - s+=TQString("anongid=%1,").tqarg(anongid); + s+=TQString("anongid=%1,").arg(anongid); if (anonuid!=65534) - s+=TQString("anonuid=%1,").tqarg(anonuid); + s+=TQString("anonuid=%1,").arg(anonuid); // get rid of the last ',' s.truncate(s.length()-1); diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp index ebc33a9c..c61a393c 100644 --- a/filesharing/advanced/nfs/nfsfile.cpp +++ b/filesharing/advanced/nfs/nfsfile.cpp @@ -241,8 +241,8 @@ bool NFSFile::save() KProcIO proc; TQString command = TQString("cp %1 %2") - .tqarg(KProcess::quote( tempFile.name() )) - .tqarg(KProcess::quote( _url.path() )); + .arg(KProcess::quote( tempFile.name() )) + .arg(KProcess::quote( _url.path() )); if (restartNFSServer) command +=";exportfs -ra"; diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp index c4c1002d..c6bc1e20 100644 --- a/filesharing/advanced/nfs/nfshostdlg.cpp +++ b/filesharing/advanced/nfs/nfshostdlg.cpp @@ -156,14 +156,14 @@ bool NFSHostDlg::saveName(NFSHost* host) { TQString name = m_gui->nameEdit->text().stripWhiteSpace(); if (name.isEmpty()) { KMessageBox::sorry(this, - i18n("Please enter a hostname or an IP address.").tqarg(name), + i18n("Please enter a hostname or an IP address.").arg(name), i18n("No Hostname/IP-Address")); m_gui->nameEdit->setFocus(); return false; } else { NFSHost* host2 = m_nfsEntry->getHostByName(name); if (host2 && host2 != host) { - KMessageBox::sorry(this,i18n("The host '%1' already exists.").tqarg(name), + KMessageBox::sorry(this,i18n("The host '%1' already exists.").arg(name), i18n("Host Already Exists")); m_gui->nameEdit->setFocus(); return false; diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp index 24efa0e5..d0f23a07 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp +++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp @@ -211,15 +211,15 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool if (nfsNeedsKDEsu) { nfsFile->saveTo(nfsTempFile.name()); command += TQString("cp %1 %2;exportfs -ra;") - .tqarg(KProcess::quote( nfsTempFile.name() )) - .tqarg(KProcess::quote( nfsFileName )); + .arg(KProcess::quote( nfsTempFile.name() )) + .arg(KProcess::quote( nfsFileName )); } if (sambaNeedsKDEsu) { sambaFile->saveTo(sambaTempFile.name()); command += TQString("cp %1 %2;") - .tqarg(KProcess::quote( sambaTempFile.name() )) - .tqarg(KProcess::quote( sambaFileName )); + .arg(KProcess::quote( sambaTempFile.name() )) + .arg(KProcess::quote( sambaFileName )); } proc<<"kdesu" << "-d" << "-c"<<command; @@ -527,7 +527,7 @@ bool PropertiesPage::updateSambaShare() { SambaShare* otherShare = m_sambaFile->getShare(sambaNameEdit->text()); if (otherShare && otherShare != m_sambaShare) { // There is another Share with the same name - KMessageBox::sorry(this, i18n("<qt>There is already a share with the name <strong>%1</strong>.<br> Please choose another name.</qt>").tqarg(sambaNameEdit->text())); + KMessageBox::sorry(this, i18n("<qt>There is already a share with the name <strong>%1</strong>.<br> Please choose another name.</qt>").arg(sambaNameEdit->text())); sambaNameEdit->selectAll(); sambaNameEdit->setFocus(); return false; diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui index fad303c4..c9fa3f12 100644 --- a/filesharing/simple/controlcenter.ui +++ b/filesharing/simple/controlcenter.ui @@ -29,7 +29,7 @@ <property name="text"> <string>SMB and NFS servers are not installed on this machine, to enable this module the servers must be installed.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -112,7 +112,7 @@ <property name="text"> <string>Enable simple sharing to allow users to share folders from their HOME folder, without knowing the root password.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -177,7 +177,7 @@ <property name="text"> <string>Enable advanced sharing to allow users to share any folders, as long as they have write access to the needed configuration files, or they know the root password.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 22d0a17e..2a81f704 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -299,7 +299,7 @@ void KFileShareConfig::save() if ( ! file.open(IO_WriteOnly)) { KMessageBox::detailedError(this, i18n("Could not save settings."), - i18n("Could not open file '%1' for writing: %2").tqarg(FILESHARECONF).tqarg( + i18n("Could not open file '%1' for writing: %2").arg(FILESHARECONF).arg( file.errorString() ), i18n("Saving Failed")); return; diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp index 1efe2baa..a57d0f79 100644 --- a/filesharing/simple/groupconfigdlg.cpp +++ b/filesharing/simple/groupconfigdlg.cpp @@ -128,7 +128,7 @@ void GroupConfigDlg::slotAddUser() { if (allUsers.count()==0) { KMessageBox::information(this, i18n("All users are in the %1 group already.") - .tqarg(m_fileShareGroup.name())); + .arg(m_fileShareGroup.name())); return; } @@ -173,7 +173,7 @@ bool GroupConfigDlg::addUser(const KUser & user, const KUserGroup & group) { groups.append(group); if (!userMod(user.loginName(),groups)) { KMessageBox::sorry(this,i18n("Could not add user '%1' to group '%2'") - .tqarg(user.loginName()).tqarg(group.name())); + .arg(user.loginName()).arg(group.name())); return false; } return true; @@ -185,7 +185,7 @@ bool GroupConfigDlg::removeUser(const KUser & user, const KUserGroup & group) { groups.remove(group); if (!userMod(user.loginName(),groups)) { KMessageBox::sorry(this,i18n("Could not remove user '%1' from group '%2'") - .tqarg(user.loginName()).tqarg(group.name())); + .arg(user.loginName()).arg(group.name())); return false; } return true; @@ -333,9 +333,9 @@ void GroupConfigDlg::setFileShareGroup(const KUserGroup & group) { updateListBox(); m_gui->groupUsersRadio->setText( i18n("Only users of the '%1' group are allowed to share folders") - .tqarg(m_fileShareGroup.name())); + .arg(m_fileShareGroup.name())); m_gui->usersGrpBx->setTitle(i18n("Users of '%1' Group") - .tqarg(m_fileShareGroup.name())); + .arg(m_fileShareGroup.name())); m_gui->otherGroupBtn->setText(i18n("Change Group...")); m_gui->usersGrpBx->show(); } else { @@ -360,7 +360,7 @@ bool GroupConfigDlg::addUsersToGroup(TQValueList<KUser> users,const KUserGroup & bool GroupConfigDlg::emptyGroup(const TQString & s) { if (KMessageBox::No == KMessageBox::questionYesNo(this, - i18n("Do you really want to remove all users from group '%1'?").tqarg(s), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel())) { + i18n("Do you really want to remove all users from group '%1'?").arg(s), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel())) { return false; } @@ -377,7 +377,7 @@ bool GroupConfigDlg::emptyGroup(const TQString & s) { bool GroupConfigDlg::deleteGroup(const TQString & s) { if (KMessageBox::No == KMessageBox::questionYesNo(this, - i18n("Do you really want to delete group '%1'?").tqarg(s), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel())) { + i18n("Do you really want to delete group '%1'?").arg(s), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel())) { return false; } @@ -385,7 +385,7 @@ bool GroupConfigDlg::deleteGroup(const TQString & s) { proc << "groupdel" << s; bool result = proc.start(KProcess::Block) && proc.normalExit(); if (!result) { - KMessageBox::sorry(this,i18n("Deleting group '%1' failed.").tqarg(s)); + KMessageBox::sorry(this,i18n("Deleting group '%1' failed.").arg(s)); } return result; @@ -398,7 +398,7 @@ bool GroupConfigDlg::createFileShareGroup(const TQString & s) { } if (KMessageBox::No == KMessageBox::questionYesNo(this, - i18n("This group '%1' does not exist. Should it be created?").tqarg(s), TQString(), i18n("Create"), i18n("Do Not Create"))) + i18n("This group '%1' does not exist. Should it be created?").arg(s), TQString(), i18n("Create"), i18n("Do Not Create"))) return false; //debug("CreateFileShareGroup: "+s); @@ -406,7 +406,7 @@ bool GroupConfigDlg::createFileShareGroup(const TQString & s) { proc << "groupadd" << s; bool result = proc.start(KProcess::Block) && proc.normalExit(); if (!result) { - KMessageBox::sorry(this,i18n("Creation of group '%1' failed.").tqarg(s)); + KMessageBox::sorry(this,i18n("Creation of group '%1' failed.").arg(s)); } else { setFileShareGroup(KUserGroup(s)); } diff --git a/kdict/dict.cpp b/kdict/dict.cpp index 8e55061c..a58af6f6 100644 --- a/kdict/dict.cpp +++ b/kdict/dict.cpp @@ -204,12 +204,12 @@ void DictAsyncClient::define() job->result = TQString(); if (job->numFetched == 0) { resultAppend("<body>\n<p class=\"heading\">\n"); - resultAppend(i18n("No definitions found for \'%1'.").tqarg(job->query)); + resultAppend(i18n("No definitions found for \'%1'.").arg(job->query)); resultAppend("</p>\n</html></body>"); } else { // html header... resultAppend("<body>\n<p class=\"heading\">\n"); - resultAppend(i18n("No definitions found for \'%1\'. Perhaps you mean:").tqarg(job->query)); + resultAppend(i18n("No definitions found for \'%1\'. Perhaps you mean:").arg(job->query)); resultAppend("</p>\n<table width=\"100%\" cols=2>\n"); TQString lastDb; @@ -591,7 +591,7 @@ void DictAsyncClient::showDbInfo() // html header... resultAppend("<body>\n<p class=\"heading\">\n"); - resultAppend(i18n("Database Information [%1]:").tqarg(job->query)); + resultAppend(i18n("Database Information [%1]:").arg(job->query)); resultAppend("</p>\n<pre><p class=\"definition\">\n"); bool done(false); @@ -1407,7 +1407,7 @@ void DictInterface::clientDone() message = i18n("One definition found"); break; default: - message = i18n("%1 definitions found").tqarg(job->numFetched); + message = i18n("%1 definitions found").arg(job->numFetched); } } else { switch (job->numFetched) { @@ -1418,7 +1418,7 @@ void DictInterface::clientDone() message = i18n(" One definition fetched "); break; default: - message = i18n(" %1 definitions fetched ").tqarg(job->numFetched); + message = i18n(" %1 definitions fetched ").arg(job->numFetched); } } emit stopped(message); @@ -1433,7 +1433,7 @@ void DictInterface::clientDone() message = i18n(" One matching definition found "); break; default: - message = i18n(" %1 matching definitions found ").tqarg(job->numFetched); + message = i18n(" %1 matching definitions found ").arg(job->numFetched); } emit stopped(message); emit matchReady(job->matches); @@ -1451,17 +1451,17 @@ void DictInterface::clientDone() errMsg += job->result; break; case JobData::ErrTimeout: - errMsg = i18n("A delay occurred which exceeded the\ncurrent timeout limit of %1 seconds.\nYou can modify this limit in the Preferences Dialog.").tqarg(global->timeout); + errMsg = i18n("A delay occurred which exceeded the\ncurrent timeout limit of %1 seconds.\nYou can modify this limit in the Preferences Dialog.").arg(global->timeout); break; case JobData::ErrBadHost: - errMsg = i18n("Unable to connect to:\n%1:%2\n\nCannot resolve hostname.").tqarg(job->server).tqarg(job->port); + errMsg = i18n("Unable to connect to:\n%1:%2\n\nCannot resolve hostname.").arg(job->server).arg(job->port); break; case JobData::ErrConnect: - errMsg = i18n("Unable to connect to:\n%1:%2\n\n").tqarg(job->server).tqarg(job->port); + errMsg = i18n("Unable to connect to:\n%1:%2\n\n").arg(job->server).arg(job->port); errMsg += job->result; break; case JobData::ErrRefused: - errMsg = i18n("Unable to connect to:\n%1:%2\n\nThe server refused the connection.").tqarg(job->server).tqarg(job->port); + errMsg = i18n("Unable to connect to:\n%1:%2\n\nThe server refused the connection.").arg(job->server).arg(job->port); break; case JobData::ErrNotAvailable: errMsg = i18n("The server is temporarily unavailable."); @@ -1488,7 +1488,7 @@ void DictInterface::clientDone() errMsg = i18n("No strategies available."); break; case JobData::ErrServerError: - errMsg = i18n("The server sent an unexpected reply:\n\"%1\"\nThis shouldn't happen, please consider\nwriting a bug report").tqarg(job->result); + errMsg = i18n("The server sent an unexpected reply:\n\"%1\"\nThis shouldn't happen, please consider\nwriting a bug report").arg(job->result); break; case JobData::ErrMsgTooLong: errMsg = i18n("The server sent a response with a text line\nthat was too long.\n(RFC 2229: max. 1024 characters/6144 octets)"); diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp index f49a4c7f..7d7ea958 100644 --- a/kdict/matchview.cpp +++ b/kdict/matchview.cpp @@ -96,14 +96,14 @@ void MatchViewItem::setOpen(bool o) } -void MatchViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void MatchViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { if(command.isEmpty()) { TQFont font=p->font(); font.setBold(true); p->setFont(font); } - TQListViewItem::paintCell(p,cg,column,width,tqalignment); + TQListViewItem::paintCell(p,cg,column,width,alignment); } @@ -310,7 +310,7 @@ void MatchView::doGet(TQStringList &defines) if (defines.count() > 0) { if (defines.count() > global->maxDefinitions) { KMessageBox::sorry(global->topLevel,i18n("You have selected %1 definitions,\nbut Kdict will fetch only the first %2 definitions.\nYou can modify this limit in the Preferences Dialog.") - .tqarg(defines.count()).tqarg(global->maxDefinitions)); + .arg(defines.count()).arg(global->maxDefinitions)); while (defines.count()>global->maxDefinitions) defines.pop_back(); } @@ -368,7 +368,7 @@ void MatchView::newList(const TQStringList &matches) } w_list->setUpdatesEnabled(true); - w_list->tqrepaint(); + w_list->repaint(); w_list->setFocus(); } diff --git a/kdict/matchview.h b/kdict/matchview.h index 5a459e34..3e7e9f7e 100644 --- a/kdict/matchview.h +++ b/kdict/matchview.h @@ -35,7 +35,7 @@ public: ~MatchViewItem(); void setOpen(bool o); - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); TQString command; TQStringList subEntrys; diff --git a/kdict/options.cpp b/kdict/options.cpp index de10606d..efb5f962 100644 --- a/kdict/options.cpp +++ b/kdict/options.cpp @@ -104,7 +104,7 @@ void GlobalData::read() f_onts[Fheadings]=config->readFontEntry("headingsFont",&defFont); f_ontNames[Fheadings]=i18n("Headings"); - // tqgeometry... + // geometry... config->setGroup("Geometry"); TQSize invalid(-1,-1); optSize = config->readSizeEntry("Opt_Size",&invalid); @@ -449,7 +449,7 @@ int OptionsDialog::ColorListItem::width(const TQListBox *lb ) const OptionsDialog::FontListItem::FontListItem( const TQString &name, const TQFont &font ) : TQListBoxText(name), f_ont(font) { - fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize()); + fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize()); } @@ -461,7 +461,7 @@ OptionsDialog::FontListItem::~FontListItem() void OptionsDialog::FontListItem::setFont(const TQFont &font) { f_ont = font; - fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize()); + fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize()); } @@ -869,7 +869,7 @@ void OptionsDialog::slotColDefaultBtnClicked() colorItem->setColor(global->defaultColor(i)); } c_List->triggerUpdate(true); - c_List->tqrepaint(true); + c_List->repaint(true); } diff --git a/kdict/options.h b/kdict/options.h index a1b2745e..1137caf8 100644 --- a/kdict/options.h +++ b/kdict/options.h @@ -74,7 +74,7 @@ public: bool defineClipboard; // define clipboard content on startup? - TQSize optSize,setsSize,matchSize; // window tqgeometry + TQSize optSize,setsSize,matchSize; // window geometry bool showMatchList; TQValueList<int> splitterSizes; diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index 3b0cf9e3..81761e2e 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -74,7 +74,7 @@ TQFile* SaveHelper::getFile(const TQString &dialogTitle) if (url.isLocalFile()) { if (TQFileInfo(url.path()).exists() && (KMessageBox::warningContinueCancel(global->topLevel, - i18n("A file named %1 already exists.\nDo you want to replace it?").tqarg(url.path()), + i18n("A file named %1 already exists.\nDo you want to replace it?").arg(url.path()), dialogTitle, i18n("&Replace")) != KMessageBox::Continue)) { return 0; } @@ -184,11 +184,11 @@ void QueryView::optionsChanged() saveCurrentResultPos(); currentHTMLHeader = TQString("<html><head><style type=\"text/css\">\n"); - currentHTMLHeader += TQString("body { background-color:%1; color:%2; }\n").tqarg(global->backgroundColor().name()).tqarg(global->textColor().name()); - currentHTMLHeader += TQString("a:link, a:active { color:%1; text-decoration:none; }\n").tqarg(global->linksColor().name()); - currentHTMLHeader += TQString("a:visited { color:%1; text-decoration:none; }\n").tqarg(global->visitedLinksColor().name()); - currentHTMLHeader += TQString("a:hover { color:%1; text-decoration:underline; }\n").tqarg(global->linksColor().name()); - currentHTMLHeader += TQString("p.heading { margin-left:0mm; margin-top:2mm; margin-bottom:2mm; padding:1mm; background-color:%1; color:%2; font-family:%3; font-size:%4pt; ").tqarg(global->headingsBackgroundColor().name()).tqarg(global->headingsTextColor().name()).tqarg(global->headingsFont().family()).tqarg(global->headingsFont().pointSize()); + currentHTMLHeader += TQString("body { background-color:%1; color:%2; }\n").arg(global->backgroundColor().name()).arg(global->textColor().name()); + currentHTMLHeader += TQString("a:link, a:active { color:%1; text-decoration:none; }\n").arg(global->linksColor().name()); + currentHTMLHeader += TQString("a:visited { color:%1; text-decoration:none; }\n").arg(global->visitedLinksColor().name()); + currentHTMLHeader += TQString("a:hover { color:%1; text-decoration:underline; }\n").arg(global->linksColor().name()); + currentHTMLHeader += TQString("p.heading { margin-left:0mm; margin-top:2mm; margin-bottom:2mm; padding:1mm; background-color:%1; color:%2; font-family:%3; font-size:%4pt; ").arg(global->headingsBackgroundColor().name()).arg(global->headingsTextColor().name()).arg(global->headingsFont().family()).arg(global->headingsFont().pointSize()); if (global->headingsFont().italic()) currentHTMLHeader += TQString("font-style:italic; "); if (global->headingsFont().bold()) @@ -196,7 +196,7 @@ void QueryView::optionsChanged() currentHTMLHeader += TQString("}\n"); currentHTMLHeader += TQString("p.definition { margin-left:1.5mm; margin-top:2mm; margin-bottom:2mm;}\n"); currentHTMLHeader += TQString("table { margin-left:1.5mm; margin-top:2mm; margin-bottom:2mm;}\n"); - currentHTMLHeader += TQString("pre { font-family:%1; font-size:%2pt; ").tqarg(global->textFont().family()).tqarg(global->textFont().pointSize()); + currentHTMLHeader += TQString("pre { font-family:%1; font-size:%2pt; ").arg(global->textFont().family()).arg(global->textFont().pointSize()); if (global->textFont().italic()) currentHTMLHeader += TQString("font-style:italic; "); if (global->textFont().bold()) @@ -467,7 +467,7 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point) this,TQT_SLOT(browseBack())); else rightBtnMenu->insertItem(SmallIcon("back"), - i18n("&Back: '%1'").tqarg(getShortString(browseList.at(browsePos-1)->queryText,25)), + i18n("&Back: '%1'").arg(getShortString(browseList.at(browsePos-1)->queryText,25)), this,TQT_SLOT(browseBack())); } else { ID = rightBtnMenu->insertItem(SmallIcon("back"), i18n("&Back"), this, TQT_SLOT(browseBack())); @@ -481,7 +481,7 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point) this,TQT_SLOT(browseForward())); else rightBtnMenu->insertItem(SmallIcon("forward"), - i18n("&Forward: '%1'").tqarg(getShortString(browseList.at(browsePos+1)->queryText,25)), + i18n("&Forward: '%1'").arg(getShortString(browseList.at(browsePos+1)->queryText,25)), this,TQT_SLOT(browseForward())); } else { ID = rightBtnMenu->insertItem(SmallIcon("forward"),i18n("&Forward"),this,TQT_SLOT(browseForward())); @@ -569,7 +569,7 @@ void QueryView::updateBrowseActions() if (browseList.at(browsePos-1)->queryText.isEmpty()) actBack->setText(i18n("&Back: Information")); else - actBack->setText(i18n("&Back: '%1'").tqarg(getShortString(browseList.at(browsePos-1)->queryText,25))); + actBack->setText(i18n("&Back: '%1'").arg(getShortString(browseList.at(browsePos-1)->queryText,25))); actBack->popupMenu()->clear(); int i = browsePos-1; @@ -593,7 +593,7 @@ void QueryView::updateBrowseActions() if (browseList.at(browsePos+1)->queryText.isEmpty()) actForward->setText(i18n("&Forward: Information")); else - actForward->setText(i18n("&Forward: '%1'").tqarg(getShortString(browseList.at(browsePos+1)->queryText,25))); + actForward->setText(i18n("&Forward: '%1'").arg(getShortString(browseList.at(browsePos+1)->queryText,25))); actForward->popupMenu()->clear(); int i = browsePos+1; diff --git a/kdict/sets.cpp b/kdict/sets.cpp index 3f043233..51dd7eb6 100644 --- a/kdict/sets.cpp +++ b/kdict/sets.cpp @@ -264,8 +264,8 @@ void DbSetsDialog::activateSet(int num) w_set->clearEdit(); w_delete->setEnabled(false); w_save->setEnabled(false); - w_rightBox->tqrepaint(true); // Workaround for tqrepaint-bug - w_leftBox->tqrepaint(true); // Workaround for tqrepaint-bug + w_rightBox->repaint(true); // Workaround for repaint-bug + w_leftBox->repaint(true); // Workaround for repaint-bug } else { w_set->setCurrentItem(num); for (unsigned int i=0;i<global->serverDatabases.count();i++) @@ -278,9 +278,9 @@ void DbSetsDialog::activateSet(int num) w_delete->setEnabled(true); w_save->setEnabled(true); if (w_rightBox->count()==0) - w_rightBox->tqrepaint(true); // Workaround for tqrepaint-bug + w_rightBox->repaint(true); // Workaround for repaint-bug if (w_leftBox->count()==0) - w_leftBox->tqrepaint(true); // Workaround for tqrepaint-bug + w_leftBox->repaint(true); // Workaround for repaint-bug w_leftBox->clearSelection(); w_leftBox->centerCurrentItem(); w_rightBox->clearSelection(); diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 91070af8..7ac88dba 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -394,12 +394,12 @@ void TopLevel::setupStatusBar() TQString serverInfo; if (global->authEnabled) - serverInfo = TQString(" %1@%2:%3 ").tqarg(getShortString(global->user,50)) - .tqarg(getShortString(global->server,50)) - .tqarg(global->port); + serverInfo = TQString(" %1@%2:%3 ").arg(getShortString(global->user,50)) + .arg(getShortString(global->server,50)) + .arg(global->port); else - serverInfo = TQString(" %1:%3 ").tqarg(getShortString(global->server,50)) - .tqarg(global->port); + serverInfo = TQString(" %1:%3 ").arg(getShortString(global->server,50)) + .arg(global->port); statusBar()->insertItem(serverInfo, 1,3); statusBar()->setItemAlignment(1,AlignLeft | AlignVCenter); } @@ -746,12 +746,12 @@ void TopLevel::optionsChanged() { TQString serverInfo; if (global->authEnabled) - serverInfo = TQString(" %1@%2:%3 ").tqarg(getShortString(global->user,50)) - .tqarg(getShortString(global->server,50)) - .tqarg(global->port); + serverInfo = TQString(" %1@%2:%3 ").arg(getShortString(global->user,50)) + .arg(getShortString(global->server,50)) + .arg(global->port); else - serverInfo = TQString(" %1:%3 ").tqarg(getShortString(global->server,50)) - .tqarg(global->port); + serverInfo = TQString(" %1:%3 ").arg(getShortString(global->server,50)) + .arg(global->port); statusBar()->changeItem(serverInfo,1); interface->serverChanged(); // inform client queryView->optionsChanged(); // inform html-view diff --git a/kfile-plugins/torrent/bdict.cpp b/kfile-plugins/torrent/bdict.cpp index 75bda831..712fd526 100644 --- a/kfile-plugins/torrent/bdict.cpp +++ b/kfile-plugins/torrent/bdict.cpp @@ -188,7 +188,7 @@ bool BDict::writeToDevice(TQIODevice &device) for (key_iter = key_list.begin(); key_iter != key_list.end(); ++key_iter) { TQCString utfString = (*key_iter).utf8(); - TQString str = TQString("%1:").tqarg(utfString.size() - 1); + TQString str = TQString("%1:").arg(utfString.size() - 1); TQCString lenString = str.utf8(); diff --git a/kfile-plugins/torrent/bstring.cpp b/kfile-plugins/torrent/bstring.cpp index 258c97c7..0b40b46a 100644 --- a/kfile-plugins/torrent/bstring.cpp +++ b/kfile-plugins/torrent/bstring.cpp @@ -85,7 +85,7 @@ void BString::init (ByteTape &tape) // Time to copy the data char *textBuffer = tape.at(tape.pos()); - if (!m_data.tqresize(len + 1)) + if (!m_data.resize(len + 1)) return; tqmemmove (m_data.data(), textBuffer, len); diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp index 29d11dc0..a373cc67 100644 --- a/kget/dlgDirectories.cpp +++ b/kget/dlgDirectories.cpp @@ -94,7 +94,7 @@ void DlgDirectories::addEntry() TQDir f(dir); if (!f.exists()) { - KMessageBox::error(this, i18n("Folder does not exist:\n%1").tqarg(dir), i18n("Error")); + KMessageBox::error(this, i18n("Folder does not exist:\n%1").arg(dir), i18n("Error")); return; } @@ -130,7 +130,7 @@ void DlgDirectories::changeEntry() TQDir f(dir); if (!f.exists()) { - KMessageBox::error(this, i18n("Folder does not exist:\n%1").tqarg(dir), i18n("Error")); + KMessageBox::error(this, i18n("Folder does not exist:\n%1").arg(dir), i18n("Error")); return; } diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp index 91b34007..030d3f2f 100644 --- a/kget/dlgIndividual.cpp +++ b/kget/dlgIndividual.cpp @@ -218,13 +218,13 @@ void DlgIndividual::setPercent(unsigned long percent) { m_pProgressBar->setValue(percent); m_pDockIndividual->setValue(percent); - setCaption(i18n("%1% of %2 - %3").tqarg(percent).tqarg(KIO::convertSize(m_iTotalSize)).tqarg(m_location.fileName())); + setCaption(i18n("%1% of %2 - %3").arg(percent).arg(KIO::convertSize(m_iTotalSize)).arg(m_location.fileName())); } void DlgIndividual::setProcessedSize(KIO::filesize_t bytes) { - sizeLabel->setText(i18n("%1 of %2").tqarg(KIO::convertSize(bytes)).tqarg(KIO::convertSize(m_iTotalSize))); + sizeLabel->setText(i18n("%1 of %2").arg(KIO::convertSize(bytes)).arg(KIO::convertSize(m_iTotalSize))); } diff --git a/kget/kfileio.cpp b/kget/kfileio.cpp index 51149baa..59f26af6 100644 --- a/kget/kfileio.cpp +++ b/kget/kfileio.cpp @@ -42,17 +42,17 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose if (!info.exists()) { if (aVerbose) - KMessageBox::error(tqApp->mainWidget(), i18n("The specified file does not exist:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("The specified file does not exist:\n%1").arg(aFileName)); return TQString(); } if (info.isDir()) { if (aVerbose) - KMessageBox::error(tqApp->mainWidget(), i18n("This is a folder and not a file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("This is a folder and not a file:\n%1").arg(aFileName)); return TQString(); } if (!info.isReadable()) { if (aVerbose) - KMessageBox::error(tqApp->mainWidget(), i18n("You do not have read permission for the file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("You do not have read permission for the file:\n%1").arg(aFileName)); return TQString(); } if (len <= 0) @@ -62,13 +62,13 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose if (aVerbose) switch (file.status()) { case IO_ReadError: - KMessageBox::error(tqApp->mainWidget(), i18n("Could not read file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not read file:\n%1").arg(aFileName)); break; case IO_OpenError: - KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file:\n%1").arg(aFileName)); break; default: - KMessageBox::error(tqApp->mainWidget(), i18n("Error while reading file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Error while reading file:\n%1").arg(aFileName)); } return TQString(); } @@ -82,8 +82,8 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose result[len] = '\0'; if (readLen < len) { - TQString msg = i18n("Could only read %1 bytes of %2.").tqarg(KGlobal::locale()->formatNumber(readLen, - 0)).tqarg(KGlobal::locale()->formatNumber(len, 0)); + TQString msg = i18n("Could only read %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(readLen, + 0)).arg(KGlobal::locale()->formatNumber(len, 0)); KMessageBox::error(tqApp->mainWidget(), msg); return TQString(); @@ -107,7 +107,7 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam if (info.exists()) { if (aAskIfExists) { - TQString str = i18n("File %1 exists.\nDo you want to replace it?").tqarg(aFileName); + TQString str = i18n("File %1 exists.\nDo you want to replace it?").arg(aFileName); rc = KMessageBox::questionYesNo(tqApp->mainWidget(), str, TQString(), i18n("Replace"),KStdGuiItem::cancel()); if (rc != KMessageBox::Yes) @@ -124,7 +124,7 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam // failed to rename file if (!aVerbose) return FALSE; - rc = KMessageBox::warningContinueCancel(tqApp->mainWidget(), i18n("Failed to make a backup copy of %1.\nContinue anyway?").tqarg(aFileName)); + rc = KMessageBox::warningContinueCancel(tqApp->mainWidget(), i18n("Failed to make a backup copy of %1.\nContinue anyway?").arg(aFileName)); if (rc != KMessageBox::Continue) return FALSE; } @@ -135,13 +135,13 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam if (aVerbose) switch (file.status()) { case IO_WriteError: - KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").arg(aFileName)); break; case IO_OpenError: - KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file for writing:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not open file for writing:\n%1").arg(aFileName)); break; default: - KMessageBox::error(tqApp->mainWidget(), i18n("Error while writing file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Error while writing file:\n%1").arg(aFileName)); } return FALSE; } @@ -149,11 +149,11 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam writeLen = file.writeBlock(aBuffer, len); if (writeLen < 0) { - KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").tqarg(aFileName)); + KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").arg(aFileName)); return FALSE; } else if (writeLen < len) { - TQString msg = i18n("Could only write %1 bytes of %2.").tqarg(KGlobal::locale()->formatNumber(writeLen, - 0)).tqarg(KGlobal::locale()->formatNumber(len, + TQString msg = i18n("Could only write %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(writeLen, + 0)).arg(KGlobal::locale()->formatNumber(len, 0)); KMessageBox::error(tqApp->mainWidget(), msg); diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp index 69a3cfc1..938ad205 100644 --- a/kget/kget_plug_in/kget_linkview.cpp +++ b/kget/kget_plug_in/kget_linkview.cpp @@ -139,7 +139,7 @@ void KGetLinkView::slotStartLeech() void KGetLinkView::setPageURL( const TQString& url ) { - setPlainCaption( i18n( "Links in: %1 - KGet" ).tqarg( url ) ); + setPlainCaption( i18n( "Links in: %1 - KGet" ).arg( url ) ); } void KGetLinkView::slotSelectAll() diff --git a/kget/kget_plug_in/links.cpp b/kget/kget_plug_in/links.cpp index b1410cef..38392ea0 100644 --- a/kget/kget_plug_in/links.cpp +++ b/kget/kget_plug_in/links.cpp @@ -24,10 +24,10 @@ LinkItem::LinkItem( DOM::Element link ) // somehow getElementsByTagName("#text") doesn't work :( - DOM::NodeList tqchildren = link.childNodes(); - for ( uint i = 0; i < tqchildren.length(); i++ ) + DOM::NodeList children = link.childNodes(); + for ( uint i = 0; i < children.length(); i++ ) { - DOM::Node node = tqchildren.item( i ); + DOM::Node node = children.item( i ); if ( node.nodeType() == DOM::Node::TEXT_NODE ) text.append( node.nodeValue().string() ); } diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index 9e665857..801495b8 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -223,7 +223,7 @@ KMainWidget::KMainWidget(bool bStartDocked) kdock = new DockWidget(this); connect(kdock, TQT_SIGNAL(quitSelected()), TQT_SLOT(slotQuit())); - // Set tqgeometry + // Set geometry if (ksettings.mainPosition.x() != -1) { resize(ksettings.mainSize); move(ksettings.mainPosition); @@ -411,11 +411,11 @@ void KMainWidget::setupGUI() createGUI("kgetui.rc"); // setup statusbar - statusBar()->insertFixedItem(i18n(" Transfers: %1 ").tqarg(99), ID_TOTAL_TRANSFERS); - statusBar()->insertFixedItem(i18n(" Files: %1 ").tqarg(555), ID_TOTAL_FILES); - statusBar()->insertFixedItem(i18n(" Size: %1 KB ").tqarg("134.56"), ID_TOTAL_SIZE); - statusBar()->insertFixedItem(i18n(" Time: %1 ").tqarg(KIO::convertSeconds(0)), ID_TOTAL_TIME); - statusBar()->insertFixedItem(i18n(" %1 KB/s ").tqarg("123.34"), ID_TOTAL_SPEED); + statusBar()->insertFixedItem(i18n(" Transfers: %1 ").arg(99), ID_TOTAL_TRANSFERS); + statusBar()->insertFixedItem(i18n(" Files: %1 ").arg(555), ID_TOTAL_FILES); + statusBar()->insertFixedItem(i18n(" Size: %1 KB ").arg("134.56"), ID_TOTAL_SIZE); + statusBar()->insertFixedItem(i18n(" Time: %1 ").arg(KIO::convertSeconds(0)), ID_TOTAL_TIME); + statusBar()->insertFixedItem(i18n(" %1 KB/s ").arg("123.34"), ID_TOTAL_SPEED); setAutoSaveSettings( "MainWindow", false /*Settings takes care of size & pos & state */ ); @@ -485,7 +485,7 @@ void KMainWidget::setupWhatsThis() tmp = i18n("<b>Auto paste</b> button toggles the auto-paste mode\n" "on and off.\n" "\n" "When set, KGet will periodically scan the clipboard\n" "for URLs and paste them automatically."); m_paAutoPaste->setWhatsThis(tmp); - tmp = i18n("<b>Drop target</b> button toggles the window style\n" "between a normal window and a drop target.\n" "\n" "When set, the main window will be hidden and\n" "instead a small tqshaped window will appear.\n" "\n" "You can show/hide a normal window with a simple click\n" "on a tqshaped window."); + tmp = i18n("<b>Drop target</b> button toggles the window style\n" "between a normal window and a drop target.\n" "\n" "When set, the main window will be hidden and\n" "instead a small shaped window will appear.\n" "\n" "You can show/hide a normal window with a simple click\n" "on a shaped window."); m_paDropTarget->setWhatsThis(tmp); /* tmp = i18n("<b>Dock widget</b> button toggles the window style\n" "between a normal window and a docked widget.\n" "\n" "When set, the main window will be hidden and\n" "instead a docked widget will appear on the panel.\n" "\n" "You can show/hide a normal window by simply clicking\n" "on a docked widget."); @@ -977,7 +977,7 @@ void KMainWidget::slotOpenTransfer() KURL url = KURL::fromPathOrURL(newtransfer); if (!url.isValid()) { - KMessageBox::error(this, i18n("Malformed URL:\n%1").tqarg(newtransfer), i18n("Error")); + KMessageBox::error(this, i18n("Malformed URL:\n%1").arg(newtransfer), i18n("Error")); ok = false; } } @@ -1114,7 +1114,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile) //check if destination already exists if(KIO::NetAccess::exists(destURL, false, this)) { - if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").tqarg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ) + if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").arg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ) == KMessageBox::Yes) { bDestisMalformed=false; @@ -1141,7 +1141,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile) // create a new transfer item Transfer *item = myTransferList->addTransfer(url, destURL); - KNotifyClient::event(kdock->winId(), "added", i18n("<i>%1</i> has been added.").tqarg(url.prettyURL())); + KNotifyClient::event(kdock->winId(), "added", i18n("<i>%1</i> has been added.").arg(url.prettyURL())); item->updateAll(); // update the remaining fields if (ksettings.b_showIndividual) @@ -1192,7 +1192,7 @@ void KMainWidget::addTransfers( const KURL::List& src, const TQString& destDir ) destURL.setFileName( fileName ); if(KIO::NetAccess::exists(destURL, false, this)) { - if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").tqarg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ) + if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").arg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ) == KMessageBox::Yes) { SafeDelete::deleteFile( destURL ); @@ -1511,7 +1511,7 @@ void KMainWidget::slotStatusChanged(Transfer * item, int _operation) } else { - KNotifyClient::event(kdock->winId(), "finished", i18n("<i>%1</i> successfully downloaded.").tqarg(srcurl)); + KNotifyClient::event(kdock->winId(), "finished", i18n("<i>%1</i> successfully downloaded.").arg(srcurl)); } if ( item ) @@ -2166,11 +2166,11 @@ void KMainWidget::updateStatusBar() } } - statusBar()->changeItem(i18n(" Transfers: %1 ").tqarg(myTransferList->childCount()), ID_TOTAL_TRANSFERS); - statusBar()->changeItem(i18n(" Files: %1 ").tqarg(totalFiles), ID_TOTAL_FILES); - statusBar()->changeItem(i18n(" Size: %1 ").tqarg(KIO::convertSize(totalSize)), ID_TOTAL_SIZE); - statusBar()->changeItem(i18n(" Time: %1 ").tqarg(KIO::convertSeconds(remTime)), ID_TOTAL_TIME); - statusBar()->changeItem(i18n(" %1/s ").tqarg(KIO::convertSize(totalSpeed)), ID_TOTAL_SPEED); + statusBar()->changeItem(i18n(" Transfers: %1 ").arg(myTransferList->childCount()), ID_TOTAL_TRANSFERS); + statusBar()->changeItem(i18n(" Files: %1 ").arg(totalFiles), ID_TOTAL_FILES); + statusBar()->changeItem(i18n(" Size: %1 ").arg(KIO::convertSize(totalSize)), ID_TOTAL_SIZE); + statusBar()->changeItem(i18n(" Time: %1 ").arg(KIO::convertSeconds(remTime)), ID_TOTAL_TIME); + statusBar()->changeItem(i18n(" %1/s ").arg(KIO::convertSize(totalSpeed)), ID_TOTAL_SPEED); //update size for each statusbar field statusBar()->setItemFixed(ID_TOTAL_TRANSFERS, -1); statusBar()->setItemFixed(ID_TOTAL_FILES, -1); @@ -2179,11 +2179,11 @@ void KMainWidget::updateStatusBar() statusBar()->setItemFixed(ID_TOTAL_SPEED, -1); if (kdock) { - tmpstr = i18n("<b>Transfers:</b> %1 ").tqarg(myTransferList->childCount()) + - i18n("<br /><b>Files:</b> %1 ").tqarg(totalFiles) + - i18n("<br /><b>Size:</b> %1 ").tqarg(KIO::convertSize(totalSize)) + - i18n("<br /><b>Time:</b> %1 ").tqarg(KIO::convertSeconds(remTime)) + - i18n("<br /><b>Speed:</b> %1/s").tqarg(KIO::convertSize(totalSpeed)); + tmpstr = i18n("<b>Transfers:</b> %1 ").arg(myTransferList->childCount()) + + i18n("<br /><b>Files:</b> %1 ").arg(totalFiles) + + i18n("<br /><b>Size:</b> %1 ").arg(KIO::convertSize(totalSize)) + + i18n("<br /><b>Time:</b> %1 ").arg(KIO::convertSeconds(remTime)) + + i18n("<br /><b>Speed:</b> %1/s").arg(KIO::convertSize(totalSpeed)); kdock->updateToolTip( tmpstr ); //trayicon changes if download is in progress if (totalSpeed == 0) @@ -2461,7 +2461,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) if (!url.isValid() || !KProtocolInfo::supportsReading( url ) ) { if (!ksettings.b_expertMode) - KMessageBox::error(this, i18n("Malformed URL:\n%1").tqarg(url.prettyURL()), i18n("Error")); + KMessageBox::error(this, i18n("Malformed URL:\n%1").arg(url.prettyURL()), i18n("Error")); return false; } @@ -2473,7 +2473,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) { if ( !ksettings.b_expertMode ) { - KMessageBox::error(this, i18n("Already saving URL\n%1").tqarg(url.prettyURL()), i18n("Error")); + KMessageBox::error(this, i18n("Already saving URL\n%1").arg(url.prettyURL()), i18n("Error")); } transfer->showIndividual(); @@ -2483,7 +2483,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) else // transfer is finished, ask if we want to download again { if ( ksettings.b_expertMode || - (KMessageBox::questionYesNo(this, i18n("Already saved URL\n%1\nDownload again?").tqarg(url.prettyURL()),i18n("Question"),i18n("Download Again"),KStdGuiItem::cancel() ) + (KMessageBox::questionYesNo(this, i18n("Already saved URL\n%1\nDownload again?").arg(url.prettyURL()),i18n("Question"),i18n("Download Again"),KStdGuiItem::cancel() ) == KMessageBox::Yes) ) { transfer->slotRequestRemove(); @@ -2498,7 +2498,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) // why restrict this to ftp and http? (pfeiffer) // // don't download file URL's TODO : uncomment? // if (url.protocol() == "http" && url.protocol() != "ftp") { -// KMessageBox::error(this, i18n("File protocol not accepted!\n%1").tqarg(url.prettyURL()), i18n("Error")); +// KMessageBox::error(this, i18n("File protocol not accepted!\n%1").arg(url.prettyURL()), i18n("Error")); // #ifdef _DEBUG // sDebugOut << endl; // #endif diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp index 30c6d486..09490134 100644 --- a/kget/logwindow.cpp +++ b/kget/logwindow.cpp @@ -200,7 +200,7 @@ void LogWindow::logTransfer(uint id, const TQString & filename, const TQString & { TQString mixed_msg, single_msg, job_id; - job_id = TQString("Job[<font color=\"red\">%1</font>] : ").tqarg(id); + job_id = TQString("Job[<font color=\"red\">%1</font>] : ").arg(id); mixed_msg = "<font color=\"blue\">" + TQTime::currentTime().toString() + "</font> : " + job_id + message; single_msg = "<font color=\"blue\">" + TQTime::currentTime().toString() + "</font> : " + message; diff --git a/kget/safedelete.cpp b/kget/safedelete.cpp index 3cf7b8fd..16deb1dd 100644 --- a/kget/safedelete.cpp +++ b/kget/safedelete.cpp @@ -16,7 +16,7 @@ bool SafeDelete::deleteFile( const KURL& url ) { KMessageBox::information(0L, i18n("Not deleting\n%1\nas it is a " - "directory.").tqarg( url.prettyURL() ), + "directory.").arg( url.prettyURL() ), i18n("Not Deleted")); return false; } @@ -28,7 +28,7 @@ bool SafeDelete::deleteFile( const KURL& url ) else KMessageBox::information( 0L, i18n("Not deleting\n%1\nas it is not a local" - " file.").tqarg( url.prettyURL() ), + " file.").arg( url.prettyURL() ), i18n("Not Deleted") ); return false; diff --git a/kget/settings.cpp b/kget/settings.cpp index 4660f7f1..942acb09 100644 --- a/kget/settings.cpp +++ b/kget/settings.cpp @@ -175,14 +175,14 @@ Settings::load() listViewFont = config->readFontEntry("Font", &font); - // read main window tqgeometry settings + // read main window geometry settings config->setGroup("MainGeometry"); const TQPoint point(-1,-1); mainPosition = config->readPointEntry("Position", &point); mainSize = config->readSizeEntry("Size"); mainState = config->readUnsignedLongNumEntry("State", 0); - // read drop target tqgeometry settings + // read drop target geometry settings config->setGroup("DropGeometry"); dropPosition = config->readPointEntry("Position", &point); dropState = config->readUnsignedLongNumEntry("State", DEFAULT_DOCK_STATE ); @@ -269,13 +269,13 @@ void Settings::save() config->setGroup("Misc"); config->writeEntry("Font", listViewFont); - // write main window tqgeometry properties + // write main window geometry properties config->setGroup("MainGeometry"); config->writeEntry("Position", kmain->pos()); config->writeEntry("Size", kmain->size()); config->writeEntry("State", KWin::windowInfo(kmain->winId()).state()); - // write drop target tqgeometry properties + // write drop target geometry properties config->setGroup("DropGeometry"); config->writeEntry("Position", kdrop->pos()); unsigned long state = KWin::windowInfo(kdrop->winId()).state(); diff --git a/kget/settings.h b/kget/settings.h index aeaaba98..7c02b166 100644 --- a/kget/settings.h +++ b/kget/settings.h @@ -172,7 +172,7 @@ public: TQFont listViewFont; - // tqgeometry settings + // geometry settings TQPoint mainPosition; TQSize mainSize; unsigned long int mainState; diff --git a/kget/transfer.cpp b/kget/transfer.cpp index 8147891e..6eb8b3da 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -272,8 +272,8 @@ void Transfer::updateAll() updateStatus(status); // first phase of animation - logMessage(i18n("Copy file from: %1").tqarg(src.prettyURL())); - logMessage(i18n("To: %1").tqarg(dest.prettyURL())); + logMessage(i18n("Copy file from: %1").arg(src.prettyURL())); + logMessage(i18n("To: %1").arg(dest.prettyURL())); // source setText(view->lv_url, src.prettyURL()); @@ -291,7 +291,7 @@ void Transfer::updateAll() } if (totalSize != 0) { - //logMessage(i18n("Total size is %1 bytes").tqarg((double)totalSize)); + //logMessage(i18n("Total size is %1 bytes").arg((double)totalSize)); setText(view->lv_total, KIO::convertSize(totalSize)); } else { //logMessage(i18n("Total size is unknown")); @@ -386,7 +386,7 @@ void Transfer::slotResume() status = ST_TRYING; mode = MD_TQUEUED; - logMessage(i18n("Attempt number %1").tqarg(retryCount)); + logMessage(i18n("Attempt number %1").arg(retryCount)); sDebug << "sending Resume to slave " << endl; m_pSlave->Op(Slave::RETR); @@ -581,7 +581,7 @@ void Transfer::slotRenaming(KIO::Job *, const KURL &, const KURL & to) dest = to; - logMessage(i18n("Renaming to %1").tqarg(dest.prettyURL().ascii())); + logMessage(i18n("Renaming to %1").arg(dest.prettyURL().ascii())); // destination setText (view->lv_filename, dest.fileName ()); @@ -623,7 +623,7 @@ void Transfer::slotSpeed(unsigned long bytes_per_second) dlgIndividual->setSpeed(i18n("Stopped")); } else { - TQString tmps = i18n("%1/s").tqarg(KIO::convertSize(speed)); + TQString tmps = i18n("%1/s").arg(KIO::convertSize(speed)); setText(view->lv_speed, tmps); setText(view->lv_remaining, remainingTime); if(dlgIndividual) @@ -644,7 +644,7 @@ void Transfer::slotTotalSize(KIO::filesize_t bytes) if (totalSize == 0) { totalSize = bytes; if (totalSize != 0) { - logMessage(i18n("Total size is %1 bytes").tqarg((double)totalSize,0,'f',0)); + logMessage(i18n("Total size is %1 bytes").arg((double)totalSize,0,'f',0)); setText(view->lv_total, KIO::convertSize(totalSize)); if(dlgIndividual) { diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 99372bdb..562432f5 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -96,11 +96,11 @@ TransferList::TransferList(TQWidget * parent, const char *name) animTry.setAutoDelete(true); for (int i = 0; i < 8; i++) { curPix = new TQPixmap(); - curPix->load(locate("appdata", connectPath.tqarg(i))); + curPix->load(locate("appdata", connectPath.arg(i))); animConn.append(curPix); curPix = new TQPixmap(); - curPix->load(locate("appdata", tryPath.tqarg(i))); + curPix->load(locate("appdata", tryPath.arg(i))); animTry.append(curPix); } } diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp index 6b90e05a..aba34266 100644 --- a/knewsticker/common/configaccess.cpp +++ b/knewsticker/common/configaccess.cpp @@ -611,8 +611,8 @@ ArticleFilter ConfigAccess::filter(const unsigned int filterNo) const ArticleFilter f; f.setId(filterNo); - if (m_cfg->hasGroup(TQString::fromLatin1("Filter #%1").tqarg(filterNo))) { - m_cfg->setGroup(TQString::fromLatin1("Filter #%1").tqarg(filterNo)); + if (m_cfg->hasGroup(TQString::fromLatin1("Filter #%1").arg(filterNo))) { + m_cfg->setGroup(TQString::fromLatin1("Filter #%1").arg(filterNo)); f.setAction(m_cfg->readEntry("Action", i18n("Show"))); f.setNewsSource(m_cfg->readEntry("News source", i18n("all news sources"))); f.setCondition(m_cfg->readEntry("Condition", i18n("contain"))); @@ -640,7 +640,7 @@ void ConfigAccess::setNewsSource(const NewsSourceBase::Data &ns) void ConfigAccess::setFilter(const ArticleFilter &f) { - m_cfg->setGroup(TQString::fromLatin1("Filter #%1").tqarg(f.id())); + m_cfg->setGroup(TQString::fromLatin1("Filter #%1").arg(f.id())); m_cfg->writeEntry("Action", f.action()); m_cfg->writeEntry("News source", f.newsSource()); m_cfg->writeEntry("Condition", f.condition()); diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp index 3ebb4f19..911095d9 100644 --- a/knewsticker/common/newsengine.cpp +++ b/knewsticker/common/newsengine.cpp @@ -222,7 +222,7 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc) } else { ErrorCode error = static_cast<ErrorCode>(proc->exitStatus()); if (error != NOERR) { - errorMsg = errorMessage(error).tqarg(m_data.sourceFile); + errorMsg = errorMessage(error).arg(m_data.sourceFile); okSoFar = false; } } @@ -231,10 +231,10 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc) TQString output = TQString(m_programOutput->buffer()); if (!output.isEmpty()) { output = TQString::fromLatin1("\"") + output + TQString::fromLatin1("\""); - errorMsg += i18n("<p>Program output:<br>%1<br>").tqarg(output); + errorMsg += i18n("<p>Program output:<br>%1<br>").arg(output); } KMessageBox::detailedError(0, i18n("An error occurred while updating the" - " news source '%1'.").tqarg(newsSourceName()), errorMsg, + " news source '%1'.").arg(newsSourceName()), errorMsg, i18n("KNewsTicker Error")); } diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp index c80ecb60..6e8e88d7 100644 --- a/knewsticker/common/newsiconmgr.cpp +++ b/knewsticker/common/newsiconmgr.cpp @@ -85,7 +85,7 @@ void NewsIconMgr::getIcon(const KURL &url) kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data); } else { emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", - TQString::fromLatin1("favicons/%1.png").tqarg(url.host())))); + TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } } else { KIO::Job *job = KIO::get(url, true, false); @@ -133,7 +133,7 @@ void NewsIconMgr::slotGotIcon(bool isHost, TQString hostOrURL, TQString iconName emit gotIcon(url, m_stdIcon); else emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", - TQString::fromLatin1("favicons/%1.png").tqarg(url.host())))); + TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } TQString NewsIconMgr::favicon(const KURL &url) const diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index ff525e3e..535485bf 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -288,14 +288,14 @@ void KNewsTicker::slotNotifyOfFailures() if (m_failedNewsUpdates.count() == 1) notification = i18n("<qt>Could not update news site '%1'.<br>" "The supplied resource file is probably invalid or" - " broken.</qt>").tqarg(m_failedNewsUpdates.first()); + " broken.</qt>").arg(m_failedNewsUpdates.first()); else if (m_failedNewsUpdates.count() > 1 && m_failedNewsUpdates.count() < 8) { notification = i18n("<qt>The following news sites had problems. Their" " resource files are probably invalid or broken.<ul>"); TQStringList::ConstIterator it = m_failedNewsUpdates.begin(); TQStringList::ConstIterator end = m_failedNewsUpdates.end(); for (; it != end; ++it) - notification += TQString::fromLatin1("<li>%1</li>").tqarg(*it); + notification += TQString::fromLatin1("<li>%1</li>").arg(*it); notification += TQString::fromLatin1("</ul></qt>"); } else notification = i18n("Failed to update several news" diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp index 261ade52..aec193cb 100644 --- a/knewsticker/knewstickerconfig.cpp +++ b/knewsticker/knewstickerconfig.cpp @@ -251,7 +251,7 @@ bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e) } int i = 0; while (validName == false) { - name = i18n("Unknown %1").tqarg(i); + name = i18n("Unknown %1").arg(i); for (TQListViewItemIterator it(m_child->lvNewsSources); it.current(); it++) { if (it.current()->text(0) == name) { i++; @@ -364,9 +364,9 @@ void KNewsTickerConfig::slotNewsSourceContextMenu(KListView *, TQListViewItem *i menu->insertTitle(logoIcon, i18n("Edit News Source")); menu->insertItem(addIcon, i18n("&Add News Source"), 0); if (item) { - menu->insertItem(modifyIcon, i18n("&Modify '%1'").tqarg(item->text(0)), 1); + menu->insertItem(modifyIcon, i18n("&Modify '%1'").arg(item->text(0)), 1); if (m_child->lvNewsSources->selectedItems().count() == 1) { - menu->insertItem(removeIcon, i18n("&Remove '%1'").tqarg(item->text(0)), 2); + menu->insertItem(removeIcon, i18n("&Remove '%1'").arg(item->text(0)), 2); } else { menu->insertItem(removeIcon, i18n("&Remove News Sources"), 2); } diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp index 2941ed37..ac4ddeeb 100644 --- a/knewsticker/knewstickerstub/knewstickerstub.cpp +++ b/knewsticker/knewstickerstub/knewstickerstub.cpp @@ -59,8 +59,8 @@ int main(int argc, char **argv) TQString name = i18n("Unknown"); if (newsSources.contains(name)) for (unsigned int i = 0; ; i++) - if (!newsSources.contains(i18n("Unknown %1").tqarg(i))) { - name = i18n("Unknown %1").tqarg(i); + if (!newsSources.contains(i18n("Unknown %1").arg(i))) { + name = i18n("Unknown %1").arg(i); break; } diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index 6b1be85f..df824c4a 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -184,7 +184,7 @@ void NewsScroller::dropEvent(TQDropEvent* event) newSourceUrl = newSourceUrl.stripWhiteSpace(); if (!isHeadline(newSourceUrl) && KMessageBox::questionYesNo(this, i18n("<p>Do you really want to add '%1' to" " the list of news sources?</p>") - .tqarg(newSourceUrl), TQString(), i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) { + .arg(newSourceUrl), TQString(), i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) { KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false); ConfigAccess configFrontend(&cfg); TQStringList newsSources = configFrontend.newsSources(); @@ -192,8 +192,8 @@ void NewsScroller::dropEvent(TQDropEvent* event) TQString name = i18n("Unknown"); if (newsSources.contains(name)) for (unsigned int i = 0; ; i++) - if (!newsSources.contains(i18n("Unknown %1").tqarg(i))) { - name = i18n("Unknown %1").tqarg(i); + if (!newsSources.contains(i18n("Unknown %1").arg(i))) { + name = i18n("Unknown %1").arg(i); break; } diff --git a/kopete/kopete/addaccountwizard/addaccountwizard.cpp b/kopete/kopete/addaccountwizard/addaccountwizard.cpp index 68c9679e..1c42acf2 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizard.cpp +++ b/kopete/kopete/addaccountwizard/addaccountwizard.cpp @@ -128,7 +128,7 @@ void AddAccountWizard::next() if (!m_proto) { KMessageBox::queuedMessageBox(this, KMessageBox::Error, - i18n("Cannot load the %1 protocol plugin.").tqarg(m_protocolItems[lvi]->name()), + i18n("Cannot load the %1 protocol plugin.").arg(m_protocolItems[lvi]->name()), i18n("Error While Adding Account")); return; } diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui index 546e35fd..19e1f6e8 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui @@ -121,7 +121,7 @@ <string><h2>Welcome to the Add Account Wizard</h2> <p>Select the messaging service from the list below.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> </widget> diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui index 9b5a872a..860e0e8e 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui @@ -38,7 +38,7 @@ <string><h2>Congratulations</h2> <p>You have finished configuring the account. Please click the "Finish" button.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui index 3dc51ca5..f0b20fb4 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui @@ -40,7 +40,7 @@ </string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp index 1db29412..7198d53c 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp @@ -283,7 +283,7 @@ void AddContactWizard::next() addPage->show(); insertPage( addPage, i18n( "The user has to select the contact to add to the given account name", - "Choose New Contact For %1 Account <b>%2</b>" ).tqarg( i->protocol()->displayName() ).tqarg( item->text(0) ), indexOf( finis ) ); + "Choose New Contact For %1 Account <b>%2</b>" ).arg( i->protocol()->displayName() ).arg( item->text(0) ), indexOf( finis ) ); protocolPages.insert( i , addPage ); } } diff --git a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui index bbc2e72b..766c2695 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui @@ -43,7 +43,7 @@ <p>This wizard will guide you through the process of adding a new contact to Kopete.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> </widget> @@ -182,7 +182,7 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -243,7 +243,7 @@ <property name="text"> <string>Select the contact list &group(s) that this contact should belong to :</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -320,7 +320,7 @@ <property name="text"> <string><p><h2>Select Instant Messaging Accounts</h2></p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -442,7 +442,7 @@ <p><i>Note</i>: If adding this contact requires authorization from one or more of the messaging services, Kopete may prompt you for further information after this screen.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp index efc633b4..48e1b159 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp @@ -87,7 +87,7 @@ void FastAddContactWizard::next() { TQString title = i18n( "The account name is prepended here", "%1 contact information" ) - .tqarg( item->text(0) ); + .arg( item->text(0) ); addPage->show(); insertPage( addPage, title, indexOf( finis ) ); protocolPages.insert( m_accountItems[item] , addPage ); diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index bb6cb1fc..7d2ae81d 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -289,7 +289,7 @@ void ChatMessagePart::slotScrollingTo( int /*x*/, int y ) void ChatMessagePart::slotImportEmoticon() { TQString emoticonString = KInputDialog::getText( i18n("Import Emoticon"), - i18n("<qt><img src=\"%1\"><br>Insert the string for the emoticon<br>separated by space if you want multiple strings</qt>").tqarg( d->activeElement.getAttribute("src").string() ) ); + i18n("<qt><img src=\"%1\"><br>Insert the string for the emoticon<br>separated by space if you want multiple strings</qt>").arg( d->activeElement.getAttribute("src").string() ) ); if (emoticonString.isNull() ) return; @@ -374,7 +374,7 @@ void ChatMessagePart::save() if ( !KIO::NetAccess::move( KURL( tempFile.name() ), saveURL ) ) { KMessageBox::queuedMessageBox( view(), KMessageBox::Error, - i18n("<qt>Could not open <b>%1</b> for writing.</qt>").tqarg( saveURL.prettyURL() ), // Message + i18n("<qt>Could not open <b>%1</b> for writing.</qt>").arg( saveURL.prettyURL() ), // Message i18n("Error While Saving") ); //Caption } } @@ -437,7 +437,7 @@ void ChatMessagePart::setStyleVariant( const TQString &variantPath ) { DOM::HTMLElement variantNode = document().getElementById( TQString::fromUtf8("mainStyle") ); if( !variantNode.isNull() ) - variantNode.setInnerText( TQString("@import url(\"%1\");").tqarg(variantPath) ); + variantNode.setInnerText( TQString("@import url(\"%1\");").arg(variantPath) ); } void ChatMessagePart::slotAppearanceChanged() @@ -626,12 +626,12 @@ const TQString ChatMessagePart::styleHTML() const if( p->fontFace().pointSize() != -1 ) { fontSize = p->fontFace().pointSize(); - fontSizeCss = TQString::fromUtf8("%1pt;").tqarg(fontSize); + fontSizeCss = TQString::fromUtf8("%1pt;").arg(fontSize); } else if( p->fontFace().pixelSize() != -1 ) { fontSize = p->fontFace().pixelSize(); - fontSizeCss = TQString::fromUtf8("%1px;").tqarg(fontSize); + fontSizeCss = TQString::fromUtf8("%1px;").arg(fontSize); } TQString style = TQString::fromLatin1( @@ -642,15 +642,15 @@ const TQString ChatMessagePart::styleHTML() const "a.KopeteDisplayName:hover{text-decoration:underline;color:inherit}" ".KopeteLink{cursor:pointer;}.KopeteLink:hover{text-decoration:underline}" ".KopeteMessageBody > p:first-child{margin:0;padding:0;display:inline;}" /* some html messages are encapsuled into a <p> */ ) - .tqarg( p->bgColor().name() ) - .tqarg( p->fontFace().family() ) - .tqarg( fontSizeCss ) - .tqarg( p->textColor().name() ) - .tqarg( p->fontFace().family() ) - .tqarg( fontSizeCss ) - .tqarg( p->textColor().name() ) - .tqarg( p->linkColor().name() ) - .tqarg( p->linkColor().name() ); + .arg( p->bgColor().name() ) + .arg( p->fontFace().family() ) + .arg( fontSizeCss ) + .arg( p->textColor().name() ) + .arg( p->fontFace().family() ) + .arg( fontSizeCss ) + .arg( p->textColor().name() ) + .arg( p->linkColor().name() ) + .arg( p->linkColor().name() ); return style; } @@ -805,7 +805,7 @@ void ChatMessagePart::slotCopyURL() void ChatMessagePart::slotScrollView() { // NB: view()->contentsHeight() is incorrect before the view has been shown in its window. - // Until this happens, the tqgeometry has not been correctly calculated, so this scrollBy call + // Until this happens, the geometry has not been correctly calculated, so this scrollBy call // will usually scroll to the top of the view. view()->scrollBy( 0, view()->contentsHeight() ); } @@ -1025,7 +1025,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const protocolIcon = KGlobal::iconLoader()->iconPath( iconName, KIcon::Small ); nickLink=TQString::fromLatin1("<a href=\"kopetemessage://%1/?protocolId=%2&accountId=%3\" class=\"KopeteDisplayName\">") - .tqarg( TQStyleSheet::escape(message.from()->contactId()).replace('"',"""), + .arg( TQStyleSheet::escape(message.from()->contactId()).replace('"',"""), TQStyleSheet::escape(message.from()->protocol()->pluginId()).replace('"',"""), TQStyleSheet::escape(message.from()->account()->accountId() ).replace('"',""")); } @@ -1107,7 +1107,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const { kdDebug(14000) << k_funcinfo << "Map Action message to Status template. " << endl; - TQString boldNick = TQString::fromUtf8("%1<b>%2</b></a> ").tqarg(nickLink,nick); + TQString boldNick = TQString::fromUtf8("%1<b>%2</b></a> ").arg(nickLink,nick); TQString newBody = boldNick + message.parsedBody(); message.setBody(newBody, Kopete::Message::ParsedHTML ); } @@ -1180,7 +1180,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) destinationName = remoteContact->nickName(); // Replace %chatName%, create a internal span to update it by DOM when asked. - resultHTML = resultHTML.replace( TQString::fromUtf8("%chatName%"), TQString("<span id=\"KopeteHeaderChatNameInternal\">%1</span>").tqarg( formatName(d->manager->displayName()) ) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%chatName%"), TQString("<span id=\"KopeteHeaderChatNameInternal\">%1</span>").arg( formatName(d->manager->displayName()) ) ); // Replace %sourceName% resultHTML = resultHTML.replace( TQString::fromUtf8("%sourceName%"), formatName(sourceName) ); // Replace %destinationName% @@ -1213,7 +1213,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) TQString photoIncoming, photoOutgoing; if( remoteContact->metaContact() && !remoteContact->metaContact()->picture().isNull() ) { - photoIncoming = TQString("data:image/png;base64,%1").tqarg( remoteContact->metaContact()->picture().base64() ); + photoIncoming = TQString("data:image/png;base64,%1").arg( remoteContact->metaContact()->picture().base64() ); } else { @@ -1222,7 +1222,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) if( d->manager->myself()->metaContact() && !d->manager->myself()->metaContact()->picture().isNull() ) { - photoOutgoing = TQString("data:image/png;base64,%1").tqarg( d->manager->myself()->metaContact()->picture().base64() ); + photoOutgoing = TQString("data:image/png;base64,%1").arg( d->manager->myself()->metaContact()->picture().base64() ); } else { @@ -1274,7 +1274,7 @@ TQString ChatMessagePart::formatMessageBody(const Kopete::Message &message) formattedBody += message.getHtmlStyleAttribute(); // Affect the parsed body. - formattedBody += TQString::fromUtf8("class=\"KopeteMessageBody\">%1</span>").tqarg(message.parsedBody()); + formattedBody += TQString::fromUtf8("class=\"KopeteMessageBody\">%1</span>").arg(message.parsedBody()); return formattedBody; } @@ -1363,11 +1363,11 @@ void ChatMessagePart::writeTemplate() "%3\n" "</body>" "</html>" - ).tqarg( d->currentChatStyle->getStyleBaseHref() ) - .tqarg( formatStyleKeywords(d->currentChatStyle->getHeaderHtml()) ) - .tqarg( formatStyleKeywords(d->currentChatStyle->getFooterHtml()) ) - .tqarg( KopetePrefs::prefs()->styleVariant() ) - .tqarg( styleHTML() ); + ).arg( d->currentChatStyle->getStyleBaseHref() ) + .arg( formatStyleKeywords(d->currentChatStyle->getHeaderHtml()) ) + .arg( formatStyleKeywords(d->currentChatStyle->getFooterHtml()) ) + .arg( KopetePrefs::prefs()->styleVariant() ) + .arg( styleHTML() ); write(xhtmlBase); end(); #ifdef STYLE_TIMETEST diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index 69a34495..4c9b7728 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -310,14 +310,14 @@ void ChatView::makeVisible() { m_mainWindow = KopeteChatWindow::window( m_manager ); // if ( root ) -// root->tqrepaint( true ); +// root->repaint( true ); emit windowCreated(); } if ( !m_mainWindow->isVisible() ) { m_mainWindow->show(); - // scroll down post show and tqlayout, otherwise the tqgeometry is wrong to scroll to the bottom. + // scroll down post show and tqlayout, otherwise the geometry is wrong to scroll to the bottom. m_messagePart->keepScrolledDown(); } @@ -353,14 +353,14 @@ bool ChatView::closeView( bool force ) shortCaption = KStringHandler::rsqueeze( shortCaption ); response = KMessageBox::warningContinueCancel( this, i18n("<qt>You are about to leave the group chat session <b>%1</b>.<br>" - "You will not receive future messages from this conversation.</qt>").tqarg( shortCaption ), i18n( "Closing Group Chat" ), + "You will not receive future messages from this conversation.</qt>").arg( shortCaption ), i18n( "Closing Group Chat" ), i18n( "Cl&ose Chat" ), TQString::fromLatin1( "AskCloseGroupChat" ) ); } if ( !unreadMessageFrom.isNull() && ( response == KMessageBox::Continue ) ) { response = KMessageBox::warningContinueCancel( this, i18n("<qt>You have received a message from <b>%1</b> in the last " - "second. Are you sure you want to close this chat?</qt>").tqarg( unreadMessageFrom ), i18n( "Unread Message" ), + "second. Are you sure you want to close this chat?</qt>").arg( unreadMessageFrom ), i18n( "Unread Message" ), i18n( "Cl&ose Chat" ), TQString::fromLatin1("AskCloseChatRecentMessage" ) ); } @@ -547,11 +547,11 @@ void ChatView::remoteTyping( const Kopete::Contact *contact, bool isTyping ) if( !typingList.isEmpty() ) { if ( typingList.count() == 1 ) - setStatusText( i18n( "%1 is typing a message" ).tqarg( typingList.first() ) ); + setStatusText( i18n( "%1 is typing a message" ).arg( typingList.first() ) ); else { TQString statusTyping = typingList.join( TQString::fromLatin1( ", " ) ); - setStatusText( i18n( "%1 is a list of names", "%1 are typing a message" ).tqarg( statusTyping ) ); + setStatusText( i18n( "%1 is a list of names", "%1 are typing a message" ).arg( statusTyping ) ); } updateChatState( Typing ); } @@ -631,7 +631,7 @@ void ChatView::slotContactAdded(const Kopete::Contact *contact, bool suppress) } if( !suppress && m_manager->members().count() > 1 ) - sendInternalMessage( i18n("%1 has joined the chat.").tqarg(contactName) ); + sendInternalMessage( i18n("%1 has joined the chat.").arg(contactName) ); if( membersStatus == Smart && membersDock ) { @@ -682,9 +682,9 @@ void ChatView::slotContactRemoved( const Kopete::Contact *contact, const TQStrin if ( !suppressNotification ) { if ( reason.isEmpty() ) - sendInternalMessage( i18n( "%1 has left the chat." ).tqarg( contactName ), format ) ; + sendInternalMessage( i18n( "%1 has left the chat." ).arg( contactName ), format ) ; else - sendInternalMessage( i18n( "%1 has left the chat (%2)." ).tqarg( contactName, reason ), format); + sendInternalMessage( i18n( "%1 has left the chat (%2)." ).arg( contactName, reason ), format); } } @@ -711,7 +711,7 @@ void ChatView::setCaption( const TQString &text, bool modified ) //Call the original set caption KDockMainWindow::setCaption( newCaption, false ); - emit updateChatTooltip( this, TQString::fromLatin1("<qt>%1</qt>").tqarg( d->captionText ) ); + emit updateChatTooltip( this, TQString::fromLatin1("<qt>%1</qt>").arg( d->captionText ) ); emit updateChatLabel( this, newCaption ); //Blink icon if modified and not active if( !d->isActive && modified ) @@ -784,7 +784,7 @@ void ChatView::slotContactStatusChanged( Kopete::Contact *contact, const Kopete: { // Separate notification for the 'self' contact if ( newStatus.status() != Kopete::OnlineStatus::Connecting ) - sendInternalMessage( i18n( "You are now marked as %1." ).tqarg( newStatus.description() ) ); + sendInternalMessage( i18n( "You are now marked as %1." ).arg( newStatus.description() ) ); } else if ( !contact->account() || !contact->account()->suppressStatusNotification() ) { @@ -792,13 +792,13 @@ void ChatView::slotContactStatusChanged( Kopete::Contact *contact, const Kopete: if ( contact->metaContact() && contact->metaContact() != Kopete::ContactList::self()->myself() ) { sendInternalMessage( i18n( "%2 is now %1." ) - .tqarg( newStatus.description(), contact->metaContact()->displayName() ) ); + .arg( newStatus.description(), contact->metaContact()->displayName() ) ); } else { TQString nick=contact->nickName(); sendInternalMessage( i18n( "%2 is now %1." ) - .tqarg( newStatus.description(), nick ) ); + .arg( newStatus.description(), nick ) ); } } } diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp index 05a21371..c97b70ba 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp @@ -1256,7 +1256,7 @@ void KopeteChatWindow::updateChatState( ChatView* cv, int newState ) void KopeteChatWindow::updateChatTooltip( ChatView* cv ) { if ( m_tabBar ) - m_tabBar->setTabToolTip( cv, TQString::fromLatin1("<qt>%1</qt>").tqarg( cv->caption() ) ); + m_tabBar->setTabToolTip( cv, TQString::fromLatin1("<qt>%1</qt>").arg( cv->caption() ) ); } void KopeteChatWindow::updateChatLabel() diff --git a/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp b/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp index 5eba33f0..e331cb2d 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp @@ -159,7 +159,7 @@ void ChatWindowStyle::listVariants() // Retrieve only the file name. variantName = variantName.left(variantName.findRev(".")); // variantPath is relative to baseHref. - variantPath = TQString("Variants/%1").tqarg(*it); + variantPath = TQString("Variants/%1").arg(*it); d->variantsList.insert(variantName, variantPath); } } diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index 6965307a..2e557af2 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -344,7 +344,7 @@ void KopeteEmailWindow::updateNextButton() else d->btnReadPrev->setEnabled( true ); - d->btnReadNext->setText( i18n( "(%1) Next >>" ).tqarg( d->messageQueue.count() - d->queuePosition ) ); + d->btnReadNext->setText( i18n( "(%1) Next >>" ).arg( d->messageQueue.count() - d->queuePosition ) ); } void KopeteEmailWindow::slotUpdateReplySend() @@ -423,14 +423,14 @@ bool KopeteEmailWindow::closeView( bool force ) shortCaption = shortCaption.left( 40 ) + TQString::fromLatin1("..."); response = KMessageBox::warningContinueCancel(this, i18n("<qt>You are about to leave the group chat session <b>%1</b>.<br>" - "You will not receive future messages from this conversation.</qt>").tqarg(shortCaption), i18n("Closing Group Chat"), + "You will not receive future messages from this conversation.</qt>").arg(shortCaption), i18n("Closing Group Chat"), i18n("Cl&ose Chat"), TQString::fromLatin1("AskCloseGroupChat")); } if( !d->unreadMessageFrom.isNull() && ( response == KMessageBox::Continue ) ) { response = KMessageBox::warningContinueCancel(this, i18n("<qt>You have received a message from <b>%1</b> in the last " - "second. Are you sure you want to close this chat?</qt>").tqarg(d->unreadMessageFrom), i18n("Unread Message"), + "second. Are you sure you want to close this chat?</qt>").arg(d->unreadMessageFrom), i18n("Unread Message"), i18n("Cl&ose Chat"), TQString::fromLatin1("AskCloseChatRecentMessage")); } diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index d1d6bd04..809bccbb 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -200,10 +200,10 @@ void KopeteRichTextEditPart::createActions( KActionCollection *ac ) connect( action_align_justify, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( setAlignJustify(bool) ) ); - action_align_left->setExclusiveGroup( "tqalignment" ); - action_align_center->setExclusiveGroup( "tqalignment" ); - action_align_right->setExclusiveGroup( "tqalignment" ); - action_align_justify->setExclusiveGroup( "tqalignment" ); + action_align_left->setExclusiveGroup( "alignment" ); + action_align_center->setExclusiveGroup( "alignment" ); + action_align_right->setExclusiveGroup( "alignment" ); + action_align_justify->setExclusiveGroup( "alignment" ); connect( editor, TQT_SIGNAL( cursorPositionChanged( int,int ) ), this, TQT_SLOT( updateAligment() ) ); @@ -268,7 +268,7 @@ void KopeteRichTextEditPart::clear() void KopeteRichTextEditPart::updateAligment() { - int align = editor->tqalignment(); + int align = editor->alignment(); switch ( align ) { @@ -351,7 +351,7 @@ void KopeteRichTextEditPart::writeConfig() config->writeEntry("FontUnderline", mFont.underline() ); config->writeEntry("BgColor", mBgColor ); config->writeEntry("FgColor", mFgColor ); - config->writeEntry("EditAlignment", editor->tqalignment() ); + config->writeEntry("EditAlignment", editor->alignment() ); config->sync(); } diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index 425cc22a..c16f4884 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -205,8 +205,8 @@ void ChatWindowStyleRendering_Test::testHeaderRendering() "<div>Outgoing/buddy_icon.png</div>\n" "<div>%1</div>\n" "<div>%2</div>" - ).tqarg(KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ) - .tqarg(TQDateTime::currentDateTime().toString("hh:mm")); + ).arg(KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ) + .arg(TQDateTime::currentDateTime().toString("hh:mm")); TQString headerHtml = d->testStyle->getHeaderHtml(); TQString resultHtml; @@ -230,7 +230,7 @@ void ChatWindowStyleRendering_Test::testMessageRendering() "<div>%1</div>\n" "<div>%2</div>\n" "<div id=\"insert\">" - ).tqarg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); + ).arg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); TQString expectedOutgoingHtml = TQString( "Outgoing:\n" @@ -242,7 +242,7 @@ void ChatWindowStyleRendering_Test::testMessageRendering() "<div>%1</div>\n" "<div>%2</div>\n" "<div id=\"insert\">" - ).tqarg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); + ).arg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); TQString tempHtml; @@ -272,7 +272,7 @@ void ChatWindowStyleRendering_Test::testStatusRendering() "<div><span style=\"\"class=\"KopeteMessageBody\">A contact went offline.</span></div>\n" "<div>%1</div>\n" "<div>%2</div>" - ).tqarg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); + ).arg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); TQString statusHtml = d->testStyle->getStatusHtml(); TQString resultHtml; diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp index 147c6f17..1bb9357f 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp +++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp @@ -231,7 +231,7 @@ void KopeteAccountConfig::slotRemoveAccount() return; Kopete::Account *i = lvi->account(); - if ( KMessageBox::warningContinueCancel( this, i18n( "Are you sure you want to remove the account \"%1\"?" ).tqarg( i->accountLabel() ), + if ( KMessageBox::warningContinueCancel( this, i18n( "Are you sure you want to remove the account \"%1\"?" ).arg( i->accountLabel() ), i18n( "Remove Account" ), KGuiItem(i18n( "Remove Account" ), "editdelete"), "askRemoveAccount", KMessageBox::Notify | KMessageBox::Dangerous ) == KMessageBox::Continue ) { diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 75eccea6..52d30b1a 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -548,7 +548,7 @@ void AppearanceConfig::slotSelectedEmoticonsThemeChanged() TQString newContentText = "<qt>"; for(TQStringList::Iterator it = smileys.begin(); it != smileys.end(); ++it ) - newContentText += TQString::fromLatin1("<img src=\"%1\"> ").tqarg(*it); + newContentText += TQString::fromLatin1("<img src=\"%1\"> ").arg(*it); newContentText += TQString::fromLatin1("</qt>"); d->mPrfsEmoticons->icon_theme_preview->setText(newContentText); @@ -673,7 +673,7 @@ void AppearanceConfig::slotDeleteChatStyle() TQString stylePathToDelete = d->styleItemMap[d->mPrfsChatWindow->styleList->selectedItem()]; if( ChatWindowStyleManager::self()->removeStyle(stylePathToDelete) ) { - KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "The style %1 was successfully deleted.").tqarg(styleName)); + KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "The style %1 was successfully deleted.").arg(styleName)); // Get the first item in the stye List. TQString stylePath = (*d->styleItemMap.begin()); @@ -682,7 +682,7 @@ void AppearanceConfig::slotDeleteChatStyle() } else { - KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "An error occured while trying to delete %1 style.").tqarg(styleName)); + KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "An error occured while trying to delete %1 style.").arg(styleName)); } } diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui index 9ef2ac0b..16026c84 100644 --- a/kopete/kopete/config/appearance/tooltipeditwidget.ui +++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui @@ -45,7 +45,7 @@ <property name="text"> <string>Using the arrow buttons, put on the right the items you want to see in the contact tooltips. You can then sort them.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp index 97bc2bcc..94e19a94 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp +++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp @@ -564,12 +564,12 @@ void KopeteIdentityConfig::slotChangePhoto(const TQString &photoUrl) KMD5 context(tempArray); // Save the image to a file. saveLocation = context.hexDigest() + ".png"; - saveLocation = locateLocal( "appdata", TQString::fromUtf8("globalidentitiespictures/%1").tqarg( saveLocation ) ); + saveLocation = locateLocal( "appdata", TQString::fromUtf8("globalidentitiespictures/%1").arg( saveLocation ) ); if(!photo.save(saveLocation, "PNG")) { KMessageBox::sorry(this, - i18n("An error occurred when trying to save the custom photo for %1 identity.").tqarg(d->selectedIdentity), + i18n("An error occurred when trying to save the custom photo for %1 identity.").arg(d->selectedIdentity), i18n("Identity Configuration")); } d->m_view->comboPhotoURL->setURL(saveLocation); @@ -578,7 +578,7 @@ void KopeteIdentityConfig::slotChangePhoto(const TQString &photoUrl) else { KMessageBox::sorry(this, - i18n("An error occurred when trying to save the custom photo for %1 identity.").tqarg(d->selectedIdentity), + i18n("An error occurred when trying to save the custom photo for %1 identity.").arg(d->selectedIdentity), i18n("Identity Configuration")); } } diff --git a/kopete/kopete/contactlist/kabcexport_base.ui b/kopete/kopete/contactlist/kabcexport_base.ui index 452e3819..bc8c78f1 100644 --- a/kopete/kopete/contactlist/kabcexport_base.ui +++ b/kopete/kopete/contactlist/kabcexport_base.ui @@ -41,7 +41,7 @@ <property name="text"> <string>This wizard helps you export instant messaging contacts to the KDE address book.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index f92ceddb..49f5b4d2 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -198,7 +198,7 @@ public: { removeMetaContactFromGroupInner( mc, gpi ); - // update the group's display of its number of tqchildren. + // update the group's display of its number of children. // TODO: make the KopeteGroupViewItem not need this, by overriding insertItem and takeItem gpi->refreshDisplayName(); @@ -288,8 +288,8 @@ private: updateMetaContactInner( mc ); // FIXME: these items should do this for themselves... - m_onlineItem->setText(0,i18n("Online contacts (%1)").tqarg(m_onlineItem->childCount())); - m_offlineItem->setText(0,i18n("Offline contacts (%1)").tqarg(m_offlineItem->childCount())); + m_onlineItem->setText(0,i18n("Online contacts (%1)").arg(m_onlineItem->childCount())); + m_offlineItem->setText(0,i18n("Offline contacts (%1)").arg(m_offlineItem->childCount())); } void updateMetaContactInner( Kopete::MetaContact *mc ) { @@ -987,7 +987,7 @@ void KopeteContactListView::addDraggedContactToGroup( Kopete::MetaContact *conta { int r=KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n( "<qt>Would you like to add <b>%1</b> to your contact list as a member of <b>%2</b>?</qt>" ) - .tqarg( contact->displayName(), group->displayName() ), + .arg( contact->displayName(), group->displayName() ), i18n( "Kopete" ), i18n("Add"), i18n("Do Not Add"), "addTemporaryWhenMoving" ); @@ -1003,7 +1003,7 @@ void KopeteContactListView::addDraggedContactToMetaContact( Kopete::Contact *con { int r = KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n( "<qt>Would you like to add <b>%1</b> to your contact list as a child contact of <b>%2</b>?</qt>" ) - .tqarg( contact->contactId(), parent->displayName() ), + .arg( contact->contactId(), parent->displayName() ), i18n( "Kopete" ), i18n("Add"), i18n("Do Not Add"), "addTemporaryWhenMoving" ); @@ -1054,7 +1054,7 @@ void KopeteContactListView::addDraggedContactByInfo( const TQString &protocolId, { KMessageBox::sorry( Kopete::UI::Global::mainWidget(), i18n("<qt>This contact is already on your contact list. It is a child contact of <b>%1</b></qt>") - .tqarg( source_contact->metaContact()->displayName() ) + .arg( source_contact->metaContact()->displayName() ) ); } } @@ -1555,13 +1555,13 @@ void KopeteContactListView::slotRemove() { msg = i18n( "<qt>Are you sure you want to remove the contact <b>%1</b>" \ " from your contact list?</qt>" ) - .tqarg( contacts.first()->displayName() ) ; + .arg( contacts.first()->displayName() ) ; } else if( !groups.isEmpty() ) { msg = i18n( "<qt>Are you sure you want to remove the group <b>%1</b> " \ "and all contacts that are contained within it?</qt>" ) - .tqarg( groups.first()->displayName() ); + .arg( groups.first()->displayName() ); } else return; // this should never happen @@ -1772,7 +1772,7 @@ void KopeteContactListView::slotProperties() { } */ - metaLVI->tqrepaint(); + metaLVI->repaint(); } else if(groupLVI) { diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp index 6935acaa..b28b7cb3 100644 --- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp +++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp @@ -167,7 +167,7 @@ void KopeteGroupViewItem::refreshDisplayName() d->name->setText( m_group->displayName() ); d->count->setText( i18n( "(NUMBER OF ONLINE CONTACTS/NUMBER OF CONTACTS IN GROUP)", "(%1/%2)" ) - .tqarg( TQString::number( onlineMemberCount ), TQString::number( totalMemberCount ) ) ); + .arg( TQString::number( onlineMemberCount ), TQString::number( totalMemberCount ) ) ); updateVisibility(); diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index ef700bb7..d4b7d241 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -66,7 +66,7 @@ const char MC_UNK[] = "metacontact_unknown"; KopeteGVIProps::KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *parent, const char *name) -: KDialogBase(parent, name, true, i18n("Properties of Group %1").tqarg(gvi->group()->displayName()), Ok|Cancel, Ok, false) +: KDialogBase(parent, name, true, i18n("Properties of Group %1").arg(gvi->group()->displayName()), Ok|Cancel, Ok, false) { mainWidget = new KopeteGVIPropsWidget(this, "mainWidget"); mainWidget->icnbOpen->setIconSize(KIcon::SizeSmall); @@ -146,7 +146,7 @@ void KopeteGVIProps::slotIconChanged() KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *parent, const char *name) -: KDialogBase(parent, name, true, i18n("Properties of Meta Contact %1").tqarg(lvi->metaContact()->displayName()), Ok|Cancel, Ok, false) +: KDialogBase(parent, name, true, i18n("Properties of Meta Contact %1").arg(lvi->metaContact()->displayName()), Ok|Cancel, Ok, false) { m_countPhotoCapable = 0; mainWidget = new KopeteMetaLVIPropsWidget( this, "mainWidget" ); diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index a990da0f..bea7b121 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -88,9 +88,9 @@ public: if ( ! metaContact->photo().isNull() ) { - TQString photoName = TQString::fromLatin1("kopete-metacontact-photo:%1").tqarg( KURL::encode_string( metaContact->metaContactId() )); + TQString photoName = TQString::fromLatin1("kopete-metacontact-photo:%1").arg( KURL::encode_string( metaContact->metaContactId() )); //TQMimeSourceFactory::defaultFactory()->setImage( "contactimg", metaContact->photo() ); - toolTip += TQString::fromLatin1("<img src=\"%1\">").tqarg( photoName ); + toolTip += TQString::fromLatin1("<img src=\"%1\">").arg( photoName ); } toolTip += TQString::fromLatin1("</td><td>"); @@ -110,7 +110,7 @@ public: } } - toolTip += TQString::fromLatin1("<b><font size=\"+1\">%1</font></b><br><br>").tqarg( displayName ); + toolTip += TQString::fromLatin1("<b><font size=\"+1\">%1</font></b><br><br>").arg( displayName ); TQPtrList<Contact> contacts = metaContact->contacts(); if ( contacts.count() == 1 ) @@ -121,18 +121,18 @@ public: toolTip += TQString::fromLatin1("<table>"); // We are over a metacontact with > 1 child contacts, and not over a specific contact - // Iterate through tqchildren and display a summary tooltip + // Iterate through children and display a summary tooltip for(Contact *c = contacts.first(); c; c = contacts.next()) { TQString iconName = TQString::fromLatin1("kopete-contact-icon:%1:%2:%3") - .tqarg( KURL::encode_string( c->protocol()->pluginId() ), + .arg( KURL::encode_string( c->protocol()->pluginId() ), KURL::encode_string( c->account()->accountId() ), KURL::encode_string( c->contactId() ) ); toolTip += i18n("<tr><td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td><td>STATUS DESCRIPTION</td></tr>", "<tr><td><img src=\"%1\"> <nobr><b>%2</b></nobr> <nobr>(%3)</nobr></td><td align=\"right\"><nobr>%4</nobr></td></tr>") - .tqarg( iconName, Kopete::Emoticons::parseEmoticons(c->property(Kopete::Global::Properties::self()->nickName()).value().toString()) , c->contactId(), c->onlineStatus().description() ); + .arg( iconName, Kopete::Emoticons::parseEmoticons(c->property(Kopete::Global::Properties::self()->nickName()).value().toString()) , c->contactId(), c->onlineStatus().description() ); } return toolTip + TQString::fromLatin1("</table></td></tr></table></qt>"); @@ -382,7 +382,7 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) //int winId = KopeteSystemTray::systemTray() ? KopeteSystemTray::systemTray()->winId() : 0; TQString text = i18n( "<qt><i>%1</i> is now %2.</qt>" ) - .tqarg( Kopete::Emoticons::parseEmoticons( TQStyleSheet::escape(m_metaContact->displayName()) ) , + .arg( Kopete::Emoticons::parseEmoticons( TQStyleSheet::escape(m_metaContact->displayName()) ) , TQStyleSheet::escape(c->onlineStatus().description())); // figure out what's happened diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp index 816f45f3..ae50ae98 100644 --- a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp +++ b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp @@ -153,7 +153,7 @@ void parseKey( const TQString &group, const TQString &key, const TQString &value !ircNick.isEmpty( ) && !ircServer.isEmpty() && !ircPort.isEmpty() ) { - accountId = TQString::fromLatin1( "%1@%2:%3" ).tqarg( ircNick, ircServer, ircPort ); + accountId = TQString::fromLatin1( "%1@%2:%3" ).arg( ircNick, ircServer, ircPort ); } } /* diff --git a/kopete/kopete/kimifaceimpl.cpp b/kopete/kopete/kimifaceimpl.cpp index 11cbeeb0..b9a2dd45 100644 --- a/kopete/kopete/kimifaceimpl.cpp +++ b/kopete/kopete/kimifaceimpl.cpp @@ -386,7 +386,7 @@ void KIMIfaceImpl::unknown( const TQString &uid ) { TQString apology = i18n( "Translators: %1 is the name of a person taken from the KDE address book, who Kopete doesn't know about. Kopete must either be told that an existing contact in Kopete is this person, or add a new contact for them", "<qt><p>The KDE Address Book has no instant messaging information for</p><p><b>%1</b>.</p><p>If he/she is already present in the Kopete contact list, indicate the correct addressbook entry in their properties.</p><p>Otherwise, add a new contact using the Add Contact wizard.</p></qt>" ); - apology = apology.tqarg( addr.realName() ); + apology = apology.arg( addr.realName() ); KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, apology, i18n( "No Instant Messaging Address" ) ); } } diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp index 5e0029f0..13696da1 100644 --- a/kopete/kopete/kopeteballoon.cpp +++ b/kopete/kopete/kopeteballoon.cpp @@ -159,8 +159,8 @@ void KopeteBalloon::updateMask() mask -= corner; } - // get screen-tqgeometry for screen our anchor is on - // (tqgeometry can differ from screen to screen! + // get screen-geometry for screen our anchor is on + // (geometry can differ from screen to screen! TQRect deskRect = KGlobalSettings::desktopGeometry(mAnchor); bool bottom = (mAnchor.y() + height()) > ((deskRect.y() + deskRect.height()-48)); diff --git a/kopete/kopete/kopeteiface.cpp b/kopete/kopete/kopeteiface.cpp index 18a35d82..a197c649 100644 --- a/kopete/kopete/kopeteiface.cpp +++ b/kopete/kopete/kopeteiface.cpp @@ -159,7 +159,7 @@ bool KopeteIface::addContact( const TQString &protocolName, const TQString &acco // even be at the computer. We just need to add the contact --Matt if( KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n( "An external application is attempting to add the " " '%1' contact '%2' to your contact list. Do you want to allow this?" ) - .tqarg( protocolName ).tqarg( contactName ), i18n( "Allow Contact?" ), i18n("Allow"), i18n("Reject") ) == 3 ) // Yes == 3 + .arg( protocolName ).arg( contactName ), i18n( "Allow Contact?" ), i18n("Allow"), i18n("Reject") ) == 3 ) // Yes == 3 { //User said Yes myAccount->addContact( contactId, contactName, realGroup, Kopete::Account::DontChangeKABC); @@ -173,7 +173,7 @@ bool KopeteIface::addContact( const TQString &protocolName, const TQString &acco //This protocol is not loaded KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("An external application has attempted to add a contact using " - " the %1 protocol, which either does not exist or is not loaded.").tqarg( protocolName ), + " the %1 protocol, which either does not exist or is not loaded.").arg( protocolName ), i18n("Missing Protocol")); return false; diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index 1b1977a1..744c92d6 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -727,7 +727,7 @@ void KopeteWindow::slotAccountRegistered( Kopete::Account *account ) // add an item for this account to the add contact actionmenu TQString s = "actionAdd%1Contact"; - s.tqarg( account->accountId() ); + s.arg( account->accountId() ); KAction *action = new KAction( account->accountLabel(), account->accountIcon(), 0 , addContactMapper, TQT_SLOT( map() ), account, s.latin1() ); addContactMapper->setMapping( action, account->protocol()->pluginId() + TQChar(0xE000) + account->accountId() ); actionAddContact->insert( action ); @@ -756,7 +756,7 @@ void KopeteWindow::slotAccountUnregistered( const Kopete::Account *account) // update add contact actionmenu TQString s = "actionAdd%1Contact"; - s.tqarg( account->accountId() ); + s.arg( account->accountId() ); // KAction * action = actionCollection()->action( account->accountId() ); Kopete::Account * myAccount = const_cast< Kopete::Account * > ( account ); KAction * action = static_cast< KAction *>( myAccount->child( s.latin1() ) ); @@ -868,7 +868,7 @@ void KopeteWindow::makeTrayToolTip() Kopete::Contact *self = a->myself(); tt += i18n( "Account tooltip information: <nobr>ICON <b>PROTOCOL:</b> NAME (<i>STATUS</i>)<br/>", "<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 (<i>%5</i>)<br/>" ) - .tqarg( a->protocol()->displayName() ).tqarg( a->accountLabel(), KURL::encode_string( a->protocol()->pluginId() ), + .arg( a->protocol()->displayName() ).arg( a->accountLabel(), KURL::encode_string( a->protocol()->pluginId() ), KURL::encode_string( a->accountId() ), self->onlineStatus().description() ); } tt += TQString::fromLatin1("</qt>"); @@ -931,7 +931,7 @@ void KopeteWindow::showEvent( TQShowEvent * ) void KopeteWindow::slotAutoHide() { - if ( this->tqgeometry().contains( TQCursor::pos() ) == false ) + if ( this->geometry().contains( TQCursor::pos() ) == false ) { /* The autohide-timer doesn't need to emit * timeouts when the window is hidden already. */ diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp index 5fb204ea..74d2286b 100644 --- a/kopete/kopete/systemtray.cpp +++ b/kopete/kopete/systemtray.cpp @@ -302,7 +302,7 @@ void KopeteSystemTray::addBalloon() m_balloon = new KopeteBalloon( i18n( "<qt><nobr><b>New Message from %1:</b></nobr><br><nobr>\"%2\"</nobr></qt>" ) - .tqarg( TQStyleSheet::escape( msgFrom ), msgText ), TQString() ); + .arg( TQStyleSheet::escape( msgFrom ), msgText ), TQString() ); connect(m_balloon, TQT_SIGNAL(signalBalloonClicked()), mBalloonEventList.first() , TQT_SLOT(apply())); connect(m_balloon, TQT_SIGNAL(signalButtonClicked()), mBalloonEventList.first() , TQT_SLOT(apply())); connect(m_balloon, TQT_SIGNAL(signalIgnoreButtonClicked()), mBalloonEventList.first() , TQT_SLOT(ignore())); diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp index 1107a54d..b725d5d5 100644 --- a/kopete/libkopete/avdevice/videodevicepool.cpp +++ b/kopete/libkopete/avdevice/videodevicepool.cpp @@ -833,7 +833,7 @@ void VideoDevicePool::saveConfig() } */ // Stores what is the current video device in use - const TQString currentdevice = TQString(TQString::fromLocal8Bit ( "Model %1 Device %2" )) .tqarg(m_videodevice[m_current_device].m_model) .tqarg(m_videodevice[m_current_device].m_modelindex); + const TQString currentdevice = TQString(TQString::fromLocal8Bit ( "Model %1 Device %2" )) .arg(m_videodevice[m_current_device].m_model) .arg(m_videodevice[m_current_device].m_modelindex); config->writeEntry( "Current Device", currentdevice); VideoDeviceVector::iterator vditerator; diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp index 2d2c0e97..6546effd 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp @@ -211,7 +211,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *mev= (TQMouseEvent *)(ev); - //kdDebug() << TQString("click at %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl; + //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; if ( mev->button() == RightButton ) { @@ -246,7 +246,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) { TQMouseEvent *mev= (TQMouseEvent *)(ev); - //kdDebug() << TQString("move to %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl; + //kdDebug() << TQString("move to %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; if ( m_state == Resizing ) { @@ -418,7 +418,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) if (m_selectedRegion == m_originalPixmap.rect()) m_selectedRegion=TQRect(); // kdDebug() << TQString(" original Pixmap :") << m_originalPixmap.rect() << endl; -// kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").tqarg(m_unzoomedPixmap.width()).tqarg(m_unzoomedPixmap.height()) << endl; +// kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").arg(m_unzoomedPixmap.width()).arg(m_unzoomedPixmap.height()) << endl; if ( !m_originalPixmap.isNull() && ( m_originalPixmap.width() > m_maxWidth || diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/kabcpersistence.cpp index 6e712606..c6356d65 100644 --- a/kopete/libkopete/kabcpersistence.cpp +++ b/kopete/libkopete/kabcpersistence.cpp @@ -291,7 +291,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) if ( !proto ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "<qt>\"%1\" is not supported by Kopete.</qt>" ).tqarg( protocolName ), + i18n( "<qt>\"%1\" is not supported by Kopete.</qt>" ).arg( protocolName ), i18n( "Could Not Sync with KDE Address Book" ) ); continue; } @@ -339,7 +339,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) // if not, prompt to add it kdDebug( 14010 ) << proto->pluginId() << "://" << *it << " was not found in the contact list. Prompting to add..." << endl; if ( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), - i18n( "<qt>An address was added to this contact by another application.<br>Would you like to use it in Kopete?<br><b>Protocol:</b> %1<br><b>Address:</b> %2</qt>" ).tqarg( proto->displayName() ).tqarg( *it ), i18n( "Import Address From Address Book" ), i18n("Use"), i18n("Do Not Use"), TQString::fromLatin1( "ImportFromKABC" ) ) ) + i18n( "<qt>An address was added to this contact by another application.<br>Would you like to use it in Kopete?<br><b>Protocol:</b> %1<br><b>Address:</b> %2</qt>" ).arg( proto->displayName() ).arg( *it ), i18n( "Import Address From Address Book" ), i18n("Use"), i18n("Do Not Use"), TQString::fromLatin1( "ImportFromKABC" ) ) ) { // Check the accounts for this protocol are all connected // Most protocols do not allow you to add contacts while offline @@ -353,7 +353,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) if ( !allAccountsConnected ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "<qt>One or more of your accounts using %1 are offline. Most systems have to be connected to add contacts. Please connect these accounts and try again.</qt>" ).tqarg( protocolName ), + i18n( "<qt>One or more of your accounts using %1 are offline. Most systems have to be connected to add contacts. Please connect these accounts and try again.</qt>" ).arg( protocolName ), i18n( "Not Connected" ) ); continue; } @@ -378,7 +378,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) else if ( accounts.isEmpty() ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "<qt>You do not have an account configured for <b>%1</b> yet. Please create an account, connect it, and try again.</qt>" ).tqarg( protocolName ), + i18n( "<qt>You do not have an account configured for <b>%1</b> yet. Please create an account, connect it, and try again.</qt>" ).arg( protocolName ), i18n( "No Account Found" ) ); continue; } diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index 7eae7e9a..d735d80c 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -183,7 +183,7 @@ bool KAutoConfig::retrieveSettings(bool trackChanges){ changedMap.insert( TQString::fromLatin1("KDoubleNumInput"), TQT_SIGNAL(valueChanged (double))); } - // Go through all of the tqchildren of the widgets and find all known widgets + // Go through all of the children of the widgets and find all known widgets TQPtrListIterator<TQWidget> it( d->widgets ); TQWidget *widget; bool usingDefaultValues = false; @@ -439,7 +439,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, if(parseTheChildren) { // this widget is not known as something we can store. - // Maybe we can store one of its tqchildren. + // Maybe we can store one of its children. valueChanged |= parseChildren(childWidget, currentGroup, trackChanges); } } diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h index ea781976..d5ad958a 100644 --- a/kopete/libkopete/kautoconfig.h +++ b/kopete/libkopete/kautoconfig.h @@ -142,7 +142,7 @@ public: /** * Adds a widget to the list of widgets that should be parsed for any - * tqchildren that KAutoConfig might know when retrieveSettings() is + * children that KAutoConfig might know when retrieveSettings() is * called. All calls to this function should be made before calling * retrieveSettings(). * @param widget - Pointer to the widget to add. @@ -155,7 +155,7 @@ public: /** * Ignore the specified child widget when performing an action. Doesn't - * effect widgets that were added with addWidget() only their tqchildren. All + * effect widgets that were added with addWidget() only their children. All * calls to this function should be made before calling retrieveSettings(). * @param widget - Pointer to the widget that should be ignored. * Note: Widgets that don't have a name are ignored automatically. @@ -252,13 +252,13 @@ protected: TQMap<TQString, TQCString> changedMap; /** - * Recursive function that finds all known tqchildren. - * Goes through the tqchildren of widget and if any are known and not being + * Recursive function that finds all known children. + * Goes through the children of widget and if any are known and not being * ignored, stores them in currentGroup. Also checks if the widget * should be disabled because it is set immutable. - * @param widget - Parent of the tqchildren to look at. - * @param currentGroup - Place to store known tqchildren of widget. - * @param trackChanges - If true then tracks any changes to the tqchildren of + * @param widget - Parent of the children to look at. + * @param currentGroup - Place to store known children of widget. + * @param trackChanges - If true then tracks any changes to the children of * widget that are known. * @return bool - If a widget was set to something other then its default. * @see retrieveSettings() diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index 5eef5ee7..ce3e725c 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -209,7 +209,7 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix ) for ( TQStringList::ConstIterator it = d->actions.begin() ; it != d->actions.end(); ++it ) { i++; - linkCode+=TQString::fromLatin1(" <a href=\"%1\">%2</a> ").tqarg( TQString::number(i) , TQStyleSheet::escape(*it) ); + linkCode+=TQString::fromLatin1(" <a href=\"%1\">%2</a> ").arg( TQString::number(i) , TQStyleSheet::escape(*it) ); } linkCode+=TQString::fromLatin1("</p>"); KActiveLabel *link = new KActiveLabel(linkCode , vb ); diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index 27e12b44..40d01a92 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -86,7 +86,7 @@ public: Account::Account( Protocol *parent, const TQString &accountId, const char *name ) : TQObject( parent, name ), d( new Private( parent, accountId ) ) { - d->configGroup=new KConfigGroup(KGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).tqarg( d->protocol->pluginId(), d->id )); + d->configGroup=new KConfigGroup(KGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id )); d->excludeconnect = d->configGroup->readBoolEntry( "ExcludeConnect", false ); d->color = d->configGroup->readColorEntry( "Color", &d->color ); @@ -139,7 +139,7 @@ void Account::disconnected( DisconnectReason reason ) } if(reason== OtherClient) { - Kopete::Utils::notifyConnectionLost(this, i18n("You have been disconnected"), i18n( "You have connected from another client or computer to the account '%1'" ).tqarg(d->id), i18n("Most proprietary Instant Messaging services do not allow you to connect from more than one location. Check that nobody is using your account without your permission. If you need a service that supports connection from various locations at the same time, use the Jabber protocol.")); + Kopete::Utils::notifyConnectionLost(this, i18n("You have been disconnected"), i18n( "You have connected from another client or computer to the account '%1'" ).arg(d->id), i18n("Most proprietary Instant Messaging services do not allow you to connect from more than one location. Check that nobody is using your account without your permission. If you need a service that supports connection from various locations at the same time, use the Jabber protocol.")); } } @@ -255,7 +255,7 @@ Kopete::MetaContact* Account::addContact( const TQString &contactId, const TQStr if ( contactId == d->myself->contactId() ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").tqarg(contactId,accountId()), i18n("Error Creating Contact") + i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").arg(contactId,accountId()), i18n("Error Creating Contact") ); return false; } @@ -321,7 +321,7 @@ bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMod if ( contactId == myself()->contactId() ) { KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").tqarg(contactId,accountId()), i18n("Error Creating Contact") + i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").arg(contactId,accountId()), i18n("Error Creating Contact") ); return 0L; } @@ -365,7 +365,7 @@ KActionMenu * Account::actionMenu() TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick ) + nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick ) ); OnlineStatusManager::self()->createAccountStatusActions(this, menu); diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp index a3593175..16986143 100644 --- a/kopete/libkopete/kopetechatsession.cpp +++ b/kopete/libkopete/kopetechatsession.cpp @@ -171,7 +171,7 @@ void Kopete::ChatSession::slotUpdateDisplayName() //If we have only 1 contact, add the status of him if ( d->mContactList.count() == 1 ) { - d->displayName.append( TQString::fromLatin1( " (%1)" ).tqarg( d->mContactList.first()->onlineStatus().description() ) ); + d->displayName.append( TQString::fromLatin1( " (%1)" ).arg( d->mContactList.first()->onlineStatus().description() ) ); } emit displayNameChanged(); @@ -275,7 +275,7 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) { TQString nick=myself()->property(Kopete::Global::Properties::self()->nickName()).value().toString(); if ( KopetePrefs::prefs()->highlightEnabled() && !nick.isEmpty() && - msg.plainBody().contains( TQRegExp( TQString::fromLatin1( "\\b(%1)\\b" ).tqarg( nick ), false ) ) ) + msg.plainBody().contains( TQRegExp( TQString::fromLatin1( "\\b(%1)\\b" ).arg( nick ), false ) ) ) { msg.setImportance( Kopete::Message::Highlight ); } diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index c18b5c34..14486fc9 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -255,7 +255,7 @@ void Kopete::CommandHandler::slotHelpCommand( const TQString &args, Kopete::Chat if( c && !c->help().isNull() ) output = c->help(); else - output = i18n("There is no help available for '%1'.").tqarg( command ); + output = i18n("There is no help available for '%1'.").arg( command ); } Kopete::Message msg(manager->myself(), manager->members(), output, Kopete::Message::Internal, Kopete::Message::PlainText); diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index af56f96d..e1103ae4 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -202,9 +202,9 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager ) TQString titleText; TQString nick = property( Kopete::Global::Properties::self()->nickName() ).value().toString(); if( nick.isEmpty() ) - titleText = TQString::fromLatin1( "%1 (%2)" ).tqarg( contactId(), onlineStatus().description() ); + titleText = TQString::fromLatin1( "%1 (%2)" ).arg( contactId(), onlineStatus().description() ); else - titleText = TQString::fromLatin1( "%1 <%2> (%3)" ).tqarg( nick, contactId(), onlineStatus().description() ); + titleText = TQString::fromLatin1( "%1 <%2> (%3)" ).arg( nick, contactId(), onlineStatus().description() ); menu->insertTitle( titleText ); if( metaContact() && metaContact()->isTemporary() && contactId() != account()->myself()->contactId() ) @@ -314,7 +314,7 @@ void Contact::setMetaContact( MetaContact *m ) { //only one contact, including this one, that mean the contact will be empty efter the move result = KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget(), i18n( "You are moving the contact `%1' to the meta contact `%2'.\n" "`%3' will be empty afterwards. Do you want to delete this contact?" ) - .tqarg(contactId(), m ? m->displayName() : TQString(), old->displayName()) + .arg(contactId(), m ? m->displayName() : TQString(), old->displayName()) , i18n( "Move Contact" ), KStdGuiItem::del(), i18n( "&Keep" ) , TQString::fromLatin1("delete_old_contact_when_move") ); if(result==KMessageBox::Cancel) return; @@ -368,7 +368,7 @@ void Contact::serializeProperties(TQMap<TQString, TQString> &serializedData) continue; TQVariant val = it.data().value(); - TQString key = TQString::fromLatin1("prop_%1_%2").tqarg(TQString::fromLatin1(val.typeName()), it.key()); + TQString key = TQString::fromLatin1("prop_%1_%2").arg(TQString::fromLatin1(val.typeName()), it.key()); serializedData[key] = val.toString(); @@ -646,7 +646,7 @@ TQString Contact::toolTip() const // Fixed part of tooltip TQString iconName = TQString::fromLatin1("kopete-contact-icon:%1:%2:%3") - .tqarg( KURL::encode_string( protocol()->pluginId() ), + .arg( KURL::encode_string( protocol()->pluginId() ), KURL::encode_string( account()->accountId() ), KURL::encode_string( contactId() ) ); @@ -679,7 +679,7 @@ TQString Contact::toolTip() const if(!name.isEmpty()) { tip += i18n("<br><b>Full Name:</b> FORMATTED NAME", - "<br><b>Full Name:</b> <nobr>%1</nobr>").tqarg(TQStyleSheet::escape(name)); + "<br><b>Full Name:</b> <nobr>%1</nobr>").arg(TQStyleSheet::escape(name)); } } else if ((*it) == TQString::fromLatin1("FormattedIdleTime")) @@ -688,7 +688,7 @@ TQString Contact::toolTip() const if(!time.isEmpty()) { tip += i18n("<br><b>Idle:</b> FORMATTED IDLE TIME", - "<br><b>Idle:</b> <nobr>%1</nobr>").tqarg(time); + "<br><b>Idle:</b> <nobr>%1</nobr>").arg(time); } } else if ((*it) == TQString::fromLatin1("homePage")) @@ -768,8 +768,8 @@ TQString Kopete::Contact::formattedName() const if(!last.isNull()) // contact has both first and last name { ret = i18n("firstName lastName", "%2 %1") - .tqarg(last.value().toString()) - .tqarg(first.value().toString()); + .arg(last.value().toString()) + .arg(first.value().toString()); } else // only first name set { @@ -804,23 +804,23 @@ TQString Kopete::Contact::formattedIdleTime() const { ret = i18n( "<days>d <hours>h <minutes>m <seconds>s", "%4d %3h %2m %1s" ) - .tqarg( secs ) - .tqarg( mins ) - .tqarg( hours ) - .tqarg( days ); + .arg( secs ) + .arg( mins ) + .arg( hours ) + .arg( days ); } else if ( hours != 0 ) { ret = i18n( "<hours>h <minutes>m <seconds>s", "%3h %2m %1s" ) - .tqarg( secs ) - .tqarg( mins ) - .tqarg( hours ); + .arg( secs ) + .arg( mins ) + .arg( hours ); } else { ret = i18n( "<minutes>m <seconds>s", "%2m %1s" ) - .tqarg( secs ) - .tqarg( mins ); + .arg( secs ) + .arg( mins ); } } return ret; diff --git a/kopete/libkopete/kopeteeventpresentation.cpp b/kopete/libkopete/kopeteeventpresentation.cpp index f1017181..659b1b41 100644 --- a/kopete/libkopete/kopeteeventpresentation.cpp +++ b/kopete/libkopete/kopeteeventpresentation.cpp @@ -85,6 +85,6 @@ TQString Kopete::EventPresentation::toString() type= TQString::fromLatin1("chat"); break; } - TQString stringRep = TQString::fromLatin1( "Presentation; type=%1; content=%2; enabled=%3; single shot=%4\n" ).tqarg(type).tqarg(m_content).tqarg(m_enabled).tqarg(m_singleShot); + TQString stringRep = TQString::fromLatin1( "Presentation; type=%1; content=%2; enabled=%3; single shot=%4\n" ).arg(type).arg(m_content).arg(m_enabled).arg(m_singleShot); return stringRep; } diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp index c8c21c25..1c889fc5 100644 --- a/kopete/libkopete/kopeteglobal.cpp +++ b/kopete/libkopete/kopeteglobal.cpp @@ -257,7 +257,7 @@ void installEmoticonTheme(const TQString &archiveName) { KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("Could not open \"%1\" for unpacking.").tqarg(archiveName)); + i18n("Could not open \"%1\" for unpacking.").arg(archiveName)); delete archive; delete progressDlg; return; @@ -283,7 +283,7 @@ void installEmoticonTheme(const TQString &archiveName) { KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("<qt>The file \"%1\" is not a valid" \ - " emoticon theme archive.</qt>").tqarg(archiveName)); + " emoticon theme archive.</qt>").arg(archiveName)); archive->close(); delete archive; delete progressDlg; @@ -294,7 +294,7 @@ void installEmoticonTheme(const TQString &archiveName) { progressDlg->setLabel( i18n("<qt>Installing <strong>%1</strong> emoticon theme</qt>") - .tqarg(*it)); + .arg(*it)); progressDlg->resize(progressDlg->sizeHint()); kapp->processEvents(); diff --git a/kopete/libkopete/kopetemessage.cpp b/kopete/libkopete/kopetemessage.cpp index 2070dd56..c094ba72 100644 --- a/kopete/libkopete/kopetemessage.cpp +++ b/kopete/libkopete/kopetemessage.cpp @@ -374,8 +374,8 @@ TQString Message::parsedBody() const static TQString makeRegExp( const char *pattern ) { const TQString urlChar = TQString::fromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); - const TQString boundaryStart = TQString::fromLatin1( "(^|[^%1])(" ).tqarg( urlChar ); - const TQString boundaryEnd = TQString::fromLatin1( ")([^%1]|$)" ).tqarg( urlChar ); + const TQString boundaryStart = TQString::fromLatin1( "(^|[^%1])(" ).arg( urlChar ); + const TQString boundaryEnd = TQString::fromLatin1( ")([^%1]|$)" ).arg( urlChar ); return boundaryStart + TQString::fromLatin1(pattern) + boundaryEnd; } @@ -418,26 +418,26 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format ) // common subpatterns - may not contain matching parens! const TQString name = TQString::fromLatin1( "[\\w\\+\\-=_\\.]+" ); - const TQString userAndPassword = TQString::fromLatin1( "(?:%1(?::%1)?\\@)" ).tqarg( name ); + const TQString userAndPassword = TQString::fromLatin1( "(?:%1(?::%1)?\\@)" ).arg( name ); const TQString urlChar = TQString::fromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); - const TQString urlSection = TQString::fromLatin1( "[%1]+" ).tqarg( urlChar ); + const TQString urlSection = TQString::fromLatin1( "[%1]+" ).arg( urlChar ); const TQString domain = TQString::fromLatin1( "[\\-\\w_]+(?:\\.[\\-\\w_]+)+" ); //Replace http/https/ftp links: // Replace (stuff)://[user:password@](linkstuff) with a link result.replace( - TQRegExp( makeRegExp("\\w+://%1?\\w%2").tqarg( userAndPassword, urlSection ) ), + TQRegExp( makeRegExp("\\w+://%1?\\w%2").arg( userAndPassword, urlSection ) ), TQString::fromLatin1("\\1<a href=\"\\2\" title=\"\\2\">\\2</a>\\3" ) ); // Replace www.X.Y(linkstuff) with a http: link result.replace( - TQRegExp( makeRegExp("%1?www\\.%2%3").tqarg( userAndPassword, domain, urlSection ) ), + TQRegExp( makeRegExp("%1?www\\.%2%3").arg( userAndPassword, domain, urlSection ) ), TQString::fromLatin1("\\1<a href=\"http://\\2\" title=\"http://\\2\">\\2</a>\\3" ) ); //Replace Email Links // Replace user@domain with a mailto: link result.replace( - TQRegExp( makeRegExp("%1@%2").tqarg( name, domain ) ), + TQRegExp( makeRegExp("%1@%2").arg( name, domain ) ), TQString::fromLatin1("\\1<a href=\"mailto:\\2\" title=\"mailto:\\2\">\\2</a>\\3") ); //Workaround for Bug 85061: Highlighted URLs adds a ' ' after the URL itself @@ -531,11 +531,11 @@ TQString Message::getHtmlStyleAttribute() const // Affect foreground(color) and background color to message. if( !d->fgOverride && d->fgColor.isValid() ) { - styleAttribute += TQString::fromUtf8("color: %1; ").tqarg(d->fgColor.name()); + styleAttribute += TQString::fromUtf8("color: %1; ").arg(d->fgColor.name()); } if( !d->bgOverride && d->bgColor.isValid() ) { - styleAttribute += TQString::fromUtf8("background-color: %1; ").tqarg(d->bgColor.name()); + styleAttribute += TQString::fromUtf8("background-color: %1; ").arg(d->bgColor.name()); } // Affect font parameters. diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp index d4b53925..5f336a6b 100644 --- a/kopete/libkopete/kopetemimetypehandler.cpp +++ b/kopete/libkopete/kopetemimetypehandler.cpp @@ -159,7 +159,7 @@ bool MimeTypeHandler::dispatchToHandler( const KURL &url, const TQString &mimeTy } KMessageBox::sorry( Kopete::UI::Global::mainWidget(), - sorryText.tqarg( url.prettyURL() ) ); + sorryText.arg( url.prettyURL() ) ); return false; } diff --git a/kopete/libkopete/kopetenotifydataobject.cpp b/kopete/libkopete/kopetenotifydataobject.cpp index 68f2a0b9..e3faf3f1 100644 --- a/kopete/libkopete/kopetenotifydataobject.cpp +++ b/kopete/libkopete/kopetenotifydataobject.cpp @@ -94,7 +94,7 @@ bool Kopete::NotifyDataObject::notifyDataFromXML( const TQDomElement& element ) TQString suppress = fieldElement.attribute( TQString::fromLatin1( "suppress-common" ), TQString() ); Kopete::NotifyEvent *evt = new Kopete::NotifyEvent( suppress == TQString::fromLatin1( "true" ) ); - // get its tqchildren + // get its children TQDomNode child = fieldElement.firstChild(); while( !child.isNull() ) { diff --git a/kopete/libkopete/kopetenotifyevent.cpp b/kopete/libkopete/kopetenotifyevent.cpp index 544c3e45..4bd9fad7 100644 --- a/kopete/libkopete/kopetenotifyevent.cpp +++ b/kopete/libkopete/kopetenotifyevent.cpp @@ -170,7 +170,7 @@ const TQValueList<TQDomElement> Kopete::NotifyEvent::toXML() const TQString Kopete::NotifyEvent::toString() { - TQString stringRep = TQString::fromLatin1("Event; Suppress common=%1").tqarg( TQString::fromLatin1( suppressCommon() ? "true" : "false" ) ); + TQString stringRep = TQString::fromLatin1("Event; Suppress common=%1").arg( TQString::fromLatin1( suppressCommon() ? "true" : "false" ) ); if ( m_sound) stringRep += m_sound->toString(); if ( m_message) diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp index a814ed36..1ecd1d00 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.cpp +++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp @@ -138,12 +138,12 @@ TQString OnlineStatusManager::fingerprint( const OnlineStatus &statusFor, const // create a 'fingerprint' to use as a hash key // fingerprint consists of description/icon name/color/overlay name/size/idle state return TQString::fromLatin1("%1/%2/%3/%4/%5/%6") - .tqarg( statusFor.description() ) - .tqarg( icon ) - .tqarg( color.name() ) - .tqarg( statusFor.overlayIcons().join( TQString::fromLatin1( "," ) ) ) - .tqarg( size ) - .tqarg( idle ? 'i' : 'a' ); + .arg( statusFor.description() ) + .arg( icon ) + .arg( color.name() ) + .arg( statusFor.overlayIcons().join( TQString::fromLatin1( "," ) ) ) + .arg( size ) + .arg( idle ? 'i' : 'a' ); } TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor, const TQString& icon, int size, TQColor color, bool idle) diff --git a/kopete/libkopete/kopetepasswordedaccount.cpp b/kopete/libkopete/kopetepasswordedaccount.cpp index 899275c5..9c946d21 100644 --- a/kopete/libkopete/kopetepasswordedaccount.cpp +++ b/kopete/libkopete/kopetepasswordedaccount.cpp @@ -80,9 +80,9 @@ void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialStat TQString Kopete::PasswordedAccount::passwordPrompt() { if ( password().isWrong() ) - return i18n( "<b>The password was wrong;</b> please re-enter your password for %1 account <b>%2</b>" ).tqarg( protocol()->displayName(), accountId() ); + return i18n( "<b>The password was wrong;</b> please re-enter your password for %1 account <b>%2</b>" ).arg( protocol()->displayName(), accountId() ); else - return i18n( "Please enter your password for %1 account <b>%2</b>" ).tqarg( protocol()->displayName(), accountId() ); + return i18n( "Please enter your password for %1 account <b>%2</b>" ).arg( protocol()->displayName(), accountId() ); } Kopete::OnlineStatus Kopete::PasswordedAccount::initialStatus() diff --git a/kopete/libkopete/kopetepicture.cpp b/kopete/libkopete/kopetepicture.cpp index 809923d2..1336492f 100644 --- a/kopete/libkopete/kopetepicture.cpp +++ b/kopete/libkopete/kopetepicture.cpp @@ -120,7 +120,7 @@ TQString Picture::path() KMD5 context(tempArray); // Save the image to a file. localPhotoPath = context.hexDigest() + ".png"; - localPhotoPath = locateLocal( "appdata", TQString::fromUtf8("metacontactpicturecache/%1").tqarg( localPhotoPath) ); + localPhotoPath = locateLocal( "appdata", TQString::fromUtf8("metacontactpicturecache/%1").arg( localPhotoPath) ); if( image().save(localPhotoPath, "PNG") ) { d->picturePath = localPhotoPath; diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index dae70b34..844cdcf8 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -188,7 +188,7 @@ void PluginManager::shutdown() it != d->loadedPlugins.end(); /* EMPTY */ ) { // Plugins could emit their ready for unload signal directly in response to this, - // which would tqinvalidate the current iterator. Therefore, we copy the iterator + // which would invalidate the current iterator. Therefore, we copy the iterator // and increment it beforehand. Private::InfoToPluginMap::ConstIterator current( it ); ++it; @@ -377,7 +377,7 @@ Plugin *PluginManager::loadPluginInternal( const TQString &pluginId ) int error = 0; Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "Kopete/Plugin" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), this, 0, TQStringList(), &error ); + TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), this, 0, TQStringList(), &error ); if ( plugin ) { diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp index 58ca4b60..6e9072d0 100644 --- a/kopete/libkopete/kopeteprefs.cpp +++ b/kopete/libkopete/kopeteprefs.cpp @@ -439,7 +439,7 @@ void KopetePrefs::_setStylePath(const TQString &stylePath) if( !TQFile::exists(stylePath) || stylePath.isEmpty() ) { TQString fallback; - fallback = TQString(TQString::fromLatin1("styles/%1/")).tqarg(TQString::fromLatin1(KOPETE_DEFAULT_CHATSTYLE)); + fallback = TQString(TQString::fromLatin1("styles/%1/")).arg(TQString::fromLatin1(KOPETE_DEFAULT_CHATSTYLE)); mStylePath = locate("appdata", fallback); } } diff --git a/kopete/libkopete/kopeteprotocol.h b/kopete/libkopete/kopeteprotocol.h index e2e3f16a..f97bf809 100644 --- a/kopete/libkopete/kopeteprotocol.h +++ b/kopete/libkopete/kopeteprotocol.h @@ -132,7 +132,7 @@ public: RichIFormatting = 0x400, RichBFormatting = 0x800, - Alignment = 0x1000, ///< Setting the tqalignment of text portions + Alignment = 0x1000, ///< Setting the alignment of text portions /// Setting the formatting of the whole edit widget / message BaseFormatting = BaseIFormatting | BaseUFormatting | BaseBFormatting, diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index 08575fdc..1f8969f6 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -61,7 +61,7 @@ void Kopete::Command::slotAction() TQString args; if( m_minArgs > 0 ) { - args = KInputDialog::getText( i18n("Enter Arguments"), i18n("Enter the arguments to %1:").tqarg(m_command) ); + args = KInputDialog::getText( i18n("Enter Arguments"), i18n("Enter the arguments to %1:").arg(m_command) ); if( args.isNull() ) return; } @@ -74,23 +74,23 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession TQStringList mArgs = Kopete::CommandHandler::parseArguments( args ); if( m_processing ) { - printError( i18n("Alias \"%1\" expands to itself.").tqarg( text() ), manager, gui ); + printError( i18n("Alias \"%1\" expands to itself.").arg( text() ), manager, gui ); } else if( mArgs.count() < m_minArgs ) { printError( i18n("\"%1\" requires at least %n argument.", "\"%1\" requires at least %n arguments.", m_minArgs) - .tqarg( text() ), manager, gui ); + .arg( text() ), manager, gui ); } else if( m_maxArgs > -1 && (int)mArgs.count() > m_maxArgs ) { printError( i18n("\"%1\" has a maximum of %n argument.", "\"%1\" has a maximum of %n arguments.", m_minArgs) - .tqarg( text() ), manager, gui ); + .arg( text() ), manager, gui ); } else if( !KApplication::kApplication()->authorizeKAction( name() ) ) { - printError( i18n("You are not authorized to perform the command \"%1\".").tqarg(text()), manager, gui ); + printError( i18n("You are not authorized to perform the command \"%1\".").arg(text()), manager, gui ); } else { @@ -109,7 +109,7 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession while( mArgs.count() > 0 ) { - formatString = formatString.tqarg( mArgs.front() ); + formatString = formatString.arg( mArgs.front() ); mArgs.pop_front(); } diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 672d0ac4..190ca3c0 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -236,7 +236,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi default: event = TQString::fromLatin1( "kopete_contact_incoming" ); } - KNotification *notify=KNotification::event(msg.from()->metaContact() , event, body.tqarg( TQStyleSheet::escape(msgFrom), TQStyleSheet::escape(msgText) ), 0, /*msg.from()->metaContact(),*/ + KNotification *notify=KNotification::event(msg.from()->metaContact() , event, body.arg( TQStyleSheet::escape(msgFrom), TQStyleSheet::escape(msgText) ), 0, /*msg.from()->metaContact(),*/ w , i18n("View") ); connect(notify,TQT_SIGNAL(activated(unsigned int )), manager , TQT_SLOT(raiseView()) ); diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp index 5de3a023..31e04a52 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.cpp +++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp @@ -74,7 +74,7 @@ void AddressBookLinkWidget::slotSelectAddressee() { TQString message; if ( mMetaContact ) - message = i18n("Choose the corresponding entry for '%1'" ).tqarg( mMetaContact->displayName() ); + message = i18n("Choose the corresponding entry for '%1'" ).arg( mMetaContact->displayName() ); else message = i18n("Choose the corresponding entry in the address book" ); diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp index 018baf7a..5b5e1e55 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.cpp +++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp @@ -71,7 +71,7 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId, d->account=account; d->contactId=contactId; d->widget->m_label->setText(i18n("<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> has added you to his/her contactlist. (Account %3)</qt>") - .tqarg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::fromLatin1(":") + .arg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::fromLatin1(":") + KURL::encode_string( account->accountId() ) , contactNick.isEmpty() ? contactId : contactNick + TQString::fromLatin1(" < ") + contactId + TQString::fromLatin1(" >") , account->accountLabel() ) ); diff --git a/kopete/libkopete/ui/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui index 80390486..4408d23b 100644 --- a/kopete/libkopete/ui/contactaddednotifywidget.ui +++ b/kopete/libkopete/ui/contactaddednotifywidget.ui @@ -24,7 +24,7 @@ <property name="text"> <string>The contact XXX added you in his contactlist</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kopete/libkopete/ui/fileconfirmbase.ui b/kopete/libkopete/ui/fileconfirmbase.ui index 490d2a7f..98970958 100644 --- a/kopete/libkopete/ui/fileconfirmbase.ui +++ b/kopete/libkopete/ui/fileconfirmbase.ui @@ -32,7 +32,7 @@ <property name="text"> <string>A user is trying to send you a file. The file will only be downloaded if you accept this dialog. If you do not wish to receive it, please click 'Refuse'. This file will never be executed by Kopete at any point during or after the transfer.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui index 45b34aa2..38571bd6 100644 --- a/kopete/libkopete/ui/kopeteawaydialogbase.ui +++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui @@ -26,7 +26,7 @@ <property name="text"> <string>Please specify an away message, or choose a predefined one.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp index 33b54c4d..fffeec66 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp @@ -83,7 +83,7 @@ void KopeteFileConfirmDialog::slotUser2() if(TQFile(m_view->m_saveto->text()).exists()) { - int ret=KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists.\nDo you want to overwrite it ?").tqarg(m_view->m_saveto->text()) , + int ret=KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists.\nDo you want to overwrite it ?").arg(m_view->m_saveto->text()) , i18n("Overwrite File") , KStdGuiItem::save()); if(ret==KMessageBox::Cancel) return; diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index 777d35ae..5c4ff318 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -262,9 +262,9 @@ void Component::paint( TQPainter *painter, const TQColorGroup &cg ) } } -void Component::tqrepaint() +void Component::repaint() { - d->parent->tqrepaint(); + d->parent->repaint(); } void Component::retqlayout() @@ -374,7 +374,7 @@ void BoxComponent::calcMinSize() } if ( sizeChanged ) - tqrepaint(); + repaint(); else retqlayout(); } @@ -758,7 +758,7 @@ ImageComponent::ImageComponent( ComponentBase *parent, int minW, int minH ) { setMinWidth( minW ); setMinHeight( minH ); - tqrepaint(); + repaint(); } ImageComponent::~ImageComponent() @@ -777,7 +777,7 @@ void ImageComponent::setPixmap( const TQPixmap &img, bool) setMinWidth(d->image.width()); setMinHeight(d->image.height()); - tqrepaint(); + repaint(); } void ImageComponent::paint( TQPainter *painter, const TQColorGroup & ) @@ -814,7 +814,7 @@ void FaceComponent::setPixmap(const TQPixmap &img, bool) setMinHeight(d->image.height() + 4); } - tqrepaint(); + repaint(); } static TQPoint operator+(const TQPoint &pt, const TQSize &sz) @@ -906,7 +906,7 @@ void TextComponent::calcMinSize() else setMinHeight( 0 ); - tqrepaint(); + repaint(); } int TextComponent::widthForHeight( int ) @@ -927,13 +927,13 @@ void TextComponent::setColor( const TQColor &color ) { d->color = color; d->customColor = true; - tqrepaint(); + repaint(); } void TextComponent::setDefaultColor() { d->customColor = false; - tqrepaint(); + repaint(); } void TextComponent::paint( TQPainter *painter, const TQColorGroup &cg ) @@ -1370,7 +1370,7 @@ void Item::slotLayoutAnimateItems() updateAnimationPosition( p, s ); setHeight(0); - tqrepaint(); + repaint(); } float Item::opacity() @@ -1382,7 +1382,7 @@ void Item::setOpacity( float opacity ) { if ( d->opacity == opacity ) return; d->opacity = opacity; - tqrepaint(); + repaint(); } void Item::setSearchMatch( bool match ) @@ -1451,10 +1451,10 @@ void Item::slotUpdateVisibility() setVisible( false ); } setHeight( 0 ); - tqrepaint(); + repaint(); } -void Item::tqrepaint() +void Item::repaint() { // if we're about to retqlayout, don't bother painting yet. if ( d->layoutTimer.isActive() ) diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h index 0868afab..ba4b86f7 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.h +++ b/kopete/libkopete/ui/kopetelistviewitem.h @@ -44,7 +44,7 @@ public: Component *componentAt( const TQPoint &pt ); /** Repaint this item */ - virtual void tqrepaint() = 0; + virtual void repaint() = 0; /** Retqlayout this item */ virtual void retqlayout() = 0; @@ -64,7 +64,7 @@ protected: virtual void componentRemoved( Component *component ); /** A child item has been resized */ virtual void componentResized( Component *component ); - /** Remove all tqchildren */ + /** Remove all children */ virtual void clear(); /** @internal animate items */ @@ -116,11 +116,11 @@ public: /** * Paint this item, inside the rectangle returned by rect(). - * The default implementation calls paint on all tqchildren. + * The default implementation calls paint on all children. */ virtual void paint( TQPainter *painter, const TQColorGroup &cg ); - void tqrepaint(); + void repaint(); void retqlayout(); /** @@ -460,7 +460,7 @@ public: Item( TQListViewItem *parent, TQObject *owner = 0, const char *name = 0 ); ~Item(); - void tqrepaint(); + void repaint(); void retqlayout(); void setup(); diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp index 35149e66..560abb97 100644 --- a/kopete/libkopete/ui/userinfodialog.cpp +++ b/kopete/libkopete/ui/userinfodialog.cpp @@ -59,7 +59,7 @@ struct UserInfoDialog::UserInfoDialogPrivate { }; UserInfoDialog::UserInfoDialog( const TQString& descr ) -: KDialogBase( Kopete::UI::Global::mainWidget(), "userinfodialog", true, i18n( "User Info for %1" ).tqarg( descr ), KDialogBase::Ok ) +: KDialogBase( Kopete::UI::Global::mainWidget(), "userinfodialog", true, i18n( "User Info for %1" ).arg( descr ), KDialogBase::Ok ) { d = new UserInfoDialogPrivate; d->page = new TQWidget( this ); diff --git a/kopete/libkopete/webcamwidget.cpp b/kopete/libkopete/webcamwidget.cpp index d6f93a8a..5940a0f1 100644 --- a/kopete/libkopete/webcamwidget.cpp +++ b/kopete/libkopete/webcamwidget.cpp @@ -67,7 +67,7 @@ void WebcamWidget::setText(const TQString& text) void WebcamWidget::paintEvent( TQPaintEvent* event ) { - TQMemArray<TQRect> rects = TQRegion(event->region()).tqrects(); + TQMemArray<TQRect> rects = TQRegion(event->region()).rects(); if (!mPixmap.isNull()) { 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('<',"<"); - 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 493f3575..fa3b97c7 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><b>%1</b> 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><b>Share Your Musical Taste</b></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 >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 dd872ee0..a2433350 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: { diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 47a124b3..19db0db7 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -710,7 +710,7 @@ GaduAccount::connectionFailed( gg_failure_t failure ) slotLogin( p->status.internalStatus() , p->lastDescription ); } else { - error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).tqarg( GaduSession::failureDescription( failure ) ), + error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).arg( GaduSession::failureDescription( failure ) ), i18n( "Connection Error" ) ); p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); myself()->setOnlineStatus( p->status ); @@ -925,7 +925,7 @@ GaduAccount::slotExportContactsListToFile() p->saveListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString(), Kopete::UI::Global::mainWidget(), "gadu-list-save", false ); p->saveListDialog->setCaption( - i18n("Save Contacts List for Account %1 As").tqarg( + i18n("Save Contacts List for Account %1 As").arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) ); if ( p->saveListDialog->exec() == TQDialog::Accepted ) { @@ -971,7 +971,7 @@ GaduAccount::slotImportContactsFromFile() p->loadListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString(), Kopete::UI::Global::mainWidget(), "gadu-list-load", true ); p->loadListDialog->setCaption( - i18n("Load Contacts List for Account %1 As").tqarg( + i18n("Load Contacts List for Account %1 As").arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) ); if ( p->loadListDialog->exec() == TQDialog::Accepted ) { diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index c36f1ced..104e1b01 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -44,7 +44,7 @@ GaduCommand::GaduCommand( TQObject* parent, const char* name ) GaduCommand::~GaduCommand() { - //TQSocketNotifiers are tqchildren and will + //TQSocketNotifiers are children and will //be deleted anyhow } @@ -204,7 +204,7 @@ void RegisterCommand::watcher() } pubDir = (struct gg_pubdir *)session_->data; - emit operationStatus( i18n( "Token retrieving status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); + emit operationStatus( i18n( "Token retrieving status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; @@ -254,7 +254,7 @@ void RegisterCommand::watcher() return; } pubDir = (gg_pubdir*) session_->data; - emit operationStatus( i18n( "Registration status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); + emit operationStatus( i18n( "Registration status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index 2d0e45d4..7ec8d2ac 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -237,8 +237,8 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c KGuiItem resumeButton( i18n ( "&Resume" ) ); KGuiItem overwriteButton( i18n ( "Over&write" ) ); switch ( KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget (), - i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).tqarg( fileName ), - i18n( "File Exists: %1" ).tqarg( fileName ), resumeButton, overwriteButton ) ) + i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).arg( fileName ), + i18n( "File Exists: %1" ).arg( fileName ), resumeButton, overwriteButton ) ) { // resume case KMessageBox::Yes: diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index 22f28703..e33b4959 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -156,7 +156,7 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri ui->labelVerificationSequence->setDisabled( true ); ui->labelInstructions->setDisabled( true ); emit registeredNumber( cRegister->newUin(), ui->valuePassword->text() ); - updateStatus( i18n( "Account created; your new UIN is %1." ).tqarg(TQString::number( cRegister->newUin() ) ) ); + updateStatus( i18n( "Account created; your new UIN is %1." ).arg(TQString::number( cRegister->newUin() ) ) ); enableButton( User1, false ); setButtonText( Ok, i18n( "&Close" ) ); } @@ -164,7 +164,7 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri void GaduRegisterAccount::registrationError( const TQString& title, const TQString& what ) { - updateStatus( i18n( "Registration failed: %1" ).tqarg( what ) ); + updateStatus( i18n( "Registration failed: %1" ).arg( what ) ); KMessageBox::sorry( this, "Registration was unsucessful, please try again.", title ); disconnect( this, TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp index 18ef22b7..377967bc 100644 --- a/kopete/protocols/gadu/gadurichtextformat.cpp +++ b/kopete/protocols/gadu/gadurichtextformat.cpp @@ -100,9 +100,9 @@ GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, vo g = (int)color->green; b = (int)color->blue; } - style += TQString(" color: rgb( %1, %2, %3 ); ").tqarg( r ).tqarg( g ).tqarg( b ); + style += TQString(" color: rgb( %1, %2, %3 ); ").arg( r ).arg( g ).arg( b ); - tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").tqarg( style ) ); + tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").arg( style ) ); opened = true; } @@ -198,7 +198,7 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) return NULL; } - TQString rep = TQString("<span style=\"%1\">%2</span>" ).tqarg( styleHTML ).tqarg( replacement ); + TQString rep = TQString("<span style=\"%1\">%2</span>" ).arg( styleHTML ).arg( replacement ); htmlString.replace( findTags.pos( 0 ), rep.length(), replacement ); replacement = unescapeGaduMessage( replacement ); @@ -263,14 +263,14 @@ GaduRichTextFormat::insertRtf( uint position) // append font description rtfs.position = position; uint csize = rtf.size(); - if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) { + if ( rtf.resize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) { return false; }; memcpy( rtf.data() + csize, &rtfs, sizeof( rtfs ) ); // append color description, if color has changed if ( rtfs.font & GG_FONT_COLOR ) { csize = rtf.size(); - if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) { + if ( rtf.resize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) { return false; }; memcpy( rtf.data() + csize, &rtcs, sizeof( rtcs ) ); diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index 12fc5794..7fded85a 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -617,7 +617,7 @@ GaduSession::errorDescription( int err ) case GG_ERROR_WRITING: return i18n( "Writing error." ); default: - return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)err ) ); + return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)err ) ); } } @@ -642,7 +642,7 @@ GaduSession::failureDescription( gg_failure_t f ) case GG_FAILURE_TLS: return i18n( "Unable to connect over encrypted channel.\nTry to turn off encryption support in Gadu account settings and reconnect." ); default: - return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)f ) ); + return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)f ) ); } } diff --git a/kopete/protocols/gadu/ui/gaduadd.ui b/kopete/protocols/gadu/ui/gaduadd.ui index 7fa193d6..48279c5d 100644 --- a/kopete/protocols/gadu/ui/gaduadd.ui +++ b/kopete/protocols/gadu/ui/gaduadd.ui @@ -45,7 +45,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -78,7 +78,7 @@ <property name="text"> <string><i>(for example: 1234567)</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui index 91556886..8707f8db 100644 --- a/kopete/protocols/gadu/ui/gadueditaccountui.ui +++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui @@ -168,7 +168,7 @@ <string>To connect to the Gadu-Gadu network, you will need a Gadu-Gadu account.<br><br> If you do not currently have an account, please click the button to create one.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -797,7 +797,7 @@ If you do not currently have an account, please click the button to create one.< <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui index cc4f6149..8099b0d9 100644 --- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui +++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui @@ -374,7 +374,7 @@ <property name="text"> <string><i>Type the letters and numbers shown in the image above into the <b>Verification Sequence</b> field. This is used to prevent automated registration abuse.</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -402,7 +402,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index 2896ccc8..d6d89a25 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -364,7 +364,7 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password ) void GroupWiseAccount::slotMessageSendingFailed() { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to <wstephenson@novell.com> for analysis." ).tqarg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").tqarg( accountId() ) ); + i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to <wstephenson@novell.com> for analysis." ).arg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").arg( accountId() ) ); } void GroupWiseAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQString &reason ) @@ -566,7 +566,7 @@ void GroupWiseAccount::reconcileOfflineChanges() break; } else - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple tqchildren and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple children and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl; conflicts = true; } } // @@ -647,7 +647,7 @@ void GroupWiseAccount::slotConnError() { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl; KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).tqarg( accountId() ) , i18n ("Unable to Connect '%1'").tqarg( accountId() ) ); + i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).arg( accountId() ) , i18n ("Unable to Connect '%1'").arg( accountId() ) ); disconnect(); } @@ -823,19 +823,19 @@ void GroupWiseAccount::handleIncomingMessage( const ConferenceEvent & message ) { TQString prefix = i18n("Prefix used for automatically generated auto-reply" " messages when the contact is Away, contains contact's name", - "Auto reply from %1: " ).tqarg( sender->metaContact()->displayName() ); + "Auto reply from %1: " ).arg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } if ( message.type == GroupWise::ReceivedBroadcast ) { TQString prefix = i18n("Prefix used for broadcast messages", - "Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() ); + "Broadcast message from %1: " ).arg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } if ( message.type == GroupWise::ReceivedSystemBroadcast ) { TQString prefix = i18n("Prefix used for system broadcast messages", - "System Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() ); + "System Broadcast message from %1: " ).arg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } @@ -1210,7 +1210,7 @@ void GroupWiseAccount::receiveContactCreated() KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget (), KMessageBox::Error, i18n ("The contact %1 could not be added to the contact list, with error message: %2"). - tqarg(cct->userId() ).tqarg( cct->statusString() ), + arg(cct->userId() ).arg( cct->statusString() ), i18n ("Error Adding Contact") ); } } @@ -1255,8 +1255,8 @@ void GroupWiseAccount::receiveContactDeleted( const ContactItem & instance ) void GroupWiseAccount::slotConnectedElsewhere() { - KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").tqarg( accountId() ), - i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).tqarg( accountId() ) , Kopete::UI::Global::mainWidget() ); + KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").arg( accountId() ), + i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).arg( accountId() ) , Kopete::UI::Global::mainWidget() ); disconnect(); } @@ -1364,7 +1364,7 @@ void GroupWiseAccount::receiveInviteNotify( const ConferenceEvent & event ) c = createTemporaryContact( event.user ); sess->addInvitee( c ); - Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").tqarg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText ); + Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").arg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText ); sess->appendMessage( declined ); } else diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 98fd1f81..1aef7110 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -237,7 +237,7 @@ void GroupWiseContact::setOnlineStatus( const Kopete::OnlineStatus& status ) { Kopete::Contact::setOnlineStatus(Kopete::OnlineStatus(status.status() , (status.weight()==0) ? 0 : (status.weight() -1) , protocol() , status.internalStatus()+15 , TQString::fromLatin1("msn_blocked"), - i18n("%1|Blocked").tqarg( status.description() ) ) ); + i18n("%1|Blocked").arg( status.description() ) ) ); } else { diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index 5389e4ac..100bbfdf 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -196,7 +196,7 @@ void GroupWiseChatSession::slotCreationFailed( const int failedId, const int sta { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " couldn't start a chat, no GUID.\n" << endl; //emit creationFailed(); - Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").tqarg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText); + Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").arg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText); appendMessage( failureNotify ); setClosed(); } @@ -468,7 +468,7 @@ void GroupWiseChatSession::inviteDeclined( GroupWiseContact * c ) TQString from = c->metaContact()->displayName(); Kopete::Message declined = Kopete::Message( myself(), members(), - i18n("%1 has rejected an invitation to join this conversation.").tqarg( from ), + i18n("%1 has rejected an invitation to join this conversation.").arg( from ), Kopete::Message::Internal, Kopete::Message::PlainText ); appendMessage( declined ); } diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index cfb506da..539698ec 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -190,7 +190,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) case '{': case '}': case '\\': - outputText.append( TQString( "\\%1" ).tqarg( TQChar( current ) ) ); + outputText.append( TQString( "\\%1" ).arg( TQChar( current ) ) ); break; case '\n': outputText.append( "\\par " ); @@ -253,12 +253,12 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) bytesEncoded = 1; } index += bytesEncoded; - escapedUnicodeChar = TQString("\\u%1?").tqarg( ucs4Char ); + escapedUnicodeChar = TQString("\\u%1?").arg( ucs4Char ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "tqunicode escaped char: " << escapedUnicodeChar << endl; outputText.append( escapedUnicodeChar ); } } - return rtfTemplate.tqarg( outputText ); + return rtfTemplate.arg( outputText ); } TQString GroupWiseProtocol::dnToDotted( const TQString & dn ) diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index f24946c5..5df0d1de 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.cpp +++ b/kopete/protocols/groupwise/libgroupwise/client.cpp @@ -218,7 +218,7 @@ void Client::initialiseEventTasks() void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ) { - debug( TQString("Setting status to %1").tqarg( status ) );; + debug( TQString("Setting status to %1").arg( status ) );; SetStatusTask * sst = new SetStatusTask( d->root ); sst->status( status, reason, autoReply ); connect( sst, TQT_SIGNAL( finished() ), this, TQT_SLOT( sst_statusChanged() ) ); @@ -306,7 +306,7 @@ void Client::sendInvitation( const GroupWise::ConferenceGuid & guid, const TQStr // SLOTS // void Client::streamError( int error ) { - debug( TQString( "CLIENT ERROR (Error %1)" ).tqarg( error ) ); + debug( TQString( "CLIENT ERROR (Error %1)" ).arg( error ) ); } void Client::streamReadyRead() @@ -390,14 +390,14 @@ void Client::jct_joinConfCompleted() { const JoinConferenceTask * jct = ( JoinConferenceTask * )sender(); #ifdef LIBGW_DEBUG - debug( TQString( "Joined conference %1, participants are: " ).tqarg( jct->guid() ) ); + debug( TQString( "Joined conference %1, participants are: " ).arg( jct->guid() ) ); TQStringList parts = jct->participants(); for ( TQStringList::Iterator it = parts.begin(); it != parts.end(); ++it ) - debug( TQString( " - %1" ).tqarg(*it) ); + debug( TQString( " - %1" ).arg(*it) ); debug( "invitees are: " ); TQStringList invitees = jct->invitees(); for ( TQStringList::Iterator it = invitees.begin(); it != invitees.end(); ++it ) - debug( TQString( " - %1" ).tqarg(*it) ); + debug( TQString( " - %1" ).arg(*it) ); #endif emit conferenceJoined( jct->guid(), jct->participants(), jct->invitees() ); } @@ -431,7 +431,7 @@ TQString Client::password() TQString Client::userAgent() { - return TQString::fromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname ); + return TQString::fromLatin1( "%1/%2 (%3)" ).arg( d->clientName, d->clientVersion, d->osname ); } TQCString Client::ipAddress() @@ -457,7 +457,7 @@ void Client::send( Request * request ) return; } // TQString out = request.toString(); -// debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); +// debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); // xmlOutgoing(out); d->stream->write( request ); diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp index 79ecf419..449adfe0 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp @@ -142,7 +142,7 @@ void CoreProtocol::addIncomingData( const TQByteArray & incomingBytes ) while ( m_in.size() && ( parsedBytes = wireToTransfer( m_in ) ) ) { transferCount++; - debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).tqarg( transferCount ) ); + debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).arg( transferCount ) ); int size = m_in.size(); if ( parsedBytes < size ) { @@ -185,7 +185,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef LIBGW_DEBUG - CoreProtocol::debug( TQString( "contains: %1 bytes" ).tqarg( bytes.count() ) ); + CoreProtocol::debug( TQString( "contains: %1 bytes" ).arg( bytes.count() ) ); for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -226,7 +226,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) command = "login"; host = request->command().section( ':', 1, 1 ).ascii(); port = request->command().section( ':', 2, 2 ).ascii(); - debug( TQString( "Host: %1 Port: %2" ).tqarg( host.data() ).tqarg( port.data() ) ); + debug( TQString( "Host: %1 Port: %2" ).arg( host.data() ).arg( port.data() ) ); } else command = request->command().ascii(); @@ -246,7 +246,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) else dout << "\r\n"; - debug( TQString( "data out: %1" ).tqarg( bytesOut.data() ) ); + debug( TQString( "data out: %1" ).arg( bytesOut.data() ) ); emit outgoingData( bytesOut ); // now convert @@ -337,7 +337,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) + GW_URLVAR_VAL + (const char *)valString + GW_URLVAR_TYPE + typeString; - debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).tqarg( outgoing.data() ) ); + debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).arg( outgoing.data() ) ); dout.writeRawBytes( outgoing.data(), outgoing.length() ); // write what we have so far, we may be calling this function recursively //kdDebug( 14999 ) << k_funcinfo << "writing \'" << bout << "\'" << endl; @@ -398,12 +398,12 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) } else // otherwise -> Event code { - debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).tqarg( val ).tqarg( wire.size() ) ); + debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).arg( val ).arg( wire.size() ) ); Transfer * t = m_eventProtocol->parse( wire, bytesParsed ); if ( t ) { m_inTransfer = t; - debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).tqarg( val ).tqarg( bytesParsed ) ); + debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).arg( val ).arg( bytesParsed ) ); m_state = Available; emit incomingData(); } @@ -486,7 +486,7 @@ TQChar CoreProtocol::encode_method( TQ_UINT8 method ) void CoreProtocol::slotOutgoingData( const TQCString &out ) { - debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).tqarg( out.data() ) ); + debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).arg( out.data() ) ); } bool CoreProtocol::okToProceed() diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp index 6ea65595..93ce7c92 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp @@ -53,10 +53,10 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) m_din >> type; m_bytes += sizeof( TQ_UINT32 ); - debug( TQString( "EventProtocol::parse() Reading event of type %1" ).tqarg( type ) ); + debug( TQString( "EventProtocol::parse() Reading event of type %1" ).arg( type ) ); if ( type > Stop ) { - debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).tqarg( type ) ); + debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).arg( type ) ); m_state = OutOfSync; return 0; } @@ -96,9 +96,9 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) m_din.unsetDevice(); return 0; } - debug( TQString( "got status: %1").tqarg( status ) ); + debug( TQString( "got status: %1").arg( status ) ); tentative->setStatus( status ); - debug( TQString( "tentative status: %1").tqarg( tentative->status() ) ); + debug( TQString( "tentative status: %1").arg( tentative->status() ) ); tentative->setStatusText( statusText ); break; case ConferenceJoined: // 106 - GUID + FLAGS @@ -191,7 +191,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) tentative->setMessage( message ); break; default: - debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).tqarg( type ) ); + debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).arg( type ) ); break; } // if we got this far, the parse succeeded, return the Transfer diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp index 7305f7bc..f39c2ec7 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp @@ -378,7 +378,7 @@ void cs_dump( const TQByteArray &bytes ) { //#define GW_CLIENTSTREAM_DEBUG 1 #ifdef GW_CLIENTSTREAM_DEBUG - CoreProtocol::debug( TQString( "contains: %1 bytes " ).tqarg( bytes.count() ) ); + CoreProtocol::debug( TQString( "contains: %1 bytes " ).arg( bytes.count() ) ); uint count = 0; while ( count < bytes.count() ) { @@ -440,7 +440,7 @@ void ClientStream::cp_incomingData() emit doReadyRead(); } else - CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).tqarg( d->client.state() ) ); + CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).arg( d->client.state() ) ); } void ClientStream::cr_connected() @@ -520,7 +520,7 @@ void ClientStream::ss_readyRead() #ifdef LIBGW_DEBUG TQCString cs(a.data(), a.size()+1); - CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).tqarg( a.size() ) ); + CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).arg( a.size() ) ); cs_dump( a ); #endif @@ -532,7 +532,7 @@ void ClientStream::ss_readyRead() void ClientStream::ss_bytesWritten(int bytes) { #ifdef LIBGW_DEBUG - CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).tqarg( bytes ) ); + CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).arg( bytes ) ); #else Q_UNUSED( bytes ); #endif @@ -556,7 +556,7 @@ void ClientStream::ss_tlsClosed() void ClientStream::ss_error(int x) { - CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").tqarg( x ) ); + CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").arg( x ) ); if(x == SecureStream::ErrTLS) { reset(); d->errCond = TLSFail; diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp index 65574eb3..ba2a2a58 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp @@ -146,7 +146,7 @@ TQString GroupWise::errorCodeToString( int errorCode ) errorString = i18n( "Chat has been removed from server" ); break; default: - errorString = i18n("Unrecognized error code: %s").tqarg( errorCode ); + errorString = i18n("Unrecognized error code: %s").arg( errorCode ); #else case NMERR_ACCESS_DENIED: errorString = "Access denied"; @@ -269,7 +269,7 @@ TQString GroupWise::errorCodeToString( int errorCode ) errorString = "Chat has been removed from server"; break; default: - errorString = TQString("Unrecognized error code: %s").tqarg( errorCode ); + errorString = TQString("Unrecognized error code: %s").arg( errorCode ); #endif } return errorString; diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp index 14a5af70..415905bf 100644 --- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp +++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp @@ -98,7 +98,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) // if ( (TQ_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF ) if ( temp.length() < ( val - 1 ) ) { - debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).tqarg( temp.length() ).tqarg( val ) ); + debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).arg( temp.length() ).arg( val ) ); m_state = NeedMore; return false; } diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp index 50788178..2c7f3615 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp @@ -71,7 +71,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) return 0; } headerRest.append( line ); - debug( TQString( "- read header line - (%1) : %2" ).tqarg( line.length() ).tqarg( line.data() ) ); + debug( TQString( "- read header line - (%1) : %2" ).arg( line.length() ).arg( line.data() ) ); } debug( "ResponseProtocol::readResponse() header finished" ); // if it's a redirect, set flag @@ -85,14 +85,14 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) // other header processing ( 500! ) if ( ok && rtnCode == 500 ) { - debug( TQString( "- server error %1" ).tqarg( rtnCode ) ); + debug( TQString( "- server error %1" ).arg( rtnCode ) ); packetState = ServerError; m_din.unsetDevice(); return 0; } if ( ok && rtnCode == 404 ) { - debug( TQString( "- server error %1" ).tqarg( rtnCode ) ); + debug( TQString( "- server error %1" ).arg( rtnCode ) ); packetState = ServerError; m_din.unsetDevice(); return 0; @@ -123,7 +123,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) if ( sf ) { tId = sf->value().toInt(); - debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).tqarg( tId ) ); + debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).arg( tId ) ); m_collatingFields.remove( it ); delete sf; } @@ -135,7 +135,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) if ( sf ) { resultCode = sf->value().toInt(); - debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).tqarg( resultCode ) ); + debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).arg( resultCode ) ); m_collatingFields.remove( it ); delete sf; } @@ -143,7 +143,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) // append to inQueue if ( tId ) { - debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).tqarg(m_collatingFields.count() ) ); + debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).arg(m_collatingFields.count() ) ); packetState = Available; bytes = m_bytes; m_din.unsetDevice(); @@ -169,7 +169,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) // if we find the beginning of a new nested list, push the current list onto m_collatingFields debug( "ResponseProtocol::readFields()" ); if ( fieldCount > 0 ) - debug( TQString( "reading %1 fields" ).tqarg( fieldCount ) ); + debug( TQString( "reading %1 fields" ).arg( fieldCount ) ); Field::FieldList currentList; while ( fieldCount != 0 ) // prevents bad input data from ruining our day { @@ -209,7 +209,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } - debug( TQString( "- type: %1, method: %2, tag: %3," ).tqarg( type ).tqarg( method ).tqarg( tag.data() ) ); + debug( TQString( "- type: %1, method: %2, tag: %3," ).arg( type ).arg( method ).arg( tag.data() ) ); // if multivalue or array if ( type == NMFIELD_TYPE_MV || type == NMFIELD_TYPE_ARRAY ) { @@ -223,7 +223,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) m_bytes += sizeof( TQ_UINT32 ); // create multifield - debug( TQString( " multi field containing: %1" ).tqarg( val ) ); + debug( TQString( " multi field containing: %1" ).arg( val ) ); Field::MultiField* m = new Field::MultiField( tag, method, 0, type ); currentList.append( m ); if ( !readFields( val, ¤tList) ) @@ -250,7 +250,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) } // convert to tqunicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val. TQString fieldValue = TQString::fromUtf8( rawData.data(), val - 1 ); - debug( TQString( "- utf/dn single field: %1" ).tqarg( fieldValue ) ); + debug( TQString( "- utf/dn single field: %1" ).arg( fieldValue ) ); // create singlefield Field::SingleField* s = new Field::SingleField( tag, method, 0, type, fieldValue ); currentList.append( s ); @@ -266,7 +266,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) } m_din >> val; m_bytes += sizeof( TQ_UINT32 ); - debug( TQString( "- numeric field: %1" ).tqarg( val ) ); + debug( TQString( "- numeric field: %1" ).arg( val ) ); Field::SingleField* s = new Field::SingleField( tag, method, 0, type, val ); currentList.append( s ); } diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc index afe7b18e..a74b4c67 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.cc +++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc @@ -2182,7 +2182,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), + // Since we don't implement any of the paragraph formatting tags (e.g. alignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll index 7f2f1841..67e9f5f5 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.ll +++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll @@ -517,7 +517,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), + // Since we don't implement any of the paragraph formatting tags (e.g. alignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp index 858c8fde..547844d9 100644 --- a/kopete/protocols/groupwise/libgroupwise/task.cpp +++ b/kopete/protocols/groupwise/libgroupwise/task.cpp @@ -130,7 +130,7 @@ bool Task::take( Transfer * transfer) if(p.isEmpty()) return false; - // pass along the transfer to our tqchildren + // pass along the transfer to our children TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { @@ -142,7 +142,7 @@ bool Task::take( Transfer * transfer) if(t->take( transfer )) { - client()->debug( TQString( "Transfer ACCEPTED by: %1" ).tqarg( t->className() ) ); + client()->debug( TQString( "Transfer ACCEPTED by: %1" ).arg( t->className() ) ); return true; } } @@ -256,7 +256,7 @@ void Task::clientDisconnected() void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").tqarg(className()) + str); + client()->debug(TQString("%1: ").arg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp index 3fccc218..c88e22b4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp @@ -53,10 +53,10 @@ ConferenceTask::~ConferenceTask() void ConferenceTask::dumpConferenceEvent( ConferenceEvent & evt ) { - client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).tqarg - ( evt.guid ).tqarg( evt.user.ascii() ).tqarg( evt.timeStamp.time().hour() ).tqarg - ( evt.timeStamp.time().minute() ).tqarg( evt.timeStamp.time().second() ) ); - client()->debug( TQString( " flags: %1" ).tqarg( evt.flags, 8 ) ); + client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).arg + ( evt.guid ).arg( evt.user.ascii() ).arg( evt.timeStamp.time().hour() ).arg + ( evt.timeStamp.time().minute() ).arg( evt.timeStamp.time().second() ) ); + client()->debug( TQString( " flags: %1" ).arg( evt.flags, 8 ) ); } bool ConferenceTask::take( Transfer * transfer ) @@ -103,7 +103,7 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceiveMessage" ); - client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); + client()->debug( TQString( "message: %1" ).arg( event.message ) ); if ( !queueWhileAwaitingData( event ) ) emit message( event ); break; @@ -119,7 +119,7 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ConferenceInvite" ); - client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); + client()->debug( TQString( "message: %1" ).arg( event.message ) ); if ( !queueWhileAwaitingData( event ) ) emit invited( event ); break; @@ -139,14 +139,14 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceiveAutoReply" ); - client()->debug( TQString( "message: %1" ).tqarg( event.message.ascii() ) ); + client()->debug( TQString( "message: %1" ).arg( event.message.ascii() ) ); emit autoReply( event ); break; case GroupWise::ReceivedBroadcast: Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceivedBroadCast" ); - client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); + client()->debug( TQString( "message: %1" ).arg( event.message ) ); if ( !queueWhileAwaitingData( event ) ) emit broadcast( event ); break; @@ -154,11 +154,11 @@ bool ConferenceTask::take( Transfer * transfer ) Q_ASSERT( incomingEvent->hasMessage() ); event.message = incomingEvent->message(); client()->debug( "ReceivedSystemBroadCast" ); - client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); + client()->debug( TQString( "message: %1" ).arg( event.message ) ); emit systemBroadcast( event ); break; default: - client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).tqarg( incomingEvent->eventType() ).tqarg( event.guid.ascii() ) ); + client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).arg( incomingEvent->eventType() ).arg( event.guid.ascii() ) ); } dumpConferenceEvent( event ); @@ -181,7 +181,7 @@ void ConferenceTask::slotReceiveUserDetails( const GroupWise::ContactDetails & d // if the details relate to event, try again to handle it if ( details.dn == (*current).user ) { - client()->debug( TQString( " - got details for event involving %1" ).tqarg( (*current).user ) ); + client()->debug( TQString( " - got details for event involving %1" ).arg( (*current).user ) ); switch ( (*current).type ) { case GroupWise::ConferenceJoined: @@ -220,7 +220,7 @@ bool ConferenceTask::queueWhileAwaitingData( const ConferenceEvent & event ) } else { - client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).tqarg( event.user ) ); + client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).arg( event.user ) ); client()->userDetailsManager()->requestDetails( event.user ); m_pendingEvents.append( event ); return true; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp index 920eec3b..0d167236 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp @@ -71,7 +71,7 @@ void CreateContactTask::onGo() // create contacts on the server for ( ; it != end; ++it ) { - client()->debug( TQString( " - contact is in folder %1 with id %2" ).tqarg( (*it).name ).tqarg( (*it).id ) ); + client()->debug( TQString( " - contact is in folder %1 with id %2" ).arg( (*it).name ).arg( (*it).id ) ); CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() ); // the add contact action may cause other contacts' sequence numbers to change // CreateContactInstanceTask signals these changes, so we propagate the signal via the Client, to the GroupWiseAccount @@ -112,8 +112,8 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact ) client()->debug( " - addedContact is not the one we were trying to add, ignoring it ( Account will update it )" ); return; } - client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg - ( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.parentId ) ); + client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).arg + ( addedContact.displayName ).arg( addedContact.id ).arg( addedContact.parentId ) ); if ( m_dn.isEmpty() ) m_dn = addedContact.dn; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp index ed4f6bfd..b7b1f1cc 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp @@ -128,14 +128,14 @@ bool JoinConferenceTask::take( Transfer * transfer ) void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details ) { - client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).tqarg( details.dn ) ); + client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).arg( details.dn ) ); TQStringList::Iterator it = m_unknowns.begin(); TQStringList::Iterator end = m_unknowns.end(); while( it != end ) { TQString current = *it; ++it; - client()->debug( TQString( " - can we remove %1?" ).tqarg(current ) ); + client()->debug( TQString( " - can we remove %1?" ).arg(current ) ); if ( current == details.dn ) { client()->debug( " - it's gone!" ); @@ -143,7 +143,7 @@ void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details break; } } - client()->debug( TQString( " - now %1 unknowns").tqarg( m_unknowns.count() ) ); + client()->debug( TQString( " - now %1 unknowns").arg( m_unknowns.count() ) ); if ( m_unknowns.empty() ) { client()->debug( " - finished()" ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index e2637807..6a28124f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -36,7 +36,7 @@ LoginTask::~LoginTask() void LoginTask::initialise() { - TQString command = TQString::fromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( client()->port() ); + TQString command = TQString::fromLatin1("login:%1:%2").arg( client()->host() ).arg( client()->port() ); Field::FieldList lst; lst.append( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, client()->userId() ) ); @@ -123,7 +123,7 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer ) current = fl.findSingleField( NM_A_SZ_PARENT_ID ); folder.parentId = current->value().toInt(); - client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) ); + client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).arg( folder.name ).arg( folder.id ).arg( folder.parentId ).arg( folder.sequence ) ); // tell the world about it emit gotFolder( folder ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp index 5a1eb414..12c7382a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp @@ -38,7 +38,7 @@ void NeedFolderTask::slotFolderAdded( const FolderItem & addedFolder ) // if this is the folder we were trying to create if ( m_folderDisplayName == addedFolder.name ) { - client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).tqarg( addedFolder.name ).tqarg( addedFolder.id ) ); + client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).arg( addedFolder.name ).arg( addedFolder.id ) ); m_folderId = addedFolder.id; } } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp index 7d4b41aa..44f54124 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp @@ -50,7 +50,7 @@ void RequestTask::onGo() { if ( transfer() ) { - client()->debug( TQString( "%1::onGo() - sending %2 fields" ).tqarg( className() ).tqarg( static_cast<Request *>( transfer() )->command() ) ); + client()->debug( TQString( "%1::onGo() - sending %2 fields" ).arg( className() ).arg( static_cast<Request *>( transfer() )->command() ) ); send( static_cast<Request *>( transfer() ) ); } else diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp index 79435010..e7272402 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp @@ -37,7 +37,7 @@ bool StatusTask::take( Transfer * transfer ) if ( forMe( transfer, event ) ) { client()->debug( "Got a status change!" ); - client()->debug( TQString( "%1 changed status to %2, message: %3" ).tqarg( event->source() ).tqarg( event->status() ).tqarg( event->statusText() ) ); + client()->debug( TQString( "%1 changed status to %2, message: %3" ).arg( event->source() ).arg( event->status() ).arg( event->statusText() ) ); emit gotStatus( event->source().lower(), event->status(), event->statusText() ); return true; } diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp index f87cfa25..ceb29632 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp @@ -88,7 +88,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU TQStringList::Iterator found = m_pendingDNs.find( *it ); if ( found == m_pendingDNs.end() ) { - m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).tqarg( (*it) ) ); + m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).arg( (*it) ) ); requestList.append( *it ); m_pendingDNs.append( *it ); } @@ -110,7 +110,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU void UserDetailsManager::requestDetails( const TQString & dn, bool onlyUnknown ) { - m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).tqarg( dn ) ); + m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).arg( dn ) ); TQStringList list; list.append( dn ); requestDetails( list, onlyUnknown ); diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui index ce17003c..646116e6 100644 --- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui +++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui @@ -286,7 +286,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp index e6179882..80daff71 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp @@ -49,7 +49,7 @@ private: }; GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ), + : KDialogBase( parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).arg( account->accountId() ), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ), m_dirty( false ), m_searchDlg(0) { m_privacy = new GroupWisePrivacyWidget( this ); @@ -343,7 +343,7 @@ void GroupWisePrivacyDialog::commitChanges() void GroupWisePrivacyDialog::errorNotConnected() { KMessageBox::queuedMessageBox( this, KMessageBox::Information, - i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").tqarg( m_account->accountId() ) ); + i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").arg( m_account->accountId() ) ); } #include "gwprivacydialog.moc" diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 547de1b5..6005f61a 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -50,7 +50,7 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co m_wid->m_contactName->setText( event.user ); m_wid->m_dateTime->setText( KGlobal::locale()->formatDateTime( event.timeStamp ) ); - m_wid->m_message->setText( TQString("<b>%1</b>").tqarg( event.message ) ); + m_wid->m_message->setText( TQString("<b>%1</b>").arg( event.message ) ); setMainWidget( m_wid ); } diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui index 4b23a370..7de10328 100644 --- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui +++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui @@ -82,7 +82,7 @@ <property name="text"> <string>INVITE_MESSAGE</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index ec3904eb..318a8f20 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -79,7 +79,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it ) m_engine->addCustomCtcp( it.key(), it.data() ); - TQString version=i18n("Kopete IRC Plugin %1 [http://kopete.kde.org]").tqarg(kapp->aboutData()->version()); + TQString version=i18n("Kopete IRC Plugin %1 [http://kopete.kde.org]").arg(kapp->aboutData()->version()); m_engine->setVersionString( version ); TQObject::connect(m_engine, TQT_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), @@ -173,7 +173,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T /* Could not find this host. Add it to the networks structure */ m_network = new IRCNetwork; - m_network->name = i18n("Temporary Network - %1").tqarg( hostName ); + m_network->name = i18n("Temporary Network - %1").arg( hostName ); m_network->description = i18n("Network imported from previous version of Kopete, or an IRC URI"); IRCHost *host = new IRCHost; @@ -204,7 +204,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T m_contactManager = new IRCContactManager(mNickName, this); setMyself( m_contactManager->mySelf() ); - setAccountLabel( TQString::fromLatin1("%1@%2").tqarg(mNickName,networkName) ); + setAccountLabel( TQString::fromLatin1("%1@%2").arg(mNickName,networkName) ); m_myServer = m_contactManager->myServer(); m_joinChannelAction = new KAction ( i18n("Join Channel..."), TQString(), 0, this, @@ -226,7 +226,7 @@ void IRCAccount::slotNickInUse( const TQString &nick ) { TQString newNick = KInputDialog::getText( i18n("IRC Plugin"), - i18n("The nickname %1 is already in use. Please enter an alternate nickname:").tqarg(nick), + i18n("The nickname %1 is already in use. Please enter an alternate nickname:").arg(nick), nick); if (newNick.isNull()) @@ -243,7 +243,7 @@ void IRCAccount::slotNickInUse( const TQString &nick ) void IRCAccount::slotNickInUseAlert( const TQString &nick ) { - KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("The nickname %1 is already in use").tqarg(nick), i18n("IRC Plugin")); + KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("The nickname %1 is already in use").arg(nick), i18n("IRC Plugin")); } void IRCAccount::setAltNick( const TQString &altNick ) @@ -306,8 +306,8 @@ void IRCAccount::setNetwork( const TQString &network ) KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("<qt>The network associated with this account, <b>%1</b>, no longer exists. Please" - " ensure that the account has a valid network. The account will not be enabled until you do so.</qt>").tqarg(network), - i18n("Problem Loading %1").tqarg( accountId() ), 0 ); + " ensure that the account has a valid network. The account will not be enabled until you do so.</qt>").arg(network), + i18n("Problem Loading %1").arg( accountId() ), 0 ); } } @@ -352,7 +352,7 @@ const TQString IRCAccount::defaultPart() const { TQString partMsg = configGroup()->readEntry(TQString::fromLatin1("defaultPart")); if( partMsg.isEmpty() ) - return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").tqarg( kapp->aboutData()->version() ); + return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").arg( kapp->aboutData()->version() ); return partMsg; } @@ -360,7 +360,7 @@ const TQString IRCAccount::defaultQuit() const { TQString quitMsg = configGroup()->readEntry(TQString::fromLatin1("defaultQuit")); if( quitMsg.isEmpty() ) - return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").tqarg(kapp->aboutData()->version()); + return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").arg(kapp->aboutData()->version()); return quitMsg; } @@ -370,7 +370,7 @@ void IRCAccount::setCustomCtcpReplies( const TQMap< TQString, TQString > &replie for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it ) { m_engine->addCustomCtcp( it.key(), it.data() ); - val.append( TQString::fromLatin1("%1=%2").tqarg( it.key() ).tqarg( it.data() ) ); + val.append( TQString::fromLatin1("%1=%2").arg( it.key() ).arg( it.data() ) ); } configGroup()->writeEntry( "CustomCtcp", val ); @@ -416,7 +416,7 @@ void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages, KActionMenu *IRCAccount::actionMenu() { - TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).tqarg( accountId() ).tqarg( myself()->onlineStatus().description() ); + TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).arg( accountId() ).arg( myself()->onlineStatus().description() ); KActionMenu *mActionMenu = Kopete::Account::actionMenu(); @@ -455,14 +455,14 @@ void IRCAccount::connectWithPassword(const TQString &password) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("<qt>The network associated with this account, <b>%1</b>, has no valid hosts. Please ensure that the account has a valid network.</qt>").tqarg(m_network->name), + i18n("<qt>The network associated with this account, <b>%1</b>, has no valid hosts. Please ensure that the account has a valid network.</qt>").arg(m_network->name), i18n("Network is Empty"), 0 ); } else if( currentHost == hosts.count() ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("<qt>Kopete could not connect to any of the servers in the network associated with this account (<b>%1</b>). Please try again later.</qt>").tqarg(m_network->name), + i18n("<qt>Kopete could not connect to any of the servers in the network associated with this account (<b>%1</b>). Please try again later.</qt>").arg(m_network->name), i18n("Network is Unavailable"), 0 ); currentHost = 0; @@ -490,7 +490,7 @@ void IRCAccount::connectWithPassword(const TQString &password) } IRCHost *host = hosts[ currentHost++ ]; - myServer()->appendMessage( i18n("Connecting to %1...").tqarg( host->host ) ); + myServer()->appendMessage( i18n("Connecting to %1...").arg( host->host ) ); if( host->ssl ) myServer()->appendMessage( i18n("Using SSL") ); @@ -563,7 +563,7 @@ void IRCAccount::slotPerformOnConnectCommands() return; if (!autoConnect.isEmpty()) - Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/join %1").tqarg(autoConnect), manager); + Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/join %1").arg(autoConnect), manager); TQStringList commands(connectCommands()); for (TQStringList::Iterator it=commands.begin(); it != commands.end(); ++it) @@ -597,7 +597,7 @@ void IRCAccount::slotSearchChannels() if( !m_channelList ) { m_channelList = new ChannelListDialog( m_engine, - i18n("Channel List for %1").tqarg( m_engine->currentHost() ), this, + i18n("Channel List for %1").arg( m_engine->currentHost() ), this, TQT_SLOT( slotJoinNamedChannel( const TQString & ) ) ); } else @@ -714,8 +714,8 @@ bool IRCAccount::createContact( const TQString &contactId, Kopete::MetaContact * {//This should NEVER happen Kopete::MetaContact *old = c->metaContact(); c->setMetaContact( m ); - Kopete::ContactPtrList tqchildren = old->contacts(); - if (tqchildren.isEmpty()) + Kopete::ContactPtrList children = old->contacts(); + if (children.isEmpty()) Kopete::ContactList::self()->removeMetaContact( old ); } else if( c->metaContact()->isTemporary() ) @@ -781,7 +781,7 @@ void IRCAccount::slotJoinChannel() } KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.").tqarg(chan), + i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.").arg(chan), i18n("IRC Plugin") ); } @@ -789,15 +789,15 @@ void IRCAccount::slotJoinChannel() void IRCAccount::slotNewCtcpReply(const TQString &type, const TQString &/*target*/, const TQString &messageReceived) { - appendMessage( i18n("CTCP %1 REPLY: %2").tqarg(type).tqarg(messageReceived), InfoReply ); + appendMessage( i18n("CTCP %1 REPLY: %2").arg(type).arg(messageReceived), InfoReply ); } void IRCAccount::slotNoSuchNickname( const TQString &nick ) { if( KIRC::Entity::isChannel(nick) ) - appendMessage( i18n("The channel \"%1\" does not exist").tqarg(nick), UnknownReply ); + appendMessage( i18n("The channel \"%1\" does not exist").arg(nick), UnknownReply ); else - appendMessage( i18n("The nickname \"%1\" does not exist").tqarg(nick), UnknownReply ); + appendMessage( i18n("The nickname \"%1\" does not exist").arg(nick), UnknownReply ); } void IRCAccount::appendMessage( const TQString &message, MessageType type ) diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 8ecb59f0..94d67d3a 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -78,7 +78,7 @@ void IRCChannelContact::slotUpdateInfo() /** This woudl be nice, but it generates server errors too often if( !manager(Kopete::Contact::CannotCreate) && onlineStatus() == m_protocol->m_ChannelStatusOnline ) - kircEngine()->writeMessage( TQString::fromLatin1("LIST %1").tqarg(m_nickName) ); + kircEngine()->writeMessage( TQString::fromLatin1("LIST %1").arg(m_nickName) ); else setProperty( TQString::fromLatin1("channelMembers"), i18n("Members"), manager()->members().count() ); @@ -88,7 +88,7 @@ void IRCChannelContact::slotUpdateInfo() if (manager(Kopete::Contact::CannotCreate)) { setProperty(m_protocol->propChannelMembers, manager()->members().count()); - engine->writeMessage(TQString::fromLatin1("WHO %1").tqarg(m_nickName)); + engine->writeMessage(TQString::fromLatin1("WHO %1").arg(m_nickName)); } else { @@ -272,12 +272,12 @@ void IRCChannelContact::channelTopic(const TQString &topic) if (mTopic.isEmpty()) { Kopete::Message msg((Kopete::Contact*)this, mMyself, - i18n("Topic for %1 is set empty.").tqarg(m_nickName), + i18n("Topic for %1 is set empty.").arg(m_nickName), Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW); appendMessage(msg); } else { Kopete::Message msg((Kopete::Contact*)this, mMyself, - i18n("Topic for %1 is %2").tqarg(m_nickName).tqarg(mTopic), + i18n("Topic for %1 is %2").arg(m_nickName).arg(mTopic), Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW); appendMessage(msg); } @@ -362,7 +362,7 @@ void IRCChannelContact::userJoinedChannel(const TQString &nickname) kdDebug() << k_funcinfo << "My view:" << manager(Kopete::Contact::CannotCreate)->view(false) << endl; Kopete::Message msg((Kopete::Contact *)this, mMyself, - i18n("You have joined channel %1").tqarg(m_nickName), + i18n("You have joined channel %1").arg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); msg.setImportance( Kopete::Message::Low); //set the importance manualy to low @@ -378,7 +378,7 @@ void IRCChannelContact::userJoinedChannel(const TQString &nickname) contact->setOnlineStatus( m_protocol->m_UserStatusOnline ); manager()->addContact((Kopete::Contact *)contact, true); Kopete::Message msg((Kopete::Contact *)this, mMyself, - i18n("User <b>%1</b> joined channel %2").tqarg(nickname).tqarg(m_nickName), + i18n("User <b>%1</b> joined channel %2").arg(nickname).arg(m_nickName), Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW); msg.setImportance( Kopete::Message::Low); //set the importance manualy to low manager()->appendMessage(msg); @@ -413,9 +413,9 @@ void IRCChannelContact::userKicked(const TQString &nick, const TQString &nickKic TQString r; if ((reason != nick) && (reason != nickKicked)) { - r = i18n( "%1 was kicked by %2. Reason: %3" ).tqarg(nickKicked, nick, reason); + r = i18n( "%1 was kicked by %2. Reason: %3" ).arg(nickKicked, nick, reason); } else { - r = i18n( "%1 was kicked by %2." ).tqarg(nickKicked, nick); + r = i18n( "%1 was kicked by %2." ).arg(nickKicked, nick); } manager()->removeContact( c, r ); @@ -434,9 +434,9 @@ void IRCChannelContact::userKicked(const TQString &nick, const TQString &nickKic TQString r; if ((reason != nick) && (reason != nickKicked)) { - r = i18n( "You were kicked from %1 by %2. Reason: %3" ).tqarg(m_nickName, nickKicked, reason); + r = i18n( "You were kicked from %1 by %2. Reason: %3" ).arg(m_nickName, nickKicked, reason); } else { - r = i18n( "You were kicked from %1 by %2." ).tqarg(m_nickName, nickKicked); + r = i18n( "You were kicked from %1 by %2." ).arg(m_nickName, nickKicked); } KMessageBox::error(Kopete::UI::Global::mainWidget(), r, i18n("IRC Plugin")); @@ -468,7 +468,7 @@ void IRCChannelContact::setTopic(const TQString &topic) else { Kopete::Message msg(account->myServer(), manager()->members(), - i18n("You must be a channel operator on %1 to do that.").tqarg(m_nickName), + i18n("You must be a channel operator on %1 to do that.").arg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); manager()->appendMessage(msg); } @@ -483,7 +483,7 @@ void IRCChannelContact::topicChanged(const TQString &nick, const TQString &newto setProperty( m_protocol->propChannelTopic, mTopic ); manager()->setDisplayName( caption() ); Kopete::Message msg(account->myServer(), mMyself, - i18n("%1 has changed the topic to: %2").tqarg(nick).tqarg(newtopic), + i18n("%1 has changed the topic to: %2").arg(nick).arg(newtopic), Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW); msg.setImportance(Kopete::Message::Low); //set the importance manualy to low appendMessage(msg); @@ -494,7 +494,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time) IRCAccount *account = ircAccount(); Kopete::Message msg(account->myServer(), mMyself, - i18n("Topic set by %1 at %2").tqarg(nick).tqarg( + i18n("Topic set by %1 at %2").arg(nick).arg( KGlobal::locale()->formatDateTime(time, true) ), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); msg.setImportance(Kopete::Message::Low); //set the importance manualy to low @@ -503,7 +503,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time) void IRCChannelContact::incomingModeChange( const TQString &nick, const TQString &mode ) { - Kopete::Message msg(this, mMyself, i18n("%1 sets mode %2 on %3").tqarg(nick).tqarg(mode).tqarg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); + Kopete::Message msg(this, mMyself, i18n("%1 sets mode %2 on %3").arg(nick).arg(mode).arg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); msg.setImportance( Kopete::Message::Low); //set the importance manualy to low appendMessage(msg); @@ -564,7 +564,7 @@ void IRCChannelContact::failedChanBanned() { manager()->deleteLater(); KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("<qt>You can not join %1 because you have been banned.</qt>").tqarg(m_nickName), + i18n("<qt>You can not join %1 because you have been banned.</qt>").arg(m_nickName), i18n("IRC Plugin") ); } @@ -572,14 +572,14 @@ void IRCChannelContact::failedChanInvite() { manager()->deleteLater(); KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("<qt>You can not join %1 because it is set to invite only, and no one has invited you.</qt>").tqarg(m_nickName), i18n("IRC Plugin") ); + i18n("<qt>You can not join %1 because it is set to invite only, and no one has invited you.</qt>").arg(m_nickName), i18n("IRC Plugin") ); } void IRCChannelContact::failedChanFull() { manager()->deleteLater(); KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("<qt>You can not join %1 because it has reached its user limit.</qt>").tqarg(m_nickName), + i18n("<qt>You can not join %1 because it has reached its user limit.</qt>").arg(m_nickName), i18n("IRC Plugin") ); } @@ -587,7 +587,7 @@ void IRCChannelContact::failedChankey() { bool ok; TQString diaPassword = KInputDialog::getText( i18n( "IRC Plugin" ), - i18n( "Please enter key for channel %1: ").tqarg(m_nickName), + i18n( "Please enter key for channel %1: ").arg(m_nickName), TQString(), &ok ); @@ -717,9 +717,9 @@ void IRCChannelContact::slotHomepage() const TQString IRCChannelContact::caption() const { - TQString cap = TQString::fromLatin1("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost()); + TQString cap = TQString::fromLatin1("%1 @ %2").arg(m_nickName).arg(kircEngine()->currentHost()); if(!mTopic.isEmpty()) - cap.append( TQString::fromLatin1(" - %1").tqarg(Kopete::Message::unescape(mTopic)) ); + cap.append( TQString::fromLatin1(" - %1").arg(Kopete::Message::unescape(mTopic)) ); return cap; } diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp index c8d59aef..c45b5303 100644 --- a/kopete/protocols/irc/irccontact.cpp +++ b/kopete/protocols/irc/irccontact.cpp @@ -186,7 +186,7 @@ void IRCContact::slotUserDisconnected(const TQString &user, const TQString &reas Kopete::Contact *c = locateUser( nickname ); if ( c ) { - m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").tqarg(reason), Kopete::Message::RichText); + m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").arg(reason), Kopete::Message::RichText); c->setOnlineStatus(m_protocol->m_UserStatusOffline); } } diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index a4fdb655..a8b39299 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -90,7 +90,7 @@ void IRCProtocolHandler::handleURL( const KURL &url ) const return; KUser user( getuid() ); - TQString accountId = TQString::fromLatin1("%1@%2:%3").tqarg( + TQString accountId = TQString::fromLatin1("%1@%2:%3").arg( user.loginName(), url.host(), TQString::number(port) @@ -512,7 +512,7 @@ void IRCProtocol::slotTopicCommand( const TQString &args, Kopete::ChatSession *m else { static_cast<IRCAccount*>(manager->account())->engine()-> - writeRawMessage(TQString::fromLatin1("TOPIC %1").tqarg(chan->nickName())); + writeRawMessage(TQString::fromLatin1("TOPIC %1").arg(chan->nickName())); } } else @@ -536,7 +536,7 @@ void IRCProtocol::slotJoinCommand( const TQString &arg, Kopete::ChatSession *man { static_cast<IRCAccount*>( manager->account() )->appendMessage( i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.") - .tqarg(args[0]), IRCAccount::ErrorReply ); + .arg(args[0]), IRCAccount::ErrorReply ); } } @@ -556,7 +556,7 @@ void IRCProtocol::slotInviteCommand( const TQString &args, Kopete::ChatSession * { static_cast<IRCAccount*>( manager->account() )->appendMessage( i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.") - .tqarg(argsList[1]), IRCAccount::ErrorReply ); + .arg(argsList[1]), IRCAccount::ErrorReply ); } } else @@ -568,7 +568,7 @@ void IRCProtocol::slotInviteCommand( const TQString &args, Kopete::ChatSession * if( c && c->manager()->contactOnlineStatus( manager->myself() ) == m_UserStatusOp ) { static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("INVITE %1 %2").tqarg( argsList[0] ). + TQString::fromLatin1("INVITE %1 %2").arg( argsList[0] ). arg( c->nickName() ) ); } @@ -599,7 +599,7 @@ void IRCProtocol::slotQueryCommand( const TQString &args, Kopete::ChatSession *m else { static_cast<IRCAccount*>( manager->account() )->appendMessage( - i18n("\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or '&'.").tqarg(user), + i18n("\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or '&'.").arg(user), IRCAccount::ErrorReply ); } } @@ -614,7 +614,7 @@ void IRCProtocol::slotWhoCommand( const TQString &args, Kopete::ChatSession *man { TQStringList argsList = Kopete::CommandHandler::parseArguments( args ); static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("WHO %1").tqarg( argsList.first() ) ); + TQString::fromLatin1("WHO %1").arg( argsList.first() ) ); static_cast<IRCAccount*>( manager->account() )->setCurrentCommandSource( manager ); } @@ -622,7 +622,7 @@ void IRCProtocol::slotWhoWasCommand( const TQString &args, Kopete::ChatSession * { TQStringList argsList = Kopete::CommandHandler::parseArguments( args ); static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("WHOWAS %1").tqarg( argsList.first() ) ); + TQString::fromLatin1("WHOWAS %1").arg( argsList.first() ) ); static_cast<IRCAccount*>( manager->account() )->setCurrentCommandSource( manager ); } @@ -691,7 +691,7 @@ void IRCProtocol::slotBanCommand( const TQString &args, Kopete::ChatSession *man Kopete::ContactPtrList members = manager->members(); IRCChannelContact *chan = static_cast<IRCChannelContact*>( members.first() ); if( chan && chan->locateUser( argsList.front() ) ) - chan->setMode( TQString::fromLatin1("+b %1").tqarg( argsList.front() ) ); + chan->setMode( TQString::fromLatin1("+b %1").arg( argsList.front() ) ); } else { @@ -754,7 +754,7 @@ void IRCProtocol::simpleModeChange( const TQString &args, Kopete::ChatSession *m for( TQStringList::iterator it = argsList.begin(); it != argsList.end(); ++it ) { if( chan->locateUser( *it ) ) - chan->setMode( TQString::fromLatin1("%1 %2").tqarg( mode ).tqarg( *it ) ); + chan->setMode( TQString::fromLatin1("%1 %2").arg( mode ).arg( *it ) ); } } } @@ -918,7 +918,7 @@ void IRCProtocol::slotDeleteNetwork() if( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the network <b>%1</b>?<br>" "Any accounts which use this network will have to be modified.</qt>") - .tqarg(network), i18n("Deleting Network"), + .arg(network), i18n("Deleting Network"), KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue ) { disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); @@ -944,7 +944,7 @@ void IRCProtocol::slotDeleteHost() TQString hostName = netConf->host->text(); if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the host <b>%1</b>?</qt>") - .tqarg(hostName), i18n("Deleting Host"), + .arg(hostName), i18n("Deleting Host"), KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::fromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue ) { IRCHost *host = m_hosts[ hostName ]; @@ -976,7 +976,7 @@ void IRCProtocol::slotNewNetwork() { int newIdx = 1; do { - netName = TQString::fromLatin1( "New Network #%1" ).tqarg( newIdx++ ); + netName = TQString::fromLatin1( "New Network #%1" ).arg( newIdx++ ); } while ( m_networks.find( netName ) && newIdx < 100 ); if ( newIdx == 100 ) // pathological case diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index d0c70cfb..5be40dff 100644 --- a/kopete/protocols/irc/ircservercontact.cpp +++ b/kopete/protocols/irc/ircservercontact.cpp @@ -92,7 +92,7 @@ void IRCServerContact::updateStatus() const TQString IRCServerContact::caption() const { - return i18n("%1 @ %2").tqarg(ircAccount()->mySelf()->nickName() ).tqarg( + return i18n("%1 @ %2").arg(ircAccount()->mySelf()->nickName() ).arg( kircEngine()->currentHost().isEmpty() ? ircAccount()->networkName() : kircEngine()->currentHost() ); } @@ -147,7 +147,7 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString // Prefix missing. // NOTICE AUTH :*** Checking Ident - ircAccount()->appendMessage(i18n("NOTICE from %1: %2").tqarg(kircEngine()->currentHost(), notice), + ircAccount()->appendMessage(i18n("NOTICE from %1: %2").arg(kircEngine()->currentHost(), notice), IRCAccount::NoticeReply); } else { @@ -155,13 +155,13 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString // :somenick!~fooobar@somehostname.fi NOTICE foobar :hello if (orig.contains('!')) { - ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").tqarg( + ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").arg( orig.section('!', 0, 0), orig.section('!', 1, 1), notice), IRCAccount::NoticeReply); } else { - ircAccount()->appendMessage(i18n("NOTICE from %1: %2").tqarg( + ircAccount()->appendMessage(i18n("NOTICE from %1: %2").arg( orig, notice), IRCAccount::NoticeReply); } } @@ -184,7 +184,7 @@ void IRCServerContact::slotIncomingMotd(const TQString &message) void IRCServerContact::slotCannotSendToChannel(const TQString &channel, const TQString &message) { - ircAccount()->appendMessage(TQString::fromLatin1("%1: %2").tqarg(channel).tqarg(message), IRCAccount::ErrorReply); + ircAccount()->appendMessage(TQString::fromLatin1("%1: %2").arg(channel).arg(message), IRCAccount::ErrorReply); } void IRCServerContact::appendMessage(Kopete::Message &msg) diff --git a/kopete/protocols/irc/irctransferhandler.cpp b/kopete/protocols/irc/irctransferhandler.cpp index f4b5af10..e579e94a 100644 --- a/kopete/protocols/irc/irctransferhandler.cpp +++ b/kopete/protocols/irc/irctransferhandler.cpp @@ -164,7 +164,7 @@ void IRCTransferHandler::kioresult(KIO::Job *job) // if (t->) // kt->userAbort(i18n("User canceled transfer.")); // else -// kt->userAbort(i18n("User canceled transfer for file:%1").tqarg(t->fileName())); +// kt->userAbort(i18n("User canceled transfer for file:%1").arg(t->fileName())); break; default: kdDebug(14120) << k_funcinfo << "Transfer halted:" << kt->error() << endl; diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index b03d465f..c4607cb9 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -165,7 +165,7 @@ void IRCUserContact::slotUserOffline() updateStatus(); if( !metaContact()->isTemporary() ) - kircEngine()->writeMessage( TQString::fromLatin1("WHOWAS %1").tqarg(m_nickName) ); + kircEngine()->writeMessage( TQString::fromLatin1("WHOWAS %1").arg(m_nickName) ); removeProperty( m_protocol->propUserInfo ); removeProperty( m_protocol->propServer ); @@ -185,7 +185,7 @@ void IRCUserContact::incomingUserIsAway(const TQString &reason) if( manager( Kopete::Contact::CannotCreate ) ) { Kopete::Message msg( (Kopete::Contact*)ircAccount()->myServer(), mMyself, - i18n("%1 is away (%2)").tqarg( m_nickName ).tqarg( reason ), + i18n("%1 is away (%2)").arg( m_nickName ).arg( reason ), Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW ); manager(Kopete::Contact::CanCreate)->appendMessage(msg); } @@ -216,7 +216,7 @@ void IRCUserContact::slotUserInfo() const TQString IRCUserContact::caption() const { - return i18n("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost()); + return i18n("%1 @ %2").arg(m_nickName).arg(kircEngine()->currentHost()); } void IRCUserContact::slotOp() @@ -260,7 +260,7 @@ void IRCUserContact::slotBanHostOnce() Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast<IRCContact*>(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@%1").tqarg(mInfo.hostName)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@%1").arg(mInfo.hostName)); } void IRCUserContact::slotBanUserHost() @@ -284,7 +284,7 @@ void IRCUserContact::slotBanUserHostOnce() Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast<IRCContact*>(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@%2").tqarg(mInfo.userName, mInfo.hostName)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@%2").arg(mInfo.userName, mInfo.hostName)); } void IRCUserContact::slotBanDomain() @@ -310,7 +310,7 @@ void IRCUserContact::slotBanDomainOnce() TQString domain = mInfo.hostName.section('.', 1); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@*.%1").tqarg(domain)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@*.%1").arg(domain)); } void IRCUserContact::slotBanUserDomain() @@ -336,7 +336,7 @@ void IRCUserContact::slotBanUserDomainOnce() TQString domain = mInfo.hostName.section('.', 1); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@*.%2").tqarg(mInfo.userName, domain)); + kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@*.%2").arg(mInfo.userName, domain)); } void IRCUserContact::slotKick() @@ -350,7 +350,7 @@ void IRCUserContact::contactMode(const TQString &mode) { Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast<IRCContact*>(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::fromLatin1("%1 %2").tqarg(mode).tqarg(m_nickName)); + kircEngine()->mode(channelName, TQString::fromLatin1("%1 %2").arg(mode).arg(m_nickName)); } void IRCUserContact::slotCtcpPing() @@ -373,7 +373,7 @@ void IRCUserContact::newWhoIsUser(const TQString &username, const TQString &host if( onlineStatus().status() == Kopete::OnlineStatus::Offline ) { setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2") - .tqarg(mInfo.userName).tqarg(mInfo.hostName) ); + .arg(mInfo.userName).arg(mInfo.hostName) ); setProperty( m_protocol->propServer, mInfo.serverName ); setProperty( m_protocol->propFullName, mInfo.realName ); } @@ -433,26 +433,26 @@ void IRCUserContact::whoIsComplete() { //User info TQString msg = i18n("%1 is (%2@%3): %4<br/>") - .tqarg(m_nickName) - .tqarg(mInfo.userName) - .tqarg(mInfo.hostName) - .tqarg(mInfo.realName); + .arg(m_nickName) + .arg(mInfo.userName) + .arg(mInfo.hostName) + .arg(mInfo.realName); if( mInfo.isIdentified ) - msg += i18n("%1 is authenticated with NICKSERV<br/>").tqarg(m_nickName); + msg += i18n("%1 is authenticated with NICKSERV<br/>").arg(m_nickName); if( mInfo.isOperator ) - msg += i18n("%1 is an IRC operator<br/>").tqarg(m_nickName); + msg += i18n("%1 is an IRC operator<br/>").arg(m_nickName); //Channels - msg += i18n("on channels %1<br/>").tqarg(mInfo.channels.join(" ; ")); + msg += i18n("on channels %1<br/>").arg(mInfo.channels.join(" ; ")); //Server - msg += i18n("on IRC via server %1 ( %2 )<br/>").tqarg(mInfo.serverName).tqarg(mInfo.serverInfo); + msg += i18n("on IRC via server %1 ( %2 )<br/>").arg(mInfo.serverName).arg(mInfo.serverInfo); //Idle TQString idleTime = formattedIdleTime(); - msg += i18n("idle: %2<br/>").tqarg( idleTime.isEmpty() ? TQString::number(0) : idleTime ); + msg += i18n("idle: %2<br/>").arg( idleTime.isEmpty() ? TQString::number(0) : idleTime ); //End ircAccount()->appendMessage(msg, IRCAccount::InfoReply ); @@ -466,12 +466,12 @@ void IRCUserContact::whoWasComplete() { //User info TQString msg = i18n("%1 was (%2@%3): %4\n") - .tqarg(m_nickName) - .tqarg(mInfo.userName) - .tqarg(mInfo.hostName) - .tqarg(mInfo.realName); + .arg(m_nickName) + .arg(mInfo.userName) + .arg(mInfo.hostName) + .arg(mInfo.realName); - msg += i18n("Last Online: %1\n").tqarg( + msg += i18n("Last Online: %1\n").arg( KGlobal::locale()->formatDateTime( property( m_protocol->propLastSeen ).value().toDateTime() ) @@ -490,7 +490,7 @@ TQString IRCUserContact::formattedName() const void IRCUserContact::updateInfo() { setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2") - .tqarg(mInfo.userName).tqarg(mInfo.hostName) ); + .arg(mInfo.userName).arg(mInfo.hostName) ); setProperty( m_protocol->propServer, mInfo.serverName ); setProperty( m_protocol->propChannels, mInfo.channels.join(" ") ); setProperty( m_protocol->propHops, TQString::number(mInfo.hops) ); diff --git a/kopete/protocols/irc/ksparser.cpp b/kopete/protocols/irc/ksparser.cpp index 25421d4d..514421ff 100644 --- a/kopete/protocols/irc/ksparser.cpp +++ b/kopete/protocols/irc/ksparser.cpp @@ -152,7 +152,7 @@ TQCString KSParser::_parse(const TQCString &message) break; default: if (cur < TQChar(' ')) // search for control characters - toAppend = TQString::fromLatin1("<%1>").tqarg(cur, 2, 16).upper(); + toAppend = TQString::fromLatin1("<%1>").arg(cur, 2, 16).upper(); else toAppend = TQStyleSheet::escape(cur); } @@ -193,12 +193,12 @@ TQString KSParser::pushColorTag(const TQColor &fgColor, const TQColor &bgColor) TQString tagStyle; if (fgColor.isValid()) - tagStyle += TQString::fromLatin1("color:%1;").tqarg(fgColor.name()); + tagStyle += TQString::fromLatin1("color:%1;").arg(fgColor.name()); if (bgColor.isValid()) - tagStyle += TQString::fromLatin1("background-color:%1;").tqarg(bgColor.name()); + tagStyle += TQString::fromLatin1("background-color:%1;").arg(bgColor.name()); if(!tagStyle.isEmpty()) - tagStyle = TQString::fromLatin1("style=\"%1\"").tqarg(tagStyle); + tagStyle = TQString::fromLatin1("style=\"%1\"").arg(tagStyle); return pushTag(TQString::fromLatin1("span"), tagStyle);; } diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index 0e1b3bc1..0fddaab7 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -54,7 +54,7 @@ using namespace KIRC; const TQRegExp Engine::m_RemoveLinefeeds( TQString::fromLatin1("[\\r\\n]*$") ); Engine::Engine(TQObject *parent, const char *name) - : TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()), + : TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").arg(name).latin1()), m_status(Idle), m_FailedNickOnLogin(false), m_useSSL(false), @@ -443,7 +443,7 @@ bool Engine::invokeCtcpCommandOfMessage(const TQDict<MessageRedirector> &map, Me kdDebug(14120) << "Method error for line:" << ctcpMsg.raw() << endl; writeCtcpErrorMessage(msg.prefix(), msg.ctcpRaw(), - TQString::fromLatin1("%1 internal error(s)").tqarg(errors.size())); + TQString::fromLatin1("%1 internal error(s)").arg(errors.size())); } else { diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp index c9d71cd2..8a48ce52 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.cpp +++ b/kopete/protocols/irc/libkirc/kircmessage.cpp @@ -106,7 +106,7 @@ void Message::writeRawMessage(Engine *engine, const TQTextCodec *codec, const TQ // FIXME: Should check the amount of data really writen. int wrote = engine->socket()->writeBlock(s.data(), s.length()); - kdDebug(14121) << TQString::fromLatin1("(%1 bytes) >> %2").tqarg(wrote).tqarg(str) << endl; + kdDebug(14121) << TQString::fromLatin1("(%1 bytes) >> %2").arg(wrote).arg(str) << endl; } void Message::writeMessage(Engine *engine, const TQTextCodec *codec, const TQString &message) @@ -169,10 +169,10 @@ Message Message::parse(Engine *engine, const TQTextCodec *codec, bool *parseSucc // Some servers send '\n' instead of '\r\n' that the RFCs say they should be sending. if (length > 1 && raw.at(length-2) == '\n') { - raw.tqat(length-2) = '\0'; + raw.at(length-2) = '\0'; } if (length > 2 && raw.at(length-3) == '\r') { - raw.tqat(length-3) = '\0'; + raw.at(length-3) = '\0'; } kdDebug(14121) << "<< " << raw << endl; diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp index 7ff74ecc..2e1d0b4c 100644 --- a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp +++ b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp @@ -80,9 +80,9 @@ bool MessageRedirector::checkValidity(const Message &msg) /* if ( msg.isNumeric() && ( msg.argsSize() > 0 && ( - msg.tqarg(0) == m_Nickname || - msg.tqarg(0) == m_PendingNick || - msg.tqarg(0) == TQString::fromLatin1("*") + msg.arg(0) == m_Nickname || + msg.arg(0) == m_PendingNick || + msg.arg(0) == TQString::fromLatin1("*") ) ) ) diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index 2bf3910a..6d6c2ba2 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -372,7 +372,7 @@ int KSSLSocket::verifyCertificate() "does not match the one the " "certificate was issued to."); result = messageBox( KIO::SlaveBase::WarningYesNoCancel, - msg.tqarg(ourHost), + msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), i18n("Co&ntinue") ); @@ -382,7 +382,7 @@ int KSSLSocket::verifyCertificate() TQString msg = i18n("The server certificate failed the " "authenticity test (%1)."); result = messageBox( KIO::SlaveBase::WarningYesNoCancel, - msg.tqarg(ourHost), + msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), i18n("Co&ntinue") ); diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui index bed61568..3c417075 100644 --- a/kopete/protocols/irc/ui/ircadd.ui +++ b/kopete/protocols/irc/ui/ircadd.ui @@ -88,7 +88,7 @@ <property name="text"> <string><i>(for example: joe_bob or #somechannel)</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui index 34ef83b7..f04c8e09 100644 --- a/kopete/protocols/irc/ui/irceditaccount.ui +++ b/kopete/protocols/irc/ui/irceditaccount.ui @@ -91,7 +91,7 @@ <property name="text"> <string><p><b>Note:</b> Most IRC servers do not require a password, and only a nickname is required to connect</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 9012a924..c0d5a87a 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -212,9 +212,9 @@ TQString IRCEditAccountWidget::generateAccountId( const TQString &network ) TQString nextId = network; uint accountNumber = 1; - while( config->hasGroup( TQString("Account_%1_%2").tqarg( m_protocol->pluginId() ).tqarg( nextId ) ) ) + while( config->hasGroup( TQString("Account_%1_%2").arg( m_protocol->pluginId() ).arg( nextId ) ) ) { - nextId = TQString::fromLatin1("%1_%2").tqarg( network ).tqarg( ++accountNumber ); + nextId = TQString::fromLatin1("%1_%2").arg( network ).arg( ++accountNumber ); } kdDebug( 14120 ) << k_funcinfo << " ID IS: " << nextId << endl; return nextId; diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 4865f8b1..a8597658 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -787,7 +787,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was an error in the protocol stream: %1").tqarg(errorCondition); + errorText = i18n("There was an error in the protocol stream: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrConnection: @@ -845,7 +845,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } if(!errorCondition.isEmpty()) - errorText = i18n("There was a connection error: %1").tqarg(errorCondition); + errorText = i18n("There was a connection error: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrNeg: @@ -870,7 +870,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was a negotiation error: %1").tqarg(errorCondition); + errorText = i18n("There was a negotiation error: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrTLS: @@ -887,7 +887,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was a Transport Layer Security (TLS) error: %1").tqarg(errorCondition); + errorText = i18n("There was a Transport Layer Security (TLS) error: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrAuth: @@ -931,7 +931,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was an error authenticating with the server: %1").tqarg(errorCondition); + errorText = i18n("There was an error authenticating with the server: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrSecurityLayer: @@ -948,7 +948,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("There was an error in the security layer: %1").tqarg(errorCondition); + errorText = i18n("There was an error in the security layer: %1").arg(errorCondition); break; case XMPP::ClientStream::ErrBind: @@ -965,7 +965,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int break; } - errorText = i18n("Could not bind a resource: %1").tqarg(errorCondition); + errorText = i18n("Could not bind a resource: %1").arg(errorCondition); break; default: @@ -981,7 +981,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int if(!errorText.isEmpty()) KMessageBox::error (Kopete::UI::Global::mainWidget (), errorText, - i18n("Connection problem with Jabber server %1").tqarg(server)); + i18n("Connection problem with Jabber server %1").arg(server)); } @@ -1512,7 +1512,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T case JabberClient::InvalidPasswordForMUC: { TQCString password; - int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").tqarg(jid.node())); + int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").arg(jid.node())); if (result == KPasswordDialog::Accepted) m_jabberClient->joinGroupChat(jid.domain(), jid.node(), jid.resource(), password); } @@ -1521,7 +1521,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T case JabberClient::NicknameConflict: { bool ok; - TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").tqarg(jid.node(), jid.resource()), + TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").arg(jid.node(), jid.resource()), i18n("Give your nickname"), TQString(), &ok); @@ -1535,14 +1535,14 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T case JabberClient::BannedFromThisMUC: KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (), KMessageBox::Error, - i18n ("You can't join the room %1 because you were banned").tqarg(jid.node()), + i18n ("You can't join the room %1 because you were banned").arg(jid.node()), i18n ("Jabber Group Chat") ); break; case JabberClient::MaxUsersReachedForThisMuc: KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (), KMessageBox::Error, - i18n ("You can't join the room %1 because the maximum users has been reached").tqarg(jid.node()), + i18n ("You can't join the room %1 because the maximum users has been reached").arg(jid.node()), i18n ("Jabber Group Chat") ); break; @@ -1659,7 +1659,7 @@ void JabberAccount::slotIncomingVoiceCall( const Jid &jid ) // if(sessionType == "http://www.google.com/session/phone") // { // TQString from = ((XMPP::Jid)session->peers().first()).full(); -// //KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").tqarg(from) ); +// //KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").arg(from) ); // JingleVoiceSessionDialog *voiceDialog = new JingleVoiceSessionDialog( static_cast<JingleVoiceSession*>(session) ); // voiceDialog->show(); // } @@ -1687,7 +1687,7 @@ bool JabberAccount::removeAccount( ) int result=KMessageBox::warningYesNoCancel( Kopete::UI::Global::mainWidget () , i18n( "Do you want to also unregister \"%1\" from the Jabber server ?\n" "If you unregister, all your contact list may be removed on the server," - "And you will never be able to connect to this account with any client").tqarg( accountLabel() ), + "And you will never be able to connect to this account with any client").arg( accountLabel() ), i18n("Unregister"), KGuiItem(i18n( "Remove and Unregister" ), "editdelete"), KGuiItem(i18n( "Remove from kopete only"), "edittrash"), @@ -1734,7 +1734,7 @@ void JabberAccount::slotUnregisterFinished( ) if ( task && ! task->success ()) { KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error, - i18n ("An error occured when trying to remove the account:\n%1").tqarg(task->statusString()), + i18n ("An error occured when trying to remove the account:\n%1").arg(task->statusString()), i18n ("Jabber Account Unregistration")); m_removing=false; return; diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index 42089333..3688565a 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -400,7 +400,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const { if( !d->capabilitiesInformationMap[*newCapsIt].discovered() && d->capabilitiesInformationMap[*newCapsIt].pendingRequests() == 0 ) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node + "#" + (*newCapsIt).extensions()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").arg(TQString(jid.full()).replace('%',"%%")).arg(node + "#" + (*newCapsIt).extensions()) << endl; d->capabilitiesInformationMap[*newCapsIt].setPendingRequests(1); requestDiscoInfo(account, jid, node + "#" + (*newCapsIt).extensions()); @@ -410,7 +410,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const else { // Remove all caps specifications - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node).tqarg(version) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").arg(TQString(jid.full()).replace('%',"%%")).arg(node).arg(version) << endl; d->jidCapabilitiesMap.remove( jid.full() ); } @@ -448,7 +448,7 @@ void JabberCapabilitiesManager::discoRequestFinished() DiscoItem item = discoInfo->item(); Jid jid = discoInfo->jid(); - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").arg(TQString(jid.full()).replace('%',"%%")).arg(discoInfo->node()).arg(discoInfo->success()) << endl; TQStringList tokens = TQStringList::split("#",discoInfo->node()); @@ -486,7 +486,7 @@ void JabberCapabilitiesManager::discoRequestFinished() TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->parent()); if( jidAccountPair.second ) { - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").arg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl; requestDiscoInfo( jidAccountPair.second, jidAccountPair.first, discoInfo->node() ); } else @@ -497,7 +497,7 @@ void JabberCapabilitiesManager::discoRequestFinished() } } else - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").tqarg(jidCapabilities.node()).tqarg(node) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").arg(jidCapabilities.node()).arg(node) << endl; //for (unsigned int i = 0; i < item.features().list().count(); i++) // printf(" Feature: %s\n",item.features().list()[i].latin1()); diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index 532cfd22..c18c9071 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -118,7 +118,7 @@ void JabberChatSession::slotUpdateDisplayName () jid.setResource ( mResource ); TQString statusText = i18n("a contact's online status in parenthesis.", " (%1)") - .tqarg( chatMembers.first()->onlineStatus().description() ); + .arg( chatMembers.first()->onlineStatus().description() ); if ( jid.resource().isEmpty () ) setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText ); else diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index f7b1741f..58ca2409 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -263,11 +263,11 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message) { TQString room=message.invite(); TQString originalBody=message.body().isEmpty() ? TQString() : - i18n( "The original message is : <i>\" %1 \"</i><br>" ).tqarg(TQStyleSheet::escape(message.body())); + i18n( "The original message is : <i>\" %1 \"</i><br>" ).arg(TQStyleSheet::escape(message.body())); TQString mes=i18n("<qt><i>%1</i> invited you to join the conference <b>%2</b><br>%3<br>" "If you want to accept and join, just <b>enter your nickname</b> and press ok<br>" "If you want to decline, press cancel</qt>") - .tqarg(message.from().full(), room , originalBody); + .arg(message.from().full(), room , originalBody); bool ok=false; TQString futureNewNickName = KInputDialog::getText( i18n( "Invited to a conference - Jabber Plugin" ), @@ -299,7 +299,7 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message) if(mManager->view( Kopete::Contact::CannotCreate )) { //show an internal message if the user has not already closed his window Kopete::Message m=Kopete::Message ( this, mManager->members(), - i18n("%1 has ended their participation in the chat session.").tqarg(metaContact()->displayName()), + i18n("%1 has ended their participation in the chat session.").arg(metaContact()->displayName()), Kopete::Message::Internal ); m.setImportance(Kopete::Message::Low); mManager->view()->appendMessage ( m ); //use KopeteView::AppendMessage to bypass notifications diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp index f536a1c9..e098fdad 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp +++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp @@ -145,7 +145,7 @@ void JabberGroupChatManager::inviteContact( const TQString & contactId ) jabberMessage.setFrom ( account()->client()->jid() ); jabberMessage.setTo ( contactId ); jabberMessage.setInvite( mRoomJid.userHost() ); - jabberMessage.setBody( i18n("You have been invited to %1").tqarg( mRoomJid.userHost() ) ); + jabberMessage.setBody( i18n("You have been invited to %1").arg( mRoomJid.userHost() ) ); // send the message account()->client()->sendMessage ( jabberMessage ); diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index 717d36be..1fa6d884 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -354,7 +354,7 @@ void JabberGroupContact::slotChangeNick( ) bool ok; TQString futureNewNickName = KInputDialog::getText( i18n( "Change nickanme - Jabber Plugin" ), - i18n( "Please enter the new nick name you want to have on the room <i>%1</i>" ).tqarg(rosterItem().jid().userHost()), + i18n( "Please enter the new nick name you want to have on the room <i>%1</i>" ).arg(rosterItem().jid().userHost()), mNick, &ok ); if ( !ok || !account()->isConnected()) return; diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index abec26bc..26d16b28 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -127,7 +127,7 @@ KActionMenu *JabberTransport::actionMenu () TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick ) + nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick ) ); TQPtrList<KAction> *customActions = myself()->customContextMenuActions( ); @@ -277,7 +277,7 @@ void JabberTransport::removeAllContacts( ) /* if ( ! task->success ()) KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error, - i18n ("An error occured when trying to remove the transport:\n%1").tqarg(task->statusString()), + i18n ("An error occured when trying to remove the transport:\n%1").arg(task->statusString()), i18n ("Jabber Service Unregistration")); */ //we don't really care, we remove everithing anyway. diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index 4208e0d8..f6911a3b 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -114,7 +114,7 @@ void JingleClientSlots::callDestroyed(cricket::Call *call) qDebug("JingleClientSlots: Call destroyed"); Jid jid(call->sessions()[0]->remote_address().c_str()); if (voiceCaller_->calling(jid)) { - qDebug(TQString("Removing unterminated call to %1").tqarg(jid.full())); + qDebug(TQString("Removing unterminated call to %1").arg(jid.full())); voiceCaller_->removeCall(jid); emit voiceCaller_->terminated(jid); } @@ -138,7 +138,7 @@ void JingleClientSlots::requestSignaling() void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *session, cricket::Session::State state) { - qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").tqarg(state)); + qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").arg(state)); // Why is c_str() stuff needed to make it compile on OS X ? Jid jid(session->remote_address().c_str()); @@ -156,7 +156,7 @@ void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *sess } else if (state == cricket::Session::STATE_SENTMODIFY) { } else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full())); + qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) { } else if (state == cricket::Session::STATE_RECEIVEDREJECT) { @@ -195,7 +195,7 @@ void JingleVoiceCaller::initialize() return; TQString jid = ((ClientStream&) account()->client()->client()->stream()).jid().full(); - qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").tqarg(jid)); + qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").arg(jid)); if (jid.isEmpty()) { qWarning("jinglevoicecaller.cpp: Empty JID"); return; @@ -271,7 +271,7 @@ bool JingleVoiceCaller::calling(const Jid& jid) void JingleVoiceCaller::call(const Jid& jid) { - qDebug(TQString("jinglevoicecaller.cpp: Calling %1").tqarg(jid.full())); + qDebug(TQString("jinglevoicecaller.cpp: Calling %1").arg(jid.full())); cricket::Call *c = ((cricket::PhoneSessionClient*)(phone_client_))->CreateCall(); c->InitiateSession(buzz::Jid(jid.full().ascii())); phone_client_->SetFocus(c); @@ -299,7 +299,7 @@ void JingleVoiceCaller::reject(const Jid& j) void JingleVoiceCaller::terminate(const Jid& j) { - qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").tqarg(j.full())); + qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").arg(j.full())); cricket::Call* call = calls_[j.full()]; if (call != NULL) { call->Terminate(); @@ -327,7 +327,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call) void JingleVoiceCaller::removeCall(const Jid& j) { - qDebug(TQString("JingleVoiceCaller: Removing call to %1").tqarg(j.full())); + qDebug(TQString("JingleVoiceCaller: Removing call to %1").arg(j.full())); calls_.remove(j.full()); } @@ -363,7 +363,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza) // Spread the word if (ok) { - qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").tqarg(stanza)); + qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").arg(stanza)); buzz::XmlElement *e = buzz::XmlElement::ForStr(stanza.ascii()); phone_client_->OnIncomingStanza(e); } diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index c5bc775d..daa0d7c0 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -115,7 +115,7 @@ public: {} else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full())); + //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) {} diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index 446d1d41..86fc606f 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -44,7 +44,7 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall : JingleVoiceSessionDialogBase(parent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) { TQString contactJid = m_peerJid.full(); - setCaption( i18n("Voice session with %1").tqarg(contactJid) ); + setCaption( i18n("Voice session with %1").arg(contactJid) ); connect(buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAcceptClicked())); connect(buttonDecline, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeclineClicked())); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc index 6d85cb0d..a5a94941 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc @@ -194,12 +194,12 @@ int Task::Process(int state) { void Task::AddChild(Task * child) { - tqchildren_.insert(child); + children_.insert(child); } bool Task::AllChildrenDone() { - for (ChildSet::iterator it = tqchildren_.begin(); it != tqchildren_.end(); ++it) { + for (ChildSet::iterator it = children_.begin(); it != children_.end(); ++it) { if (!(*it)->IsDone()) return false; } @@ -213,8 +213,8 @@ Task::AnyChildError() { void Task::AbortAllChildren() { - if (tqchildren_.size() > 0) { - ChildSet copy = tqchildren_; + if (children_.size() > 0) { + ChildSet copy = children_; for (ChildSet::iterator it = copy.begin(); it != copy.end(); ++it) { (*it)->Abort(true); // Note we do not wake } @@ -231,7 +231,7 @@ void Task::OnChildStopped(Task * child) { if (child->HasError()) child_error_ = true; - tqchildren_.erase(child); + children_.erase(child); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h index 7140b691..5a486198 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h @@ -61,13 +61,13 @@ // might be working on something as you send it infomration, you may want // to have a queue in the task. // -// (3) Finally it helps manage parent tasks and tqchildren. If a parent -// task gets aborted, all the tqchildren tasks are too. The nice thing +// (3) Finally it helps manage parent tasks and children. If a parent +// task gets aborted, all the children tasks are too. The nice thing // about this, for example, is if you have one parent task that // represents, say, and Xmpp connection, then you can spawn a whole bunch // of infinite lifetime child tasks and now worry about cleaning them up. // When the parent task goes to STATE_DONE, the task engine will make -// sure all those tqchildren are aborted and get deleted. +// sure all those children are aborted and get deleted. // // Notice that Task has a few built-in states, e.g., // @@ -122,7 +122,7 @@ public: // Called from outside to stop task without any more callbacks void Abort(bool nowake = false); - // For managing tqchildren + // For managing children bool AllChildrenDone(); bool AnyChildError(); @@ -153,7 +153,7 @@ protected: virtual int ProcessStart() = 0; virtual int ProcessResponse() { return STATE_DONE; } - // for managing tqchildren (if any) + // for managing children (if any) void AddChild(Task * child); void AbortAllChildren(); @@ -172,9 +172,9 @@ private: bool child_error_; unsigned long long start_time_; - // for managing tqchildren + // for managing children typedef std::set<Task *> ChildSet; - ChildSet tqchildren_; + ChildSet children_; }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc index 43728eb7..b5ecc55e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc @@ -33,7 +33,7 @@ namespace buzz { TaskRunner::~TaskRunner() { - // this kills and deletes tqchildren silently! + // this kills and deletes children silently! AbortAllChildren(); RunTasks(); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc index a021f67a..08ccd288 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc @@ -109,7 +109,7 @@ XmlElement::XmlElement(const XmlElement & elt) : } pLastAttr_ = newAttr; - // copy tqchildren + // copy children XmlChild * pChild; XmlChild ** ppLast = &pFirstChild_; XmlChild * newChild = NULL; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc index 8e36ac02..e0d2c006 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc @@ -123,7 +123,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) { i += 2; } - // now the tqchildren + // now the children const XmlChild * pchild = element->FirstChild(); if (pchild == NULL) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc index 7987856e..cdcfa9e7 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc @@ -223,7 +223,7 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original, error_element.AddAttr(name, attribute->Value()); } - // copy tqchildren + // copy children for (const XmlChild * child = element_original->FirstChild(); child; child = child->NextChild()) { diff --git a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch index 2a6a4806..058825db 100644 --- a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch +++ b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch @@ -34,7 +34,7 @@ Index: iris/xmpp-im/client.cpp + ++it; + } + -+ debug(QString("Client: Joined: [%1]\n").tqarg(jid.full())); ++ debug(QString("Client: Joined: [%1]\n").arg(jid.full())); + GroupChat i; + i.j = jid; + i.status = GroupChat::Connecting; @@ -121,7 +121,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + if(!s.status().isEmpty()) + tag.appendChild(textTag(doc(), "status", s.status())); + -+ tag.appendChild( textTag(doc(), "priority", QString("%1").tqarg(s.priority()) ) ); ++ tag.appendChild( textTag(doc(), "priority", QString("%1").arg(s.priority()) ) ); + + if(!s.keyID().isEmpty()) { + QDomElement x = textTag(doc(), "x", s.keyID()); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp index 89c98a91..f96fd795 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp @@ -1109,7 +1109,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) e.setAttribute("mechanism", sasl_mech); if(!sasl_step.isEmpty()) { #ifdef XMPP_TEST - TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step))); + TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step))); #endif e.appendChild(doc.createTextNode(Base64::arrayToString(sasl_step))); } @@ -1143,7 +1143,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) else { TQByteArray stepData = sasl_step; #ifdef XMPP_TEST - TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step))); + TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step))); #endif TQDomElement e = doc.createElementNS(NS_SASL, "response"); if(!stepData.isEmpty()) @@ -1289,7 +1289,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) #ifdef XMPP_TEST TQString s = "SASL mechs:"; for(TQStringList::ConstIterator it = f.sasl_mechs.begin(); it != f.sasl_mechs.end(); ++it) - s += TQString(" [%1]").tqarg((*it)); + s += TQString(" [%1]").arg((*it)); TD::msg(s); #endif } @@ -1341,7 +1341,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e) if(e.tagName() == "challenge") { TQByteArray a = Base64::stringToArray(e.text()); #ifdef XMPP_TEST - TD::msg(TQString("SASL IN: [%1]").tqarg(printArray(a))); + TD::msg(TQString("SASL IN: [%1]").arg(printArray(a))); #endif sasl_step = a; need = NSASLNext; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index 0e324cb1..51041c1d 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp @@ -1358,9 +1358,9 @@ void ClientStream::processNext() #endif #ifdef XMPP_TEST - TQString s = TQString("handshake success (lang=[%1]").tqarg(d->client.lang); + TQString s = TQString("handshake success (lang=[%1]").arg(d->client.lang); if(!d->client.from.isEmpty()) - s += TQString(", from=[%1]").tqarg(d->client.from); + s += TQString(", from=[%1]").arg(d->client.from); s += ')'; TD::msg(s); #endif diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp index d1650842..93748aa8 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -66,7 +66,7 @@ static TQDomElement stripExtraNS(const TQDomElement &e) i.setAttributeNodeNS(a); } - // copy tqchildren + // copy children TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 69737a24..b7d5e00c 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -303,7 +303,7 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS ++it; } - debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; @@ -332,7 +332,7 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS ++it; } - debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; @@ -378,7 +378,7 @@ void Client::groupChatLeave(const TQString &host, const TQString &room) continue; i.status = GroupChat::Closing; - debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full())); + debug(TQString("Client: Leaving: [%1]\n").arg(i.j.full())); JT_Presence *j = new JT_Presence(rootTask()); Status s; @@ -493,7 +493,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e) if(!noShowNS) i.setAttribute("xmlns", e.namespaceURI()); - // copy tqchildren + // copy children TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -514,7 +514,7 @@ void Client::streamReadyRead() Stanza s = d->stream->read(); TQString out = s.toString(); - debug(TQString("Client: incoming: [\n%1]\n").tqarg(out)); + debug(TQString("Client: incoming: [\n%1]\n").arg(out)); xmlIncoming(out); TQDomElement x = oldStyleNS(s.element()); @@ -607,7 +607,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) i.setAttributeNodeNS(a.cloneNode().toAttr()); } - // copy tqchildren + // copy children TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -631,7 +631,7 @@ void Client::send(const TQDomElement &x) //x.save(ts, 0); //TQString out = Stream::xmlToString(x); - //debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); + //debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); //xmlOutgoing(out); TQDomElement e = addCorrectNS(x); @@ -642,7 +642,7 @@ void Client::send(const TQDomElement &x) } TQString out = s.toString(); - debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); + debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); xmlOutgoing(out); //printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).latin1(), Stream::xmlToString(e).latin1(), s.toString().latin1()); @@ -654,7 +654,7 @@ void Client::send(const TQString &str) if(!d->stream) return; - debug(TQString("Client: outgoing: [\n%1]\n").tqarg(str)); + debug(TQString("Client: outgoing: [\n%1]\n").arg(str)); xmlOutgoing(str); static_cast<ClientStream*>(d->stream)->writeDirect(str); } @@ -716,9 +716,9 @@ void Client::ppSubscription(const Jid &j, const TQString &s) void Client::ppPresence(const Jid &j, const Status &s) { if(s.isAvailable()) - debug(TQString("Client: %1 is available.\n").tqarg(j.full())); + debug(TQString("Client: %1 is available.\n").arg(j.full())); else - debug(TQString("Client: %1 is unavailable.\n").tqarg(j.full())); + debug(TQString("Client: %1 is unavailable.\n").arg(j.full())); for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { GroupChat &i = *it; @@ -726,7 +726,7 @@ void Client::ppPresence(const Jid &j, const Status &s) if(i.j.compare(j, false)) { bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true: false; - debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").tqarg(i.j.full()).tqarg(j.full()).tqarg(us)); + debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full()).arg(j.full()).arg(us)); switch(i.status) { case GroupChat::Connecting: if(us && s.hasError()) { @@ -797,7 +797,7 @@ void Client::updateSelfPresence(const Jid &j, const Status &s) // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - debug(TQString("Client: Removing self resource: name=[%1]\n").tqarg(j.resource())); + debug(TQString("Client: Removing self resource: name=[%1]\n").arg(j.resource())); (*rit).setStatus(s); resourceUnavailable(j, *rit); d->resourceList.remove(rit); @@ -809,12 +809,12 @@ void Client::updateSelfPresence(const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); d->resourceList += r; - debug(TQString("Client: Adding self resource: name=[%1]\n").tqarg(j.resource())); + debug(TQString("Client: Adding self resource: name=[%1]\n").arg(j.resource())); } else { (*rit).setStatus(s); r = *rit; - debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource())); + debug(TQString("Client: Updating self resource: name=[%1]\n").arg(j.resource())); } resourceAvailable(j, r); @@ -830,7 +830,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) if(!s.isAvailable()) { if(found) { (*rit).setStatus(s); - debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); + debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); resourceUnavailable(j, *rit); i->resourceList().remove(rit); i->setLastUnavailableStatus(s); @@ -842,12 +842,12 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); i->resourceList() += r; - debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); + debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); } else { (*rit).setStatus(s); r = *rit; - debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); + debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); } resourceAvailable(j, r); @@ -856,7 +856,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) void Client::pmMessage(const Message &m) { - debug(TQString("Client: Message from %1\n").tqarg(m.from().full())); + debug(TQString("Client: Message from %1\n").arg(m.from().full())); if(m.type() == "groupchat") { for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { @@ -1363,7 +1363,7 @@ void Task::debug(const char *fmt, ...) void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").tqarg(className()) + str); + client()->debug(TQString("%1: ").arg(className()) + str); } bool Task::iqVerify(const TQDomElement &x, const Jid &to, const TQString &id, const TQString &xmlns) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index 5700c343..f33e428f 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -295,7 +295,7 @@ Stanza::Error Message::error() const return d->error; } -//! \brief Set tqreceivers information +//! \brief Set receivers information //! //! \param to - Receivers Jabber id void Message::setTo(const Jid &j) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index c6e05909..edc8762e 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -504,7 +504,7 @@ void JT_Presence::pres(const Status &s) if(!s.status().isEmpty()) tag.appendChild(textTag(doc(), "status", s.status())); - tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) ); + tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) ); if(!s.keyID().isEmpty()) { TQDomElement x = textTag(doc(), "x", s.keyID()); @@ -676,7 +676,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e) if(!noShowNS) i.setAttribute("xmlns", e.namespaceURI()); - // copy tqchildren + // copy children TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -742,7 +742,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) i.setAttributeNodeNS(al.item(x).cloneNode().toAttr()); } - // copy tqchildren + // copy children TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -1343,7 +1343,7 @@ bool JT_ServInfo::take(const TQDomElement &e) // TQString str = getTZString(); // query.appendChild(textTag("utc", TS2stamp(utc))); // query.appendChild(textTag("tz", str)); - // query.appendChild(textTag("display", TQString("%1 %2").tqarg(local.toString()).tqarg(str))); + // query.appendChild(textTag("display", TQString("%1 %2").arg(local.toString()).arg(str))); // send(iq); // return TRUE; //} @@ -1988,7 +1988,7 @@ void JT_MucPresence::pres(const Status &s) if(!s.status().isEmpty()) tag.appendChild(textTag(doc(), "status", s.status())); - tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) ); + tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) ); if(!s.keyID().isEmpty()) { TQDomElement x = textTag(doc(), "x", s.keyID()); diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index 43b063e4..ee258105 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -40,7 +40,7 @@ <property name="text"> <string>&Jabber ID:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -73,7 +73,7 @@ <property name="text"> <string><i>(for example: joe@jabber.org)</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui index a1d61833..66cfcfc5 100644 --- a/kopete/protocols/jabber/ui/dlgbrowse.ui +++ b/kopete/protocols/jabber/ui/dlgbrowse.ui @@ -47,7 +47,7 @@ <property name="text"> <string>Please wait while retrieving search form...</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui index c1469a8d..bed6e8d4 100644 --- a/kopete/protocols/jabber/ui/dlgchangepassword.ui +++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui @@ -71,7 +71,7 @@ <string>Please enter your current password first and then your new password twice.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index 71f44d17..71400791 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -162,7 +162,7 @@ <property name="text"> <string>To connect to the Jabber network, you will need an account on a Jabber server. If you do not yet have an account, please click the button to create one.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -227,7 +227,7 @@ <property name="text"> <string>If you have an existing Jabber account and would like to change its password, you can use this button to enter a new password.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -517,7 +517,7 @@ <property name="text"> <string>P&riority:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -691,7 +691,7 @@ If two resources have the same priority, the messages will be sent to the one co <li>Changes to these fields will only take effect the next time you start Kopete.</li> <li>The "Proxy JID" can be configured per account.</li></ul></i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index 4f1f7502..e34c208b 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -266,7 +266,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -294,7 +294,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index 29b2b617..1bd1310c 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -122,7 +122,7 @@ void dlgJabberServices::slotServiceFinished () if (!task->success ()) { TQString error = task->statusString(); - KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").tqarg(error), i18n ("Jabber Error")); + KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").arg(error), i18n ("Jabber Error")); return; } diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp index 58c70f68..8f795724 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp @@ -40,8 +40,8 @@ void MeanwhileEditAccountWidget::setupClientList() for (id = MeanwhileSession::getClientIDs(); id->name; id++, i++) { TQString name = TQString("%1 (0x%2)") - .tqarg(TQString(id->name)) - .tqarg(id->id, 0, 16); + .arg(TQString(id->name)) + .arg(id->id, 0, 16); mClientID->insertItem(name, i); diff --git a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui index b4aff75d..bdfea37f 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui @@ -84,7 +84,7 @@ <property name="text"> <string><i>(for example: johndoe)</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui index e9fed90a..c415b062 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui @@ -298,7 +298,7 @@ <property name="text"> <string>.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp index 34aa7425..f81ef8cc 100644 --- a/kopete/protocols/msn/dispatcher.cpp +++ b/kopete/protocols/msn/dispatcher.cpp @@ -140,14 +140,14 @@ void Dispatcher::sendFile(const TQString& path, TQ_INT64 fileSize, const TQStrin // Write the file name in utf-16 to the stream. TQTextStream ts(header, IO_WriteOnly); ts.setEncoding(TQTextStream::RawUnicode); - ts.tqdevice()->tqat(20); + ts.device()->at(20); ts << path.section('/', -1); // NOTE Background Sharing base64 [540..569] // TODO add support for background sharing. // Write file exchange type to the stream. // NOTE File - 0xFFFFFFFF // NOTE Background Sharing - 0xFFFFFFFE - writer.tqdevice()->tqat(570); + writer.device()->at(570); writer << (TQ_UINT32)0xFFFFFFFF; // Encode the file context header to base64 encoding. @@ -250,7 +250,7 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream if(m_messageBuffer.contains(receivedMessage.header.identifier)) { kdDebug(14140) << k_funcinfo - << TQString("retrieving buffered messsage, %1").tqarg(receivedMessage.header.identifier) + << TQString("retrieving buffered messsage, %1").arg(receivedMessage.header.identifier) << endl; // The message was split, try to reconstruct the message @@ -347,7 +347,7 @@ void Dispatcher::dispatch(const P2P::Message& message) // The entire message has not been received; // buffer the recevied portion of the original message. kdDebug(14140) << k_funcinfo - << TQString("Buffering messsage, %1").tqarg(message.header.identifier) + << TQString("Buffering messsage, %1").arg(message.header.identifier) << endl; m_messageBuffer.insert(message.header.identifier, message); return; @@ -427,7 +427,7 @@ void Dispatcher::dispatch(const P2P::Message& message) current->m_ackSessionIdentifier = message.header.identifier; current->m_ackUniqueIdentifier = message.header.ackSessionIdentifier; // Send a 200 OK message to the recipient. - TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId); current->sendMessage(OK, content); } else if(applicationId == 2) @@ -457,7 +457,7 @@ void Dispatcher::dispatch(const P2P::Message& message) reader.setByteOrder(TQDataStream::LittleEndian); //Retrieve the file info from the context field. // File Size [8..15] Int64 - reader.tqdevice()->tqat(8); + reader.device()->at(8); TQ_INT64 fileSize; reader >> fileSize; // Flag [15..18] Int32 @@ -478,7 +478,7 @@ void Dispatcher::dispatch(const P2P::Message& message) emit incomingTransfer(from, fileName, fileSize); kdDebug(14140) << - TQString("%1, %2 bytes.").tqarg(fileName, TQString::number(fileSize)) + TQString("%1, %2 bytes.").arg(fileName, TQString::number(fileSize)) << endl << endl; diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp index b7b90296..dd616a1b 100644 --- a/kopete/protocols/msn/incomingtransfer.cpp +++ b/kopete/protocols/msn/incomingtransfer.cpp @@ -68,7 +68,7 @@ void IncomingTransfer::slotTransferAccepted(Kopete::Transfer* transfer, const TQ TQObject::connect(transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort())); m_transfer = transfer; - TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId); sendMessage(OK, content); TQObject::disconnect(Kopete::TransferManager::transferManager(), 0l, this, 0l); @@ -80,7 +80,7 @@ void IncomingTransfer::slotTransferRefused(const Kopete::FileTransferInfo& info) if(sessionId!=m_sessionId) return; - TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId); // Send the sending client a cancelation message. sendMessage(DECLINE, content); m_state=Finished; @@ -141,7 +141,7 @@ void IncomingTransfer::processMessage(const Message& message) { // UserDisplayIcon data or File data is in this message. // Write the recieved data to the file. - kdDebug(14140) << k_funcinfo << TQString("Received, %1 bytes").tqarg(message.header.dataSize) << endl; + kdDebug(14140) << k_funcinfo << TQString("Received, %1 bytes").arg(message.header.dataSize) << endl; m_file->writeBlock(message.body.data(), message.header.dataSize); if(m_transfer){ @@ -254,9 +254,9 @@ void IncomingTransfer::processMessage(const Message& message) content = "Bridge: TCPv1\r\n" "Listening: true\r\n" + - TQString("Hashed-Nonce: {%1}\r\n").tqarg(P2P::Uid::createUid()) + - TQString("IPv4Internal-Addrs: %1\r\n").tqarg(m_listener->localAddress().nodeName()) + - TQString("IPv4Internal-Port: %1\r\n").tqarg(m_listener->localAddress().serviceName()) + + TQString("Hashed-Nonce: {%1}\r\n").arg(P2P::Uid::createUid()) + + TQString("IPv4Internal-Addrs: %1\r\n").arg(m_listener->localAddress().nodeName()) + + TQString("IPv4Internal-Port: %1\r\n").arg(m_listener->localAddress().serviceName()) + "\r\n"; } else diff --git a/kopete/protocols/msn/messageformatter.cpp b/kopete/protocols/msn/messageformatter.cpp index 40bd8877..0ca71789 100644 --- a/kopete/protocols/msn/messageformatter.cpp +++ b/kopete/protocols/msn/messageformatter.cpp @@ -75,7 +75,7 @@ Message MessageFormatter::readMessage(const TQByteArray& stream, bool compact) reader.setByteOrder(TQDataStream::LittleEndian); // Seek to the start position of the message // transport header. - reader.tqdevice()->tqat(index); + reader.device()->at(index); // Read the message transport headers from the stream. reader >> inbound.header.sessionId; diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 760f7cba..6c4aa9cc 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -1189,7 +1189,7 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co if ( !ID.isEmpty() && notifyNewChat ) { // this temporary message should open the window if they not exist - TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() ); + TQString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() ); Kopete::Message tmpMsg = Kopete::Message( c, manager->members(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); manager->appendMessage( tmpMsg ); } diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 3fcecc47..6709f0f1 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -408,7 +408,7 @@ void MSNChatSession::slotAcknowledgement(unsigned int id, bool ack) if ( !ack ) { Kopete::Message m = m_messagesSent[ id ]; - TQString body = i18n( "The following message has not been sent correctly:\n%1" ).tqarg( m.plainBody() ); + TQString body = i18n( "The following message has not been sent correctly:\n%1" ).arg( m.plainBody() ); Kopete::Message msg = Kopete::Message( m.to().first(), members(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); appendMessage( msg ); //stop the stupid animation @@ -467,7 +467,7 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg) TQString body = i18n( "%1 has sent an unimplemented invitation, the invitation was rejected.\n" "The invitation was: %2" ) - .tqarg( c->property( Kopete::Global::Properties::self()->nickName()).value().toString(), inviteName ); + .arg( c->property( Kopete::Global::Properties::self()->nickName()).value().toString(), inviteName ); Kopete::Message tmpMsg = Kopete::Message( c , members() , body , Kopete::Message::Internal, Kopete::Message::PlainText); appendMessage(tmpMsg); @@ -621,7 +621,7 @@ void MSNChatSession::receivedTypingMsg( const TQString &contactId, bool b ) if ( notifyNewChat ) { // this internal message should open the window if they not exist - TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() ); + TQString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() ); Kopete::Message tmpMsg = Kopete::Message( c, members(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); appendMessage( tmpMsg ); } @@ -715,14 +715,14 @@ void MSNChatSession::cleanMessageQueue( const TQString & reason ) else m=m_messagesSent.begin().data(); - TQString body=i18n("The following message has not been sent correctly (%1): \n%2").tqarg(reason, m.plainBody()); + TQString body=i18n("The following message has not been sent correctly (%1): \n%2").arg(reason, m.plainBody()); Kopete::Message msg = Kopete::Message(m.to().first() , members() , body , Kopete::Message::Internal, Kopete::Message::PlainText); appendMessage(msg); } else { Kopete::Message m; - TQString body=i18n("These messages have not been sent correctly (%1): <br /><ul>").tqarg(reason); + TQString body=i18n("These messages have not been sent correctly (%1): <br /><ul>").arg(reason); for ( TQMap<unsigned int , Kopete::Message>::iterator it = m_messagesSent.begin(); it!=m_messagesSent.end(); it = m_messagesSent.begin() ) { m=it.data(); diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 0b38f2c3..700bf213 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -615,7 +615,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status) protocol() , status.internalStatus()+15 , status.overlayIcons() + TQStringList("msn_blocked") , - i18n("%1|Blocked").tqarg( status.description() ) ) ); + i18n("%1|Blocked").arg( status.description() ) ) ); } else if(!isBlocked() && status.internalStatus() >= 15) { //the user is not blocked, but the status is blocked diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 5a15aa6f..816ccac9 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -122,7 +122,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) case 205: case 208: { - msg = i18n( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).tqarg( handle ); + msg = i18n( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).arg( handle ); type = MSNSocket::ErrorServerError; break; } @@ -134,7 +134,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) "MSN Error: %1<br>" "please send us a detailed bug report " "at kopete-devel@kde.org containing the raw debug output on the " - "console (in gzipped format, as it is probably a lot of output.)" ).tqarg(code); + "console (in gzipped format, as it is probably a lot of output.)" ).arg(code); type = MSNSocket::ErrorServerError; break; } @@ -166,7 +166,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) msg = i18n( "<qt>The user '%1' already exists in this group on the MSN server;<br>" "if Kopete does not show the user, please send us a detailed bug report " "at kopete-devel@kde.org containing the raw debug output on the " - "console (in gzipped format, as it is probably a lot of output.)</qt>" ).tqarg(handle); + "console (in gzipped format, as it is probably a lot of output.)</qt>" ).arg(handle); type = MSNSocket::ErrorInformation; break; } @@ -180,7 +180,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) } case 219: { - msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).tqarg(handle); + msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).arg(handle); type = MSNSocket::ErrorServerError; break; } @@ -775,7 +775,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) mailCount++; //TODO: it is also possible to get the subject (but warning about the encoding) - TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).tqarg(m), + TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).arg(m), 0 , 0 , i18n( "Open Inbox..." ) ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); } @@ -1008,13 +1008,13 @@ TQString MSNNotifySocket::processCurrentMedia( const TQString &mediaXmlElement ) currentMedia = format; for(uint i=0; i<formatterStrings.size(); i++) { - currentMedia = currentMedia.replace(TQString("{%1}").tqarg(i), formatterStrings[i]); + currentMedia = currentMedia.replace(TQString("{%1}").arg(i), formatterStrings[i]); } if( type == TQString::fromUtf8("Music") ) { // the "♫" is encoded in utf8 (and should be in utf8) - currentMedia = i18n("Now Listening: ♫ %1 ♫").tqarg(currentMedia); + currentMedia = i18n("Now Listening: ♫ %1 ♫").arg(currentMedia); } kdDebug(1414) << "Current Media received: " << currentMedia << endl; @@ -1049,25 +1049,25 @@ void MSNNotifySocket::addContact( const TQString &handle, int list, const TQStri // Adding the contact to a group if( !contactGuid.isEmpty() ) { - args = TQString("FL C=%1 %2").tqarg( contactGuid ).tqarg( groupGuid ); + args = TQString("FL C=%1 %2").arg( contactGuid ).arg( groupGuid ); kdDebug(14140) << k_funcinfo << "In adding contact to a group" << endl; } // Adding a new contact else { - args = TQString("FL N=%1 F=%2").tqarg( handle ).tqarg( escape( publicName ) ); + args = TQString("FL N=%1 F=%2").arg( handle ).arg( escape( publicName ) ); kdDebug(14140) << k_funcinfo << "In adding contact to a new contact" << endl; } break; } case MSNProtocol::AL: - args = TQString("AL N=%1").tqarg( handle ); + args = TQString("AL N=%1").arg( handle ); break; case MSNProtocol::BL: - args = TQString("BL N=%1").tqarg( handle ); + args = TQString("BL N=%1").arg( handle ); break; case MSNProtocol::RL: - args = TQString("RL N=%1").tqarg( handle ); + args = TQString("RL N=%1").arg( handle ); break; default: kdDebug(14140) << k_funcinfo <<"WARNING! Unknown list " << list << "!" << endl; @@ -1185,17 +1185,17 @@ void MSNNotifySocket::changePersonalMessage( MSNProtocol::PersonalMessageType ty if( !mediaList[0].isEmpty() ) // Current Track { xmlCurrentMedia += "{0}"; - formatterArguments += TQString("%1\\0").tqarg(mediaList[0]); + formatterArguments += TQString("%1\\0").arg(mediaList[0]); } if( !mediaList[1].isEmpty() ) // Current Artist { xmlCurrentMedia += " - {1}"; - formatterArguments += TQString("%1\\0").tqarg(mediaList[1]); + formatterArguments += TQString("%1\\0").arg(mediaList[1]); } if( !mediaList[2].isEmpty() ) // Current Album { xmlCurrentMedia += " ({2})"; - formatterArguments += TQString("%1\\0").tqarg(mediaList[2]); + formatterArguments += TQString("%1\\0").arg(mediaList[2]); } xmlCurrentMedia += "\\0" + formatterArguments + "\\0"; break; diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index e65fcd87..b8f852e3 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -183,7 +183,7 @@ void MSNSocket::slotSocketError( int error ) TQString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" ); if ( error == KSocketBase::LookupFailure ) - errormsg += i18n( "Unable to lookup %1" ).tqarg( m_socket->peerResolver().nodeName() ); + errormsg += i18n( "Unable to lookup %1" ).arg( m_socket->peerResolver().nodeName() ); else errormsg += m_socket->KSocketBase::errorString() ; @@ -594,7 +594,7 @@ void MSNSocket::handleError( uint code, uint /* id */ ) default: // FIXME: if the error causes a disconnect, it will crash, but we can't disconnect every time msg = i18n( "Unhandled MSN error code %1 \n" - "Please fill a bug report with a detailed description and if possible the last console debug output." ).tqarg( code ); + "Please fill a bug report with a detailed description and if possible the last console debug output." ).arg( code ); // "See http://www.hypothetic.org/docs/msn/basics.php for a description of all error codes." break; } diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index b5519ed8..7d678760 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -128,7 +128,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id ) } case 215: { - msg = i18n( "The user %1 is already in this chat." ).tqarg( m_msgHandle ); + msg = i18n( "The user %1 is already in this chat." ).arg( m_msgHandle ); type = MSNSocket::ErrorServerError; //userLeftChat(m_msgHandle , i18n("user was twice in this chat") ); //(the user shouln't join there @@ -136,7 +136,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id ) } case 216: { - msg = i18n( "The user %1 is online but has blocked you:\nyou can not talk to this user." ).tqarg( m_msgHandle ); + msg = i18n( "The user %1 is online but has blocked you:\nyou can not talk to this user." ).arg( m_msgHandle ); type = MSNSocket::ErrorInformation; userLeftChat(m_msgHandle, i18n("user blocked you")); @@ -145,7 +145,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id ) case 217: { // TODO: we need to know the nickname instead of the handle. - msg = i18n( "The user %1 is currently not signed in.\n" "Messages will not be delivered." ).tqarg( m_msgHandle ); + msg = i18n( "The user %1 is currently not signed in.\n" "Messages will not be delivered." ).arg( m_msgHandle ); type = MSNSocket::ErrorServerError; userLeftChat(m_msgHandle, i18n("user disconnected")); @@ -153,7 +153,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id ) } case 713: { - TQString msg = i18n( "You are trying to invite too many contacts to this chat at the same time" ).tqarg( m_msgHandle ); + TQString msg = i18n( "You are trying to invite too many contacts to this chat at the same time" ).arg( m_msgHandle ); type = MSNSocket::ErrorInformation; userLeftChat(m_msgHandle, i18n("user blocked you")); @@ -768,7 +768,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) int nb=(int)ceil((float)(len_M)/(float)(futurmessages_size)); if(KMessageBox::warningContinueCancel(0L /* FIXME: we should try to find a parent somewere*/ , - i18n("The message you are trying to send is too long; it will be split into %1 messages.").tqarg(nb) , + i18n("The message you are trying to send is too long; it will be split into %1 messages.").arg(nb) , i18n("Message too big - MSN Plugin" ), KStdGuiItem::cont() , "SendLongMessages" ) == KMessageBox::Continue ) { @@ -920,7 +920,7 @@ void MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin } else if(msnObj == "inkformatgif") { - TQString msg=i18n("<img src=\"%1\" alt=\"Typewrited message\" />" ).tqarg( file->name() ); + TQString msg=i18n("<img src=\"%1\" alt=\"Typewrited message\" />" ).arg( file->name() ); kdDebug(14140) << k_funcinfo << file->name() <<endl; @@ -1021,11 +1021,11 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms * emoticons like that. So, in that case, we show like the MSN client */ #if 0 TQString em = TQRegExp::escape( es ); - message.replace( TQRegExp(TQString::fromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)), + message.replace( TQRegExp(TQString::fromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).arg(em).arg(em)), TQString::fromLatin1("\\1<img align=\"center\" width=\"") + #endif //match any occurence which is not in a html tag. - message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))), + message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").arg(TQRegExp::escape(es))), TQString::fromLatin1("<img align=\"center\" width=\"") + TQString::number(iconImage.width()) + TQString::fromLatin1("\" height=\"") + diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp index 39d3c5d0..604df5d1 100644 --- a/kopete/protocols/msn/outgoingtransfer.cpp +++ b/kopete/protocols/msn/outgoingtransfer.cpp @@ -101,7 +101,7 @@ void OutgoingTransfer::slotSendData() buffer.resize(bytesRead); } - kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").tqarg(bytesRead) << endl; + kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").arg(bytesRead) << endl; if((m_offset + bytesRead) < m_file->size()) { @@ -254,11 +254,11 @@ void OutgoingTransfer::processMessage(const Message& message) // Send the direct connection invitation message. TQString content = "Bridges: TRUDPv1 TCPv1\r\n" + - TQString("NetID: %1\r\n").tqarg("-123657987") + - TQString("Conn-Type: %1\r\n").tqarg("Restrict-NAT") + + TQString("NetID: %1\r\n").arg("-123657987") + + TQString("Conn-Type: %1\r\n").arg("Restrict-NAT") + "UPnPNat: false\r\n" "ICF: false\r\n" + - TQString("Hashed-Nonce: {%1}\r\n").tqarg(P2P::Uid::createUid()) + + TQString("Hashed-Nonce: {%1}\r\n").arg(P2P::Uid::createUid()) + "\r\n"; sendMessage(INVITE, content); } diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp index da0b856e..57b1f356 100644 --- a/kopete/protocols/msn/transport.cpp +++ b/kopete/protocols/msn/transport.cpp @@ -213,7 +213,7 @@ void TcpTransportBridge::slotOnDisconnect() void TcpTransportBridge::slotOnError(int errorCode) { kdDebug(14140) << k_funcinfo << "Bridge (" << name() << ") ERROR occurred on {" << mSocket->localAddress().toString() << " <-> " << mSocket->peerAddress().toString() << "} - " << mSocket->errorString() << endl; - emit bridgeError(TQString("Bridge ERROR %1: %2").tqarg(errorCode).tqarg(mSocket->errorString())); + emit bridgeError(TQString("Bridge ERROR %1: %2").arg(errorCode).arg(mSocket->errorString())); if (mConnected){ mSocket->disconnect(); mConnected = false; diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui index cee5897d..3bf74195 100644 --- a/kopete/protocols/msn/ui/msnadd.ui +++ b/kopete/protocols/msn/ui/msnadd.ui @@ -37,7 +37,7 @@ <property name="text"> <string>&MSN Passport ID:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -70,7 +70,7 @@ <property name="text"> <string><i>(for example: joe@hotmail.com)</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui index b511de42..9c453e7c 100644 --- a/kopete/protocols/msn/ui/msneditaccountui.ui +++ b/kopete/protocols/msn/ui/msneditaccountui.ui @@ -101,7 +101,7 @@ <property name="text"> <string>To connect to the Microsoft network, you will need a Microsoft Passport.<br><br>If you do not currently have a Passport, please click the button to create one.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -229,7 +229,7 @@ <property name="text"> <string><qt><b>Note:</b> These settings are applicable to all MSN accounts</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -482,7 +482,7 @@ Only works for emoticons in the PNG format.</string> <property name="text"> <string>There are also privacy options in the "Contacts" tab</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -673,7 +673,7 @@ Only works for emoticons in the PNG format.</string> <property name="text"> <string>Please select a square image. The image will be scaled to 96x96.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -836,7 +836,7 @@ Only works for emoticons in the PNG format.</string> <property name="text"> <string>WARNING: You need to be connected to modify this page.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -1086,7 +1086,7 @@ Only works for emoticons in the PNG format.</string> <property name="text"> <string>WARNING: You need to be connected to modify this page</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -1304,7 +1304,7 @@ Only check this option if the normal connection doesn't work.</string> <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index a91d3460..88fe7d33 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -87,12 +87,12 @@ void Webcam::askIncommingInvitation() TQString message= (m_who==wProducer) ? i18n("<qt>The contact %1 wants to see <b>your</b> webcam, do you want them to see it?</qt>") : i18n("The contact %1 wants to show you his/her webcam, do you want to see it?") ; - int result=KMessageBox::questionYesNo( 0L , message.tqarg(m_recipient), + int result=KMessageBox::questionYesNo( 0L , message.arg(m_recipient), i18n("Webcam invitation - Kopete MSN Plugin") , i18n("Accept") , i18n("Decline")); if(!_this) return; - TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(m_sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").arg(m_sessionId); if(result==KMessageBox::Yes) { //Send two message, an OK, and an invite. @@ -305,7 +305,7 @@ void Webcam::processMessage(const Message& message) { uint sess=rand()%1000+5000; uint rid=rand()%100+50; - m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid).tqarg(sess); + m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid).arg(sess); kdDebug(14140) << k_funcinfo << "m_myAuth= " << m_myAuth << endl; TQString producerxml=xml(sess , rid); kdDebug(14140) << k_funcinfo << "producerxml= " << producerxml << endl; @@ -324,12 +324,12 @@ void Webcam::processMessage(const Message& message) TQString viewerxml=xml(sess.toUInt() , rid.toUInt()); kdDebug(14140) << k_funcinfo << "vewerxml= " << viewerxml << endl; makeSIPMessage( viewerxml ,0x00,0x09,0x00 ); - m_peerAuth=m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess); + m_peerAuth=m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid,sess); kdDebug(14140) << k_funcinfo << "m_auth= " << m_myAuth << endl; } else { - m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess); + m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid,sess); makeSIPMessage("receivedViewerData", 0xec , 0xda , 0x03); } @@ -346,7 +346,7 @@ void Webcam::processMessage(const Message& message) TQObject::connect(m_listener, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotListenError(int))); // Listen for incoming connections. bool isListening = m_listener->listen(); - kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").tqarg(m_listener->localAddress().toString()) : TQString("not listening")) << endl; + kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").arg(m_listener->localAddress().toString()) : TQString("not listening")) << endl; rx=TQRegExp("<tcpport>([^<]*)</tcpport>"); rx.search(m_content); @@ -370,9 +370,9 @@ void Webcam::processMessage(const Message& message) while(true) { an++; - if(!m_content.contains( TQString("<tcpipaddress%1>").tqarg(an) )) + if(!m_content.contains( TQString("<tcpipaddress%1>").arg(an) )) break; - rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").tqarg(an).tqarg(an)); + rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").arg(an).arg(an)); rx.search(m_content); TQString ip=rx.cap(1); if(ip.isNull()) @@ -503,7 +503,7 @@ TQString Webcam::xml(uint session , uint rid) TQStringList ips=m_dispatcher->localIp(); for ( it = ips.begin(); it != ips.end(); ++it ) { - ip+=TQString("<tcpipaddress%1>%2</tcpipaddress%3>").tqarg(ip_number).tqarg(*it).tqarg(ip_number); + ip+=TQString("<tcpipaddress%1>%2</tcpipaddress%3>").arg(ip_number).arg(*it).arg(ip_number); ++ip_number; } diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp index d5ed4865..39b7049b 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp @@ -28,7 +28,7 @@ MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, const char * name ) - : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contact ), + : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contact ), KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ), m_imageContainer( this ) { @@ -72,7 +72,7 @@ void MSNWebcamDialog::webcamClosed( int reason ) { kdDebug(14180) << k_funcinfo << "webcam closed with reason?? " << reason <<endl; //m_imageContainer.clear(); - //m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).tqarg( TQString::number( reason ) ) ); + //m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).arg( TQString::number( reason ) ) ); //m_imageContainer.setAlignment( TQt::AlignCenter ); //show(); } diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 93209b04..ee9c0c4a 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -118,7 +118,7 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio return; //okay, now we need to change the message.escapedBody from real HTML to aimhtml. //looking right now for docs on that "format". - //looks like everything except for tqalignment codes comes in the format of spans + //looks like everything except for alignment codes comes in the format of spans //font-style:italic -> <i> //font-weight:600 -> <b> (anything > 400 should be <b>, 400 is not bold) @@ -306,7 +306,7 @@ KActionMenu* AIMAccount::actionMenu() TQString accountNick = myself()->property( Kopete::Global::Properties::self()->nickName() ).value().toString(); mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - i18n( "%2 <%1>" ).tqarg( accountId(), accountNick )); + i18n( "%2 <%1>" ).arg( accountId(), accountNick )); mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index ed380b15..5791c58d 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -351,11 +351,11 @@ void AIMContact::warnUser() "(Warning a user on AIM will result in a \"Warning Level\"" \ " increasing for the user you warn. Once this level has reached a" \ " certain point, they will not be able to sign on. Please do not abuse" \ - " this function, it is meant for legitimate practices.)</qt>" ).tqarg( nick ); + " this function, it is meant for legitimate practices.)</qt>" ).arg( nick ); int result = KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget(), message, - i18n( "Warn User %1?" ).tqarg( nick ), + i18n( "Warn User %1?" ).arg( nick ), i18n( "Warn Anonymously" ), i18n( "Warn" ) ); if ( result == KMessageBox::Yes ) @@ -383,7 +383,7 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *) return; //okay, now we need to change the message.escapedBody from real HTML to aimhtml. //looking right now for docs on that "format". - //looks like everything except for tqalignment codes comes in the format of spans + //looks like everything except for alignment codes comes in the format of spans //font-style:italic -> <i> //font-weight:600 -> <b> (anything > 400 should be <b>, 400 is not bold) diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index 2e412491..0b70ac89 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -189,7 +189,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const } if (KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), - i18n("Do you want to add '%1' to your contact list?").tqarg(command), + i18n("Do you want to add '%1' to your contact list?").arg(command), TQString(), i18n("Add"), i18n("Do Not Add")) != KMessageBox::Yes) { @@ -212,7 +212,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const else KMessageBox::sorry( Kopete::UI::Global::mainWidget(), i18n( "Unable to connect to the chat room %1 because the account" - " for %2 is not connected." ).tqarg( firstParam ).tqarg( aimAccount->accountId() ), + " for %2 is not connected." ).arg( firstParam ).arg( aimAccount->accountId() ), TQString() ); } diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index 2ed71d94..c1eef1ab 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -39,7 +39,7 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool modal, TQWidget *parent, const char* name ) : KDialogBase( parent, name, modal, i18n( "User Information on %1" ) - .tqarg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ), + .arg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ), Cancel | Ok , Ok, true ) { kdDebug(14200) << k_funcinfo << "for contact '" << c->contactId() << "'" << endl; @@ -133,7 +133,7 @@ void AIMUserInfoDialog::slotUpdateClicked() { //m_contact->rename(newNick); //emit updateNickname(newNick); - setCaption(i18n("User Information on %1").tqarg(newNick)); + setCaption(i18n("User Information on %1").arg(newNick)); } } @@ -150,7 +150,7 @@ void AIMUserInfoDialog::slotSaveClicked() { //m_contact->rename(newNick); //emit updateNickname(newNick); - setCaption(i18n("User Information on %1").tqarg(newNick)); + setCaption(i18n("User Information on %1").arg(newNick)); } mAccount->setUserProfile(userInfoEdit->text()); diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index 4d9352ee..87450fc8 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -40,7 +40,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -174,7 +174,7 @@ <property name="text"> <string>To connect to the AOL Instant Messaging network, you will need to use a screen name from AIM, AOL, or .Mac.<br><br>If you do not currently have an AIM screen name, please click the button to create one.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui index 7de495f2..125c711b 100644 --- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui +++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui @@ -173,7 +173,7 @@ <property name="text"> <string>Away message:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index 9d996724..f2a9bce9 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -250,7 +250,7 @@ void ICQAccount::slotSetVisiblility() if ( oc ) { //for better orientation in lists use nickName and icq number TQString screenName( "%1 (%2)" ); - screenName = screenName.tqarg( oc->nickName(), contactId); + screenName = screenName.arg( oc->nickName(), contactId); contactMap.insert( screenName, contactId ); revContactMap.insert( contactId, screenName ); } diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index d5f1245c..e4943c37 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -117,7 +117,7 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de if ( Oscar::normalize( contact ) != Oscar::normalize( contactId() ) ) return; - // tqinvalidate old away message if user was offline + // invalidate old away message if user was offline if ( !isOnline() ) removeProperty( mProtocol->awayMessage ); @@ -276,8 +276,8 @@ void ICQContact::slotGotAuthReply( const TQString& contact, const TQString& reas if( granted ) { message = i18n( "User %1 has granted your authorization request.\nReason: %2" ) - .tqarg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) - .tqarg( reason ); + .arg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) + .arg( reason ); // remove the unknown status setOnlineStatus( ICQ::Presence( ICQ::Presence::Offline, ICQ::Presence::Visible ).toOnlineStatus() ); @@ -285,8 +285,8 @@ void ICQContact::slotGotAuthReply( const TQString& contact, const TQString& reas else { message = i18n( "User %1 has rejected the authorization request.\nReason: %2" ) - .tqarg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) - .tqarg( reason ); + .arg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) + .arg( reason ); } KNotifyClient::event( Kopete::UI::Global::sysTrayWId(), "icq_authorization", message ); } @@ -539,7 +539,7 @@ void ICQContact::slotContactChanged(const UserInfo &u) if (!mInfo.clientVersion.isEmpty()) { capList << i18n("Translators: client-name client-version", - "%1 %2").tqarg(mInfo.clientName, mInfo.clientVersion); + "%1 %2").arg(mInfo.clientName, mInfo.clientVersion); } else { diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index 9e85c1ad..cf86118f 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -141,11 +141,11 @@ void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) c } TQString nickuin = nick.isEmpty() ? - i18n("'%1'").tqarg(uin) : - i18n("'%1' (%2)").tqarg(nick, uin); + i18n("'%1'").arg(uin) : + i18n("'%1' (%2)").arg(nick, uin); if (KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), - i18n("Do you want to add %1 to your contact list?").tqarg(nickuin), TQString(), i18n("Add"), i18n("Do Not Add")) + i18n("Do you want to add %1 to your contact list?").arg(nickuin), TQString(), i18n("Add"), i18n("Do Not Add")) != KMessageBox::Yes) { kdDebug(14153) << k_funcinfo << "Cancelled" << endl; diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp index abbc8eb2..772650fb 100644 --- a/kopete/protocols/oscar/icq/icqreadaway.cpp +++ b/kopete/protocols/oscar/icq/icqreadaway.cpp @@ -37,7 +37,7 @@ ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *parent, const char* name) mAccount = static_cast<ICQAccount*>(c->account()); mContact = c; - setCaption(i18n("'%2' Message for %1").tqarg(c->displayName()).tqarg(c->onlineStatus().description())); + setCaption(i18n("'%2' Message for %1").arg(c->displayName()).arg(c->onlineStatus().description())); TQVBox *mMainWidget = makeVBoxMainWidget(); @@ -74,12 +74,12 @@ void ICQReadAway::slotFetchAwayMessage() mAccount->engine()->requestAwayMessage(mContact); - setCaption(i18n("Fetching '%2' Message for %1...").tqarg(mContact->displayName()).tqarg(mContact->onlineStatus().description())); + setCaption(i18n("Fetching '%2' Message for %1...").arg(mContact->displayName()).arg(mContact->onlineStatus().description())); } // END slotFetchAwayMessage() void ICQReadAway::slotAwayMessageChanged() { - setCaption(i18n("'%2' Message for %1").tqarg(mContact->displayName()).tqarg(mContact->onlineStatus().description())); + setCaption(i18n("'%2' Message for %1").arg(mContact->displayName()).arg(mContact->onlineStatus().description())); awayMessageBrowser->setText(mContact->awayMessage()); awayMessageBrowser->setDisabled(false); diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp index 59b6ce82..9041a131 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp @@ -50,9 +50,9 @@ void ICQAuthReplyDialog::setUser( const TQString & user ) { if ( m_wasRequested ) m_ui->lblUserReq->setText( - i18n( "<b>%1</b> requested authorization to add you to his/her contact list." ).tqarg( user ) ); + i18n( "<b>%1</b> requested authorization to add you to his/her contact list." ).arg( user ) ); else - m_ui->lblUserReq->setText( i18n( "Authorization reply to <b>%1</b>." ).tqarg( user ) ); + m_ui->lblUserReq->setText( i18n( "Authorization reply to <b>%1</b>." ).arg( user ) ); } void ICQAuthReplyDialog::setRequestReason( const TQString & reason ) diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index 541308e2..b60974e7 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -159,7 +159,7 @@ <string>To connect to the ICQ network, you will need an ICQ account.<br><br> If you do not currently have an ICQ account, please click the button to create one.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -411,7 +411,7 @@ If you do not currently have an ICQ account, please click the button to create o <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/oscar/liboscar/buffer.cpp b/kopete/protocols/oscar/liboscar/buffer.cpp index c778d382..48f68349 100644 --- a/kopete/protocols/oscar/liboscar/buffer.cpp +++ b/kopete/protocols/oscar/liboscar/buffer.cpp @@ -376,7 +376,7 @@ int Buffer::addChatTLV(const WORD type, const WORD exchange, void Buffer::expandBuffer(unsigned int inc) { - mBuffer.tqresize(mBuffer.size()+inc, TQGArray::SpeedOptim); + mBuffer.resize(mBuffer.size()+inc, TQGArray::SpeedOptim); } TQCString Buffer::getLNTS() @@ -477,7 +477,7 @@ TQString Buffer::toString() const if ( c < 0x10 ) hex.append("0"); - hex.append(TQString("%1 ").tqarg(c, 0, 16)); + hex.append(TQString("%1 ").arg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp index 23136db4..3004af0c 100644 --- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp @@ -262,7 +262,7 @@ void ChatNavServiceTask::handleBasicRoomInfo( const TLV& t ) kdDebug(OSCAR_RAW_DEBUG) << "moderator" << endl; break; case 0x6D: - kdDebug(OSCAR_RAW_DEBUG) << "num tqchildren" << endl; + kdDebug(OSCAR_RAW_DEBUG) << "num children" << endl; break; case 0x06F: kdDebug(OSCAR_RAW_DEBUG) << "occupancy" << endl; diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp index 638ed6c0..2a4d96f5 100644 --- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp @@ -54,7 +54,7 @@ static TQString toString( const TQByteArray& buffer ) if ( c < 0x10 ) hex.append("0"); - hex.append(TQString("%1 ").tqarg(c, 0, 16)); + hex.append(TQString("%1 ").arg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc index e9048c21..67753b20 100644 --- a/kopete/protocols/oscar/liboscar/rtf.cc +++ b/kopete/protocols/oscar/liboscar/rtf.cc @@ -2078,7 +2078,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), + // Since we don't implement any of the paragraph formatting tags (e.g. alignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/oscar/liboscar/rtf.ll b/kopete/protocols/oscar/liboscar/rtf.ll index 47d1bdf7..c43aeaea 100644 --- a/kopete/protocols/oscar/liboscar/rtf.ll +++ b/kopete/protocols/oscar/liboscar/rtf.ll @@ -515,7 +515,7 @@ void Level::clearParagraphFormatting() // implicitly start a paragraph if (!isParagraphOpen()) startParagraph(); - // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), + // Since we don't implement any of the paragraph formatting tags (e.g. alignment), // we don't clean up anything here. Note that \pard does NOT clean character // formatting (such as font size, font weight, italics...). p->parStyle.clearFormatting(); diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp index 9e637d45..d797031d 100644 --- a/kopete/protocols/oscar/liboscar/task.cpp +++ b/kopete/protocols/oscar/liboscar/task.cpp @@ -128,7 +128,7 @@ bool Task::take( Transfer * transfer) if(p.isEmpty()) return false; - // pass along the transfer to our tqchildren + // pass along the transfer to our children TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { @@ -271,7 +271,7 @@ void Task::debug(const TQString &str) { //black hole Q_UNUSED( str ); - //client()->debug(TQString("%1: ").tqarg(className()) + str); + //client()->debug(TQString("%1: ").arg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp index 9c2202a6..7669a945 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp @@ -53,28 +53,28 @@ void SSITest::testIt() //try to find a group by name ssi = m_manager->findGroup("SecondGroup"); if ( ssi ) - qDebug( TQString("Found group SecondGroup with gid=%1").tqarg( ssi->gid() ).latin1()); + qDebug( TQString("Found group SecondGroup with gid=%1").arg( ssi->gid() ).latin1()); else qDebug( "Oops, group SecondGroup not found" ); //try to find a group by gid ssi = m_manager->findGroup( 3 ); if ( ssi ) - qDebug( TQString("Found group 3 with name=%1").tqarg( ssi->name() ).latin1() ); + qDebug( TQString("Found group 3 with name=%1").arg( ssi->name() ).latin1() ); else qDebug( "Oops, group 3 not found" ); //try to find a contact by name ssi = m_manager->findContact("ThirdContact"); if ( ssi ) - qDebug( TQString( "Found contact ThirdContact with gid=%1" ).tqarg( ssi->gid() ).latin1() ); + qDebug( TQString( "Found contact ThirdContact with gid=%1" ).arg( ssi->gid() ).latin1() ); else qDebug( "Oops, contact ThirdContact not found" ); //try to find a contact using the name and the group name ssi = m_manager->findContact("FourthContact","SecondGroup"); if ( ssi ) - qDebug( TQString("Found contact FourthContact with bid=%1").tqarg( ssi->bid() ).latin1() ); + qDebug( TQString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() ); else qDebug( "Oops, contact FourthContact not found" ); @@ -89,13 +89,13 @@ void SSITest::testIt() TQValueList<SSI*>::iterator it; qDebug( "Contacts from group FirtsGroup:" ); for ( it = list.begin(); it != list.end(); ++it) - qDebug( TQString(" name=%1").tqarg( (*it)->name() ).latin1() ); + qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); //the group list TQValueList<SSI*> list2 = m_manager->groupList(); qDebug( "Group list:" ); for ( it = list2.begin(); it != list2.end(); ++it) - qDebug( TQString(" name=%1").tqarg( (*it)->name() ).latin1() ); + qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); //remove a group - this shouldn't report any debug line m_manager->removeGroup( "SecondGroup" ); diff --git a/kopete/protocols/oscar/liboscar/transfer.cpp b/kopete/protocols/oscar/liboscar/transfer.cpp index 100bcf9d..9af57b30 100644 --- a/kopete/protocols/oscar/liboscar/transfer.cpp +++ b/kopete/protocols/oscar/liboscar/transfer.cpp @@ -90,7 +90,7 @@ TQString Transfer::toString() const if(c < 0x10) hex.append("0"); - hex.append(TQString("%1 ").tqarg(c, 0, 16)); + hex.append(TQString("%1 ").arg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp index bc6ac70a..8a1b6c4e 100644 --- a/kopete/protocols/oscar/liboscar/userdetails.cpp +++ b/kopete/protocols/oscar/liboscar/userdetails.cpp @@ -126,7 +126,7 @@ TQString UserDetails::clientName() const { if ( !m_clientVersion.isEmpty() ) return i18n("Translators: client-name client-version", - "%1 %2").tqarg(m_clientName, m_clientVersion); + "%1 %2").arg(m_clientName, m_clientVersion); else return m_clientName; } diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index da6d534b..719e9122 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -727,7 +727,7 @@ void OscarAccount::userStoppedTyping( const TQString & contact ) void OscarAccount::slotSocketError( int errCode, const TQString& errString ) { Q_UNUSED( errCode ); - KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ), + KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).arg( accountId() ), errString, myself()->onlineStatus().protocolIcon(), Kopete::UI::Global::mainWidget() ); @@ -744,7 +744,7 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal ) if ( s.family == 0 && s.subtype == 0 ) { message = getFLAPErrorMessage( code ); - KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ), + KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).arg( accountId() ), message, myself()->onlineStatus().protocolIcon(), Kopete::UI::Global::mainWidget() ); switch ( code ) @@ -819,44 +819,44 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) { reason = i18n( "You have logged in more than once with the same %1," \ " account %2 is now disconnected.") - .tqarg( acctDescription ).tqarg( accountId() ); + .arg( acctDescription ).arg( accountId() ); } else // error while logging in { reason = i18n( "Sign on failed because either your %1 or " \ "password are invalid. Please check your settings for account %2.") - .tqarg( acctDescription ).tqarg( accountId() ); + .arg( acctDescription ).arg( accountId() ); } break; case 0x0002: // Service temporarily unavailable case 0x0014: // Reservation map error reason = i18n("The %1 service is temporarily unavailable. Please try again later.") - .tqarg( acctType ); + .arg( acctType ); break; case 0x0004: // Incorrect nick or password, re-enter case 0x0005: // Mismatch nick or password, re-enter reason = i18n("Could not sign on to %1 with account %2 because the " \ - "password was incorrect.").tqarg( acctType ).tqarg( accountId() ); + "password was incorrect.").arg( acctType ).arg( accountId() ); break; case 0x0007: // non-existant ICQ# case 0x0008: // non-existant ICQ# reason = i18n("Could not sign on to %1 with nonexistent account %2.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); break; case 0x0009: // Expired account reason = i18n("Sign on to %1 failed because your account %2 expired.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); break; case 0x0011: // Suspended account reason = i18n("Sign on to %1 failed because your account %2 is " \ - "currently suspended.").tqarg( acctType ).tqarg( accountId() ); + "currently suspended.").arg( acctType ).arg( accountId() ); break; case 0x0015: // too many clients from same IP case 0x0016: // too many clients from same IP case 0x0017: // too many clients from same IP (reservation) reason = i18n("Could not sign on to %1 as there are too many clients" \ - " from the same computer.").tqarg( acctType ); + " from the same computer.").arg( acctType ); break; case 0x0018: // rate exceeded (turboing) if ( isConnected() ) @@ -866,7 +866,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) " Wait ten minutes and try again." \ " If you continue to try, you will" \ " need to wait even longer.") - .tqarg( accountId() ).tqarg( acctType ); + .arg( accountId() ).arg( acctType ); } else { @@ -875,7 +875,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) " Wait ten minutes and try again." \ " If you continue to try, you will" \ " need to wait even longer.") - .tqarg( accountId() ).tqarg( acctType) ; + .arg( accountId() ).arg( acctType) ; } break; case 0x001C: @@ -883,7 +883,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) if ( !d->versionAlreadyUpdated ) { reason = i18n("Sign on to %1 with your account %2 failed.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); d->versionAlreadyUpdated = true; } @@ -891,19 +891,19 @@ TQString OscarAccount::getFLAPErrorMessage( int code ) { reason = i18n("The %1 server thinks the client you are using is " \ "too old. Please report this as a bug at http://bugs.kde.org") - .tqarg( acctType ); + .arg( acctType ); } break; case 0x0022: // Account suspended because of your age (age < 13) reason = i18n("Account %1 was disabled on the %2 server because " \ "of your age (less than 13).") - .tqarg( accountId() ).tqarg( acctType ); + .arg( accountId() ).arg( acctType ); break; default: if ( !isConnected() ) { reason = i18n("Sign on to %1 with your account %2 failed.") - .tqarg( acctType ).tqarg( accountId() ); + .arg( acctType ).arg( accountId() ); } break; } diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp index 71e8868d..cb9f06c6 100644 --- a/kopete/protocols/oscar/oscarcontact.cpp +++ b/kopete/protocols/oscar/oscarcontact.cpp @@ -177,7 +177,7 @@ void OscarContact::userInfoUpdated( const TQString& contact, const UserDetails& if ( !m_details.clientName().isEmpty() ) { capList << i18n( "Translators: client name and version", - "%1").tqarg( m_details.clientName() ); + "%1").arg( m_details.clientName() ); } } diff --git a/kopete/protocols/sms/serviceloader.cpp b/kopete/protocols/sms/serviceloader.cpp index b3f497be..0ebbe7fa 100644 --- a/kopete/protocols/sms/serviceloader.cpp +++ b/kopete/protocols/sms/serviceloader.cpp @@ -43,7 +43,7 @@ SMSService* ServiceLoader::loadService(const TQString& name, Kopete::Account* ac #endif else { - KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").tqarg(name), + KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").arg(name), i18n("Error Loading Service")); s = 0L; } diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 1d4836a1..9e941132 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -308,7 +308,7 @@ void GSMLib::saveConfig() { KConfigGroup* c = m_account->configGroup(); - c->writeEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), m_device); + c->writeEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), m_device); } } @@ -320,7 +320,7 @@ void GSMLib::loadConfig() TQString temp; KConfigGroup* c = m_account->configGroup(); - temp = c->readEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), TQString()); + temp = c->readEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), TQString()); if( temp != TQString() ) m_device = temp; } @@ -444,7 +444,7 @@ void GSMLib::customEvent(TQCustomEvent* e) const TQString& GSMLib::description() { TQString url = "http://www.pxh.de/fs/gsmlib/"; - m_description = i18n("<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on <a href=\"%1\">%1</a></qt>").tqarg(url).tqarg(url); + m_description = i18n("<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on <a href=\"%1\">%1</a></qt>").arg(url).arg(url); return m_description; } diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 05712501..0871266c 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg) m_msg = msg; KConfigGroup* c = m_account->configGroup(); - TQString provider = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), TQString()); + TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), TQString()); if (provider.isNull()) { @@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg) return; } - TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString()); + TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"). TQString()); if (programName.isNull()) programName = "/usr/bin/sms_client"; @@ -97,14 +97,14 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent) prefWidget->configDir->setMode(KFile::Directory); TQString configDir; if (m_account) - configDir = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ConfigDir"), TQString()); + configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), TQString()); if (configDir.isNull()) configDir = "/etc/sms"; prefWidget->configDir->setURL(configDir); TQString programName; if (m_account) - programName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), + programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), TQString()); if (programName.isNull()) programName = "/usr/bin/sms_client"; @@ -114,7 +114,7 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent) if (m_account) { - TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName")); + TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName")); for (int i=0; i < prefWidget->provider->count(); i++) { if (prefWidget->provider->text(i) == pName) @@ -136,9 +136,9 @@ void SMSClient::savePreferences() { KConfigGroup* c = m_account->configGroup(); - c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), prefWidget->program->url()); - c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ConfigDir"), prefWidget->configDir->url()); - c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), prefWidget->provider->currentText()); + c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), prefWidget->program->url()); + c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), prefWidget->configDir->url()); + c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), prefWidget->provider->currentText()); } } @@ -147,7 +147,7 @@ TQStringList SMSClient::providers() TQStringList p; TQDir d; - d.setPath(TQString("%1/services/").tqarg(prefWidget->configDir->url())); + d.setPath(TQString("%1/services/").arg(prefWidget->configDir->url())); p += d.entryList("*", TQDir::Files); return p; @@ -176,7 +176,7 @@ int SMSClient::maxSize() const TQString& SMSClient::description() { TQString url = "http://www.smsclient.org"; - m_description = i18n("<qt>SMSClient is a program for sending SMS with the modem. The program can be found on <a href=\"%1\">%1</a></qt>").tqarg(url).tqarg(url); + m_description = i18n("<qt>SMSClient is a program for sending SMS with the modem. The program can be found on <a href=\"%1\">%1</a></qt>").arg(url).arg(url); return m_description; } diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 442d7f16..732fc119 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -181,7 +181,7 @@ void SMSSend::setOptions(const TQString& name) kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be ok if zero!!)" << endl; if(!prefWidget) return; // sanity check - prefWidget->providerLabel->setText(i18n("%1 Settings").tqarg(name)); + prefWidget->providerLabel->setText(i18n("%1 Settings").arg(name)); labels.setAutoDelete(true); labels.clear(); @@ -237,7 +237,7 @@ int SMSSend::maxSize() const TQString& SMSSend::description() { TQString url = "http://zekiller.skytech.org/smssend_en.php"; - m_description = i18n("<qt>SMSSend is a program for sending SMS through gateways on the web. It can be found on <a href=\"%1\">%2</a></qt>").tqarg(url).tqarg(url); + m_description = i18n("<qt>SMSSend is a program for sending SMS through gateways on the web. It can be found on <a href=\"%1\">%2</a></qt>").arg(url).arg(url); return m_description; } diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index ffd0897e..8feb94a9 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -49,7 +49,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p if (f.open(IO_ReadOnly)) { TQTextStream t(&f); - TQString group = TQString("SMSSend-%1").tqarg(provider); + TQString group = TQString("SMSSend-%1").arg(provider); bool exactNumberMatch = false; TQStringList numberWords; numberWords.append("Tel"); @@ -87,7 +87,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p descriptions.append(args[1]); if (m_account) - values.append(m_account->configGroup()->readEntry(TQString("%1:%2").tqarg(group).tqarg(names[names.count()-1]), + values.append(m_account->configGroup()->readEntry(TQString("%1:%2").arg(group).arg(names[names.count()-1]), TQString())); else values.append(""); @@ -175,7 +175,7 @@ void SMSSendProvider::save(TQPtrList<KLineEdit>& args) kdDebug( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl; if (!m_account) return; // prevent crash in worst case - TQString group = TQString("SMSSend-%1").tqarg(provider); + TQString group = TQString("SMSSend-%1").arg(provider); int namesI=0; for (unsigned i=0; i < args.count(); i++) @@ -194,7 +194,7 @@ void SMSSendProvider::save(TQPtrList<KLineEdit>& args) // kdDebug(14160) << k_funcinfo << "saving " << args.at(i) << " to " << names[namesI] << endl; if (!args.at(i)->text().isEmpty()) { values[namesI] = args.at(i)->text(); - m_account->configGroup()->writeEntry(TQString("%1:%2").tqarg(group).tqarg(names[namesI]), values[namesI]); + m_account->configGroup()->writeEntry(TQString("%1:%2").arg(group).arg(names[namesI]), values[namesI]); } namesI++; } @@ -239,9 +239,9 @@ void SMSSendProvider::send(const Kopete::Message& msg) KProcess* p = new KProcess; - kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").tqarg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; + kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; - *p << TQString("%1/bin/smssend").tqarg(prefix) << provider << values; + *p << TQString("%1/bin/smssend").arg(prefix) << provider << values; output = ""; connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *))); diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 1788517d..10e09ae8 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -83,7 +83,7 @@ const bool SMSAccount::splitNowMsgTooLong(int msgLength) int max = theService->maxSize(); if(theLongMsgAction == ACT_CANCEL) return false; if(theLongMsgAction == ACT_SPLIT) return true; - if(KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), i18n("This message is longer than the maximum length (%1). Should it be divided to %2 messages?").tqarg(max).tqarg(msgLength / max + 1), + if(KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), i18n("This message is longer than the maximum length (%1). Should it be divided to %2 messages?").arg(max).arg(msgLength / max + 1), i18n("Message Too Long"), i18n("Divide"), i18n("Do Not Divide")) == KMessageBox::Yes) return true; else diff --git a/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui index f2d5e61b..cd28df83 100644 --- a/kopete/protocols/sms/ui/smsactprefs.ui +++ b/kopete/protocols/sms/ui/smsactprefs.ui @@ -187,7 +187,7 @@ <property name="text"> <string>To use SMS, you will need an account with a delivery service.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -396,7 +396,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/testbed/testbedaccountpreferences.ui b/kopete/protocols/testbed/testbedaccountpreferences.ui index 26e7fd4d..d678c4f0 100644 --- a/kopete/protocols/testbed/testbedaccountpreferences.ui +++ b/kopete/protocols/testbed/testbedaccountpreferences.ui @@ -117,7 +117,7 @@ <property name="text"> <string>To use the testbed protocol, just make up an account name. This protocol has no real networking capability.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -150,7 +150,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp index 9b98db7e..14e45dc3 100644 --- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp +++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp @@ -28,7 +28,7 @@ #include <klocale.h> TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).tqarg( contactId ), +: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).arg( contactId ), KDialogBase::Close, KDialogBase::Close, true /*seperator*/ ) { setInitialSize( TQSize(320,290), false ); diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index fa213552..16238824 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -107,7 +107,7 @@ bool WinPopupLib::checkMessageDir() "If you have not configured anything yet (samba) please see\n" "Install Into Samba (Configure... -> Account -> Edit) information\n" "on how to do this.\n" - "Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR), + "Should the directory be created? (May need root password)").arg(WP_POPUP_DIR), TQString::fromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create")); if (tmpYesNo == KMessageBox::Yes) { TQStringList kdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR)); @@ -126,7 +126,7 @@ bool WinPopupLib::checkMessageDir() "%1 are wrong!\n" "You will not receive messages if you say no.\n" "You can also correct it manually (chmod 0777 %1) and restart kopete.\n" - "Fix? (May need root password)").tqarg(WP_POPUP_DIR), + "Fix? (May need root password)").arg(WP_POPUP_DIR), TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); if (tmpYesNo == KMessageBox::Yes) { TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR)); diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui index 91522218..5029190c 100644 --- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui +++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui @@ -32,7 +32,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -142,7 +142,7 @@ <property name="text"> <string>To receive WinPopup messages sent from other machines, the hostname above must be set to this machine's hostname.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -163,7 +163,7 @@ However, the recommended way is to ask your administrator to create this directory ('mkdir -p -m 0777 /var/lib/winpopup') and add 'message command = _PATH_TO_/winpopup-send.sh %s %m %t &' (substitute _PATH_TO_ by the real path) to your smb.conf [global]-section.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index 004750ca..d7439628 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -160,7 +160,7 @@ KActionMenu* WPAccount::actionMenu() /// How to remove an action from Kopete::Account::actionMenu()? GF KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this); - theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId())); + theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId())); if (mProtocol) { diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index c602b70e..162374b7 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -38,7 +38,7 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa { // kdDebug( 14170 ) << k_funcinfo << endl; - setCaption( i18n( "User Info for %1" ).tqarg( m_contact->nickName() ) ); + setCaption( i18n( "User Info for %1" ).arg( m_contact->nickName() ) ); m_mainWidget = new WPUserInfoWidget( this, "WPUserInfo::m_mainWidget" ); setMainWidget( m_mainWidget ); diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp index 30867e02..e5ca520d 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.cpp +++ b/kopete/protocols/yahoo/libkyahoo/client.cpp @@ -711,7 +711,7 @@ void Client::leaveChat() void Client::notifyError( const TQString &info, const TQString & errorString, LogLevel level ) { kdDebug(YAHOO_RAW_DEBUG) << TQString::fromLatin1("\nThe following error occurred: %1\n Reason: %2\n LogLevel: %3") - .tqarg(info).tqarg(errorString).tqarg(level) << endl; + .arg(info).arg(errorString).arg(level) << endl; d->errorString = errorString; d->errorInformation = info; emit error( level ); diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp index 6ca9ae06..59d3b3fa 100644 --- a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp @@ -178,7 +178,7 @@ void ConferenceTask::addInvite( const TQString &room, const TQStringList &who, c TQString whoList = who.first(); for( int i = 1; i < who.size(); i++ ) - whoList += TQString(",%1").tqarg( who[i] ); + whoList += TQString(",%1").arg( who[i] ); t->setParam( 51, whoList.local8Bit() ); t->setParam( 57, room.local8Bit() ); diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index 301b5083..f6b8a47e 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -212,7 +212,7 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed) m_stage1Data= TQString(); /* construct a URL from the seed and request tokens */ TQByteArray encodedUrl; - TQString fullUrl = YahooTokenUrl.tqarg(sn, client()->password(), seed); + TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed); KURL tokenUrl(fullUrl); KIO::Job* job = KIO::get(tokenUrl, true, false); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), @@ -292,7 +292,7 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token) const TQString YahooLoginUrl = "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%1"; kdDebug(YAHOO_RAW_DEBUG) << "token:" << token << endl; m_stage2Data = TQString(); - TQString fullUrl = YahooLoginUrl.tqarg(token); + TQString fullUrl = YahooLoginUrl.arg(token); KURL loginUrl(fullUrl); KIO::Job* job = KIO::get(loginUrl, true, false); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp index 1a813a66..de6a1080 100644 --- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp @@ -68,7 +68,7 @@ void MailNotifierTask::parseMail( YMSGTransfer *t ) TQString subject = t->firstParam( 18 ); if( !mail.isEmpty() && !from.isEmpty() && !subject.isEmpty() ) - emit mailNotify( TQString::fromLatin1( "%1 <%2>").tqarg( from, mail ), subject, count.toInt() ); + emit mailNotify( TQString::fromLatin1( "%1 <%2>").arg( from, mail ), subject, count.toInt() ); else emit mailNotify( TQString(), TQString(), count.toInt()); } diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index 4da8517f..4dd00d90 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -91,7 +91,7 @@ void ModifyYABTask::connectFailed( int i) { m_socket->close(); client()->notifyError( i18n( "An error occurred while saving the address book entry." ), - TQString( "%1 - %2").tqarg(i).tqarg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error ); + TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error ); } void ModifyYABTask::connectSucceeded() @@ -105,8 +105,8 @@ void ModifyYABTask::connectSucceeded() "Host: address.yahoo.com\r\n" "Content-length: %4\r\n" "Cache-Control: no-cache\r\n\r\n") - .tqarg(client()->yCookie()).tqarg(client()->tCookie()) - .tqarg(client()->cCookie()).tqarg(m_postData.utf8().size()); + .arg(client()->yCookie()).arg(client()->tCookie()) + .arg(client()->cCookie()).arg(m_postData.utf8().size()); TQByteArray buffer; TQByteArray paket; @@ -174,21 +174,21 @@ void ModifyYABTask::slotRead() case EditEntry: if( !e.attribute( "es" ).isEmpty() && e.attribute( "es" ) != "0" ) // Check for edit errors { - emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").tqarg( e.attribute("es") ).tqarg( e.attribute("ee") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").arg( e.attribute("es") ).arg( e.attribute("ee") ) ); continue; } break; case AddEntry: if( !e.attribute( "as" ).isEmpty() && e.attribute( "as" ) != "0" ) // Check for add errors { - emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").tqarg( e.attribute("as") ).tqarg( e.attribute("ae") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").arg( e.attribute("as") ).arg( e.attribute("ae") ) ); continue; } break; case DeleteEntry: if( !e.attribute( "ds" ).isEmpty() && e.attribute( "ds" ) != "0" ) // Check for delete errors { - emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").tqarg( e.attribute("ds") ).tqarg( e.attribute("de") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").arg( e.attribute("ds") ).arg( e.attribute("de") ) ); continue; } break; diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index 5910fbfe..ec2e9f5f 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -188,19 +188,19 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer ) send( t ); // The server expects a HTTP HEAD command prior to the GET m_mimetypeJob = KIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") - .tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false); + .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false); m_mimetypeJob->addMetaData("cookies", "manual"); m_mimetypeJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;") - .tqarg(client()->tCookie()).tqarg(client()->yCookie()).tqarg(client()->cCookie()) ); + .arg(client()->tCookie()).arg(client()->yCookie()).arg(client()->cCookie()) ); m_transferJob = KIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") - .tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false, false ); + .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false, false ); TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); m_transferJob->addMetaData("cookies", "manual"); m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;") - .tqarg(client()->tCookie()).tqarg(client()->yCookie()) ); + .arg(client()->tCookie()).arg(client()->yCookie()) ); } } diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index 48d2af8c..04673c62 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -76,7 +76,7 @@ void SendPictureTask::connectFailed( int i) { kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString() << endl; - client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").tqarg(i).tqarg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error ); + client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error ); setError(); } @@ -105,7 +105,7 @@ void SendPictureTask::connectSucceeded() else { kdDebug(YAHOO_RAW_DEBUG) << "Error opening file: " << TQString(file.errorString()).ascii() << endl; - client()->notifyError(i18n("Error opening file: %1").tqarg(m_path), file.errorString(), Client::Error ); + client()->notifyError(i18n("Error opening file: %1").arg(m_path), file.errorString(), Client::Error ); return; } @@ -116,7 +116,7 @@ void SendPictureTask::connectSucceeded() "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n" "Host: filetransfer.msg.yahoo.com\r\n" "Content-length: %4\r\n" - "Cache-Control: no-cache\r\n\r\n").tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()).tqarg(file.size()+4+paket.size()); + "Cache-Control: no-cache\r\n\r\n").arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()).arg(file.size()+4+paket.size()); stream.writeRawBytes( header.local8Bit(), header.length() ); stream.writeRawBytes( paket.data(), paket.size() ); stream << (TQ_INT8)0x32 << (TQ_INT8)0x39 << (TQ_INT8)0xc0 << (TQ_INT8)0x80; diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp index ac900a83..ddb249bd 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp @@ -46,7 +46,7 @@ bool StatusNotifierTask::take( Transfer* transfer ) else if( t->service() == Yahoo::ServiceAuthorization ) parseAuthorization( t ); else - parseStatus( t ); + parsetStatus( t ); return true; } @@ -77,7 +77,7 @@ bool StatusNotifierTask::forMe( const Transfer* transfer ) const return false; } -void StatusNotifierTask::parseStatus( YMSGTransfer* t ) +void StatusNotifierTask::parsetStatus( YMSGTransfer* t ) { kdDebug(YAHOO_RAW_DEBUG) ; @@ -156,7 +156,7 @@ void StatusNotifierTask::parseAuthorization( YMSGTransfer* t ) TQString lname = t->firstParam( 254 ); TQString name; if( !fname.isEmpty() || !lname.isEmpty() ) - name = TQString("%1 %2").tqarg(fname).tqarg(lname); + name = TQString("%1 %2").arg(fname).arg(lname); kdDebug(YAHOO_RAW_DEBUG) << "Emitting gotAuthorizationRequest( " << nick<< ", " << msg << ", " << name << " )" << endl; emit gotAuthorizationRequest( nick, msg, name ); diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h index 4941d479..d819d54a 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h @@ -38,7 +38,7 @@ public: protected: virtual bool forMe( const Transfer *transfer ) const; - void parseStatus( YMSGTransfer *transfer ); + void parsetStatus( YMSGTransfer *transfer ); void parseStealthStatus( YMSGTransfer *transfer ); void parseAuthorization( YMSGTransfer *transfer ); signals: diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp index 6ad9994c..ccebaef3 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.cpp +++ b/kopete/protocols/yahoo/libkyahoo/task.cpp @@ -128,7 +128,7 @@ bool Task::take( Transfer * transfer) if(p.isEmpty()) return false; - // pass along the transfer to our tqchildren + // pass along the transfer to our children TQObjectListIt it(p); Task *t; for(; it.current(); ++it) @@ -252,7 +252,7 @@ void Task::clientDisconnected() void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").tqarg(className()) + str); + client()->debug(TQString("%1: ").arg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index addcb15a..90245b29 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -135,7 +135,7 @@ void WebcamTask::slotConnectionStage1Established() if( socketMap[socket].direction == Incoming ) { socket->writeBlock( TQCString("<RVWCFG>").data(), 8 ); - s = TQString("g=%1\r\n").tqarg(socketMap[socket].sender); + s = TQString("g=%1\r\n").arg(socketMap[socket].sender); } else { @@ -172,7 +172,7 @@ void WebcamTask::slotConnectionStage2Established() socket->writeBlock( TQCString("<RETQIMG>").data(), 8 ); // Send request information s = TQString("a=2\r\nc=us\r\ne=21\r\nu=%1\r\nt=%2\r\ni=\r\ng=%3\r\no=w-2-5-1\r\np=1") - .tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socketMap[socket].sender); + .arg(client()->userId()).arg(socketMap[socket].key).arg(socketMap[socket].sender); // Header: 08 00 01 00 00 00 00 stream << (TQ_INT8)0x08 << (TQ_INT8)0x00 << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT32)s.length(); } @@ -182,7 +182,7 @@ void WebcamTask::slotConnectionStage2Established() socket->writeBlock( TQCString("<SNDIMG>").data(), 8 ); // Send request information s = TQString("a=2\r\nc=us\r\nu=%1\r\nt=%2\r\ni=%3\r\no=w-2-5-1\r\np=2\r\nb=KopeteWebcam\r\nd=\r\n") - .tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socket->localAddress().nodeName()); + .arg(client()->userId()).arg(socketMap[socket].key).arg(socket->localAddress().nodeName()); // Header: 08 00 05 00 00 00 00 01 00 00 00 01 stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)s.length() << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x01; @@ -197,7 +197,7 @@ void WebcamTask::slotConnectionFailed( int error ) KStreamSocket* socket = const_cast<KStreamSocket*>( dynamic_cast<const KStreamSocket*>( sender() ) ); kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->KSocketBase::errorString() << endl; client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.") - .tqarg(socketMap[socket].sender), TQString("%1 - %2").tqarg(error).tqarg( socket->KSocketBase::errorString()), Client::Error ); + .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->KSocketBase::errorString()), Client::Error ); socketMap.remove( socket ); socket->deleteLater(); } @@ -579,7 +579,7 @@ void WebcamTask::grantAccess( const TQString &userId ) } TQByteArray ar; TQDataStream stream( ar, IO_WriteOnly ); - TQString user = TQString("u=%1").tqarg(userId); + TQString user = TQString("u=%1").arg(userId); stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)user.length() << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x01; diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp index 65c48f54..9ca9af3d 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp @@ -146,8 +146,8 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const e.setAttribute( "hs", privateState ); e.setAttribute( "hz", privateZIP ); e.setAttribute( "hn", privateCountry ); - e.setAttribute( "bi", TQString("%1/%2/%3").tqarg( birthday.day() ).tqarg( birthday.month() ).tqarg( birthday.year() ) ); - e.setAttribute( "an", TQString("%1/%2/%3").tqarg( anniversary.day() ).tqarg( anniversary.month() ).tqarg( anniversary.year() ) ); + e.setAttribute( "bi", TQString("%1/%2/%3").arg( birthday.day() ).arg( birthday.month() ).arg( birthday.year() ) ); + e.setAttribute( "an", TQString("%1/%2/%3").arg( anniversary.day() ).arg( anniversary.month() ).arg( anniversary.year() ) ); e.setAttribute( "c1", additional1 ); e.setAttribute( "c2", additional2 ); e.setAttribute( "c3", additional3 ); diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index 391d494e..951f88d8 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -95,12 +95,12 @@ void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision ) kdDebug(YAHOO_RAW_DEBUG) << "LastMerge: " << lastMerge << " LastRemoteRevision: " << lastRemoteRevision << endl; m_data = TQString(); TQString url = TQString::fromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3") - .tqarg( lastMerge ).tqarg( lastRemoteRevision ).tqarg( YMSG_PROGRAM_VERSION_STRING ); + .arg( lastMerge ).arg( lastRemoteRevision ).arg( YMSG_PROGRAM_VERSION_STRING ); m_transferJob = KIO::get( url , false, false ); m_transferJob->addMetaData("cookies", "manual"); m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;") - .tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()) ); + .arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) ); connect( m_transferJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) ); connect( m_transferJob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index a317cb12..025386f0 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -81,7 +81,7 @@ void YahooBuddyIconLoader::slotComplete( KIO::Job *job ) { kdDebug(YAHOO_RAW_DEBUG) << "An error occurred while downloading buddy icon." << endl; if( m_client ) - m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").tqarg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info ); + m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").arg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info ); } else { diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index ad70d3c6..1c9528ff 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -95,7 +95,7 @@ void YahooChatTask::getYahooChatCategories() transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)"); transfer->addMetaData( "no-cache", "true" ); transfer->addMetaData( "cookies", "manual" ); - transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(client()->tCookie(), client()->yCookie()) ); + transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( KIO::Job* ) ) ); @@ -107,11 +107,11 @@ void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category ) kdDebug(YAHOO_RAW_DEBUG) << "Category Id: " << category.id << endl; KIO::TransferJob *transfer; - transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").tqarg( category.id )), false, false ); + transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false ); transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)"); transfer->addMetaData( "no-cache", "true" ); transfer->addMetaData( "cookies", "manual" ); - transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(client()->tCookie(), client()->yCookie()) ); + transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( KIO::Job* ) ) ); @@ -214,7 +214,7 @@ void YahooChatTask::login() YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceChatOnline); t->setId( client()->sessionID() ); t->setParam( 1, client()->userId().local8Bit() ); - t->setParam( 135, TQString("ym%1").tqarg(YMSG_PROGRAM_VERSION_STRING).local8Bit() ); + t->setParam( 135, TQString("ym%1").arg(YMSG_PROGRAM_VERSION_STRING).local8Bit() ); send( t ); } diff --git a/kopete/protocols/yahoo/ui/yahooadd.ui b/kopete/protocols/yahoo/ui/yahooadd.ui index 252bc424..7faf0035 100644 --- a/kopete/protocols/yahoo/ui/yahooadd.ui +++ b/kopete/protocols/yahoo/ui/yahooadd.ui @@ -70,7 +70,7 @@ <property name="text"> <string><i>(for example: joe8752)</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui index 60dcf519..97be5673 100644 --- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui @@ -156,7 +156,7 @@ <property name="text"> <string>To connect to the Yahoo network, you will need a Yahoo account.<br><br>If you do not currently have a Yahoo account, please click the button to create one.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -416,7 +416,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index bdf56e79..700c91e5 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -219,9 +219,9 @@ void YahooUserInfoDialog::setData( const YABEntry &yab ) m_genInfoWidget->titleEdit->setText( yab.title ); if( yab.birthday.isValid() ) - m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").tqarg( yab.birthday.day() ).tqarg( yab.birthday.month() ).tqarg( yab.birthday.year() )); + m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").arg( yab.birthday.day() ).arg( yab.birthday.month() ).arg( yab.birthday.year() )); if( yab.anniversary.isValid() ) - m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").tqarg( yab.anniversary.day() ).tqarg( yab.anniversary.month() ).tqarg( yab.anniversary.year() )); + m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").arg( yab.anniversary.day() ).arg( yab.anniversary.month() ).arg( yab.anniversary.year() )); m_genInfoWidget->addressEdit->setText( yab.privateAdress ); m_genInfoWidget->cityEdit->setText( yab.privateCity ); diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp index 0bff9120..caa3c75a 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp @@ -28,7 +28,7 @@ #include <webcamwidget.h> YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contactId ), +: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contactId ), KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ) { setInitialSize( TQSize(320,290), false ); @@ -77,15 +77,15 @@ void YahooWebcamDialog::webcamClosed( int reason ) switch ( reason ) { case 1: - closeReason = i18n( "%1 has stopped broadcasting" ).tqarg( contactName ); break; + closeReason = i18n( "%1 has stopped broadcasting" ).arg( contactName ); break; case 2: - closeReason = i18n( "%1 has cancelled viewing permission" ).tqarg( contactName ); break; + closeReason = i18n( "%1 has cancelled viewing permission" ).arg( contactName ); break; case 3: - closeReason = i18n( "%1 has declined permission to view webcam" ).tqarg( contactName ); break; + closeReason = i18n( "%1 has declined permission to view webcam" ).arg( contactName ); break; case 4: - closeReason = i18n( "%1 does not have his/her webcam online" ).tqarg( contactName ); break; + closeReason = i18n( "%1 does not have his/her webcam online" ).arg( contactName ); break; default: - closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).tqarg( contactName); + closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).arg( contactName); } m_imageContainer->clear(); @@ -94,7 +94,7 @@ void YahooWebcamDialog::webcamClosed( int reason ) void YahooWebcamDialog::setViewer( const TQStringList &viewer ) { - TQString s = i18n( "%1 viewer(s)" ).tqarg( viewer.size() ); + TQString s = i18n( "%1 viewer(s)" ).arg( viewer.size() ); if( viewer.size() ) { s += ": "; diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index c6c861c9..7cc330f2 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -750,7 +750,7 @@ void YahooAccount::slotLoginResponse( int succ , const TQString &url ) else if(succ == Yahoo::LoginLock) { initConnectionSignals( DeleteConnections ); - errorMsg = i18n("Could not log into the Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").tqarg(url); + errorMsg = i18n("Could not log into the Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").arg(url); KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, errorMsg); static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline ); disconnected( BadUserName ); // FIXME: add a more appropriate disconnect reason @@ -801,7 +801,7 @@ void YahooAccount::slotDisconnected() TQString message; message = i18n( "%1 has been disconnected.\nError message:\n%2 - %3" ) - .tqarg( accountId() ).tqarg( m_session->error() ).tqarg( m_session->errorString() ); + .arg( accountId() ).arg( m_session->error() ).arg( m_session->errorString() ); KNotification::event( "connection_lost", message, myself()->onlineStatus().protocolIcon() ); } @@ -814,7 +814,7 @@ void YahooAccount::slotLoginFailed() TQString message; message = i18n( "There was an error while connecting %1 to the Yahoo server.\nError message:\n%2 - %3" ) - .tqarg( accountId()).tqarg( m_session->error() ).tqarg( m_session->errorString() ); + .arg( accountId()).arg( m_session->error() ).arg( m_session->errorString() ); KNotification::event( "cannot_connect", message, myself()->onlineStatus().protocolIcon() ); } @@ -825,11 +825,11 @@ void YahooAccount::slotError( int level ) return; else if( level <= Client::Warning ) KMessageBox::information( Kopete::UI::Global::mainWidget(), - i18n( "%1\n\nReason: %2").tqarg( m_session->errorInformation() ).tqarg( m_session->errorString() ), + i18n( "%1\n\nReason: %2").arg( m_session->errorInformation() ).arg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); else KMessageBox::error( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2" ) - .tqarg( m_session->errorInformation() ).tqarg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); + .arg( m_session->errorInformation() ).arg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); } void YahooAccount::slotGotBuddy( const TQString &userid, const TQString &alias, const TQString &group ) @@ -888,7 +888,7 @@ void YahooAccount::slotAuthorizationAccepted( const TQString &who ) { kdDebug(YAHOO_GEN_DEBUG) ; TQString message; - message = i18n( "User %1 has granted your authorization request." ).tqarg( who ); + message = i18n( "User %1 has granted your authorization request." ).arg( who ); KNotification::event( TQString::fromLatin1("kopete_authorization"), message ); if( contact( who ) ) @@ -900,7 +900,7 @@ void YahooAccount::slotAuthorizationRejected( const TQString &who, const TQStrin kdDebug(YAHOO_GEN_DEBUG) ; TQString message; message = i18n( "User %1 has rejected your authorization request.\n%2" ) - .tqarg( who ).tqarg( msg ); + .arg( who ).arg( msg ); KNotification::event( TQString::fromLatin1("kopete_authorization"), message ); } @@ -1222,13 +1222,13 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo { if( *it != m_session->userId() ) { - m.append( TQString(", %1").tqarg( *it ) ); + m.append( TQString(", %1").arg( *it ) ); myMembers.push_back( *it ); } } if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to join a conference with %2.\n\nHis/her message: %3\n\nAccept?") - .tqarg(who).tqarg(m).tqarg(msg), TQString(), i18n("Accept"), i18n("Ignore") ) ) + .arg(who).arg(m).arg(msg), TQString(), i18n("Accept"), i18n("Ignore") ) ) { m_session->joinConference( room, myMembers ); if( !m_conferences[room] ) @@ -1267,7 +1267,7 @@ void YahooAccount::prepareConference( const TQString &who ) char c = rand()%52; room += (c > 25) ? c + 71 : c + 65; } - room = TQString("%1-%2--").tqarg(accountId()).tqarg(room); + room = TQString("%1-%2--").arg(accountId()).arg(room); kdDebug(YAHOO_GEN_DEBUG) << "The generated roomname is: " << room << endl; TQStringList buddies; @@ -1329,7 +1329,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo YahooConferenceChatSession *session = m_conferences[room]; - TQString body = i18n( "%1 has declined to join the conference: \"%2\"").tqarg( who ).tqarg( msg ); + TQString body = i18n( "%1 has declined to join the conference: \"%2\"").arg( who ).arg( msg ); Kopete::Message message = Kopete::Message( contact( who ), myself(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); session->appendMessage( message ); @@ -1651,7 +1651,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec else if ( cnt > 0 ) { kdDebug(YAHOO_GEN_DEBUG) << "attempting to trigger event" << endl; - TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").tqarg( from ).tqarg( subject ), + TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").arg( from ).arg( subject ), TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); m_currentMailCount = cnt; @@ -1681,7 +1681,7 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who ) m_pendingWebcamInvites.append( who ); - if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").tqarg( who ), + if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").arg( who ), TQString(), i18n("Accept"), i18n("Ignore") ) ) { m_pendingWebcamInvites.remove( who ); @@ -1690,7 +1690,7 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who ) } void YahooAccount::slotWebcamNotAvailable( const TQString &who ) { - KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("Webcam for %1 is not available.").tqarg(who), i18n( "Yahoo Plugin" ) ); + KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("Webcam for %1 is not available.").arg(who), i18n( "Yahoo Plugin" ) ); } void YahooAccount::slotGotWebcamImage( const TQString& who, const TQPixmap& image ) @@ -1893,7 +1893,7 @@ void YahooAccount::slotWebcamViewerJoined( const TQString &viewer ) void YahooAccount::slotWebcamViewerRequest( const TQString &viewer ) { if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 wants to view your webcam. Grant access?") - .tqarg(viewer), TQString(), i18n("Accept"), i18n("Ignore") ) ) + .arg(viewer), TQString(), i18n("Accept"), i18n("Ignore") ) ) m_session->grantWebcamAccess( viewer ); } diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index f74fd1b6..3bd55b85 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -114,7 +114,7 @@ void YahooContact::setOnlineStatus(const Kopete::OnlineStatus &status) protocol() , status.internalStatus()+1000 , status.overlayIcons() + TQStringList("yahoo_stealthed") , - i18n("%1|Stealthed").tqarg( status.description() ) ) ); + i18n("%1|Stealthed").arg( status.description() ) ) ); } else if( !m_stealthed && status.internalStatus() > 999 )// Stealthed -> Not Stealthed Contact::setOnlineStatus( static_cast< YahooProtocol *>( protocol() )->statusFromYahoo( status.internalStatus() - 1000 ) ); @@ -607,7 +607,7 @@ void YahooContact::inviteWebcam() { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images." - "\nPlease see %1 for further information.").tqarg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); + "\nPlease see %1 for further information.").arg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); return; } m_account->yahooSession()->sendWebcamInvite( m_userId ); @@ -662,7 +662,7 @@ void YahooContact::requestWebcam() { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images." - "\nPlease see %1 for further information.").tqarg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); + "\nPlease see %1 for further information.").arg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); return; } diff --git a/kpf/src/ActiveMonitorItem.cpp b/kpf/src/ActiveMonitorItem.cpp index 217e437c..1fe889d1 100644 --- a/kpf/src/ActiveMonitorItem.cpp +++ b/kpf/src/ActiveMonitorItem.cpp @@ -178,7 +178,7 @@ namespace KPF sent_ += l; setText(Sent, TQString::number(sent_)); updateState(); - tqrepaint(); + repaint(); } } diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp index 238ddefa..0e0450b4 100644 --- a/kpf/src/ActiveMonitorWindow.cpp +++ b/kpf/src/ActiveMonitorWindow.cpp @@ -39,7 +39,7 @@ namespace KPF ) : KMainWindow(parent, name) { - setCaption(i18n("Monitoring %1 - kpf").tqarg(server->root())); + setCaption(i18n("Monitoring %1 - kpf").arg(server->root())); monitor_ = new ActiveMonitor(server, this, "ActiveMonitor"); diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index e5d3dc51..489b2036 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -62,7 +62,7 @@ namespace KPF (new TQVBoxLayout(this))->addWidget(graph_); - TQString popupTitle(i18n("kpf - %1").tqarg(server_->root())); + TQString popupTitle(i18n("kpf - %1").arg(server_->root())); popup_ = new KPopupMenu(this); diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp index 84a4bdef..d5a26233 100644 --- a/kpf/src/BandwidthGraph.cpp +++ b/kpf/src/BandwidthGraph.cpp @@ -88,7 +88,7 @@ namespace KPF BandwidthGraph::setTooltip() { TQToolTip::add(this, i18n( "%1 on port %2" ) - .tqarg( server_->root() ).tqarg( server_->listenPort() ) ); + .arg( server_->root() ).arg( server_->listenPort() ) ); } TQRect @@ -251,11 +251,11 @@ namespace KPF if (max_ > 1024) if (max_ > 1024 * 1024) - maxString = mbs.tqarg(max_ / (1024 * 1024)); + maxString = mbs.arg(max_ / (1024 * 1024)); else - maxString = kbs.tqarg(max_ / 1024); + maxString = kbs.arg(max_ / 1024); else if ( max_ > 0 ) - maxString = bs.tqarg(max_); + maxString = bs.arg(max_); else maxString = i18n( "Idle" ); diff --git a/kpf/src/BandwidthGraph.h b/kpf/src/BandwidthGraph.h index 257381cf..eac25f76 100644 --- a/kpf/src/BandwidthGraph.h +++ b/kpf/src/BandwidthGraph.h @@ -74,12 +74,12 @@ namespace KPF void setTooltip(); /** - * Overridden to provide reasonable default size and tqshape. + * Overridden to provide reasonable default size and shape. */ virtual TQSize sizeHint() const; /** - * Overridden to provide reasonable minimum size and tqshape. + * Overridden to provide reasonable minimum size and shape. */ virtual TQSize minimumSizeHint() const; diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp index 18aa7a98..6aec78d7 100644 --- a/kpf/src/DirectoryLister.cpp +++ b/kpf/src/DirectoryLister.cpp @@ -248,7 +248,7 @@ namespace KPF return buildHTML ( i18n("Error"), - i18n("Directory does not exist: %1 %2").tqarg(root).tqarg(path) + i18n("Directory does not exist: %1 %2").arg(root).arg(path) ); } @@ -260,7 +260,7 @@ namespace KPF return buildHTML ( i18n("Error"), - i18n("Directory unreadable: %1 %2").tqarg(root).tqarg(path) + i18n("Directory unreadable: %1 %2").arg(root).arg(path) ); } @@ -335,7 +335,7 @@ namespace KPF return buildHTML ( - i18n("Directory listing for %1").tqarg(TQStyleSheet::escape(path)), + i18n("Directory listing for %1").arg(TQStyleSheet::escape(path)), html ); } diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp index e53941e7..1fdf2c63 100644 --- a/kpf/src/ErrorMessageConfigDialog.cpp +++ b/kpf/src/ErrorMessageConfigDialog.cpp @@ -107,7 +107,7 @@ namespace KPF itemList_.append(new Item(*it, requester, responseName, originalPath)); - TQLabel * l = new TQLabel(pattern.tqarg(*it).tqarg(responseName), w); + TQLabel * l = new TQLabel(pattern.arg(*it).arg(responseName), w); l->setBuddy(requester); diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp index 56dfb51f..75a52dde 100644 --- a/kpf/src/PropertiesDialogPlugin.cpp +++ b/kpf/src/PropertiesDialogPlugin.cpp @@ -395,7 +395,7 @@ namespace KPF " (%1)" "</p>" ) - .tqarg(TQDir::homeDirPath()); + .arg(TQDir::homeDirPath()); TQString listenPortHelp = i18n diff --git a/kpf/src/Response.cpp b/kpf/src/Response.cpp index 67d4f206..85621ff8 100644 --- a/kpf/src/Response.cpp +++ b/kpf/src/Response.cpp @@ -90,7 +90,7 @@ namespace KPF if (request.protocol() >= 1.0) { s = TQString(request.protocolString()) - + TQString(" %1 %2\r\n").tqarg(code_).tqarg(responseName(code_)); + + TQString(" %1 %2\r\n").arg(code_).arg(responseName(code_)); } break; @@ -103,7 +103,7 @@ namespace KPF case 501: case 505: s = TQString(request.protocolString()) - + TQString(" %1 %2\r\n").tqarg(code_).tqarg(responseName(code_)) + + TQString(" %1 %2\r\n").arg(code_).arg(responseName(code_)) + data(code_, request); break; @@ -178,7 +178,7 @@ namespace KPF } TQString contentLength = - TQString("Content-Length: %1\r\n").tqarg(html.length()); + TQString("Content-Length: %1\r\n").arg(html.length()); return (contentType + contentLength + "\r\n" + html); } diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp index b48a2bf2..79ec90f1 100644 --- a/kpf/src/ServerWizard.cpp +++ b/kpf/src/ServerWizard.cpp @@ -49,7 +49,7 @@ namespace KPF ServerWizard::ServerWizard(TQWidget * parent) : KWizard(parent, "KPF::ServerWizard", true) { - setCaption(i18n("New Server - %1").tqarg("kpf")); + setCaption(i18n("New Server - %1").arg("kpf")); page1_ = new TQWidget(this); page2_ = new TQWidget(this); @@ -396,7 +396,7 @@ namespace KPF return; } - fileDialog->setCaption(i18n("Choose Directory to Share - %1").tqarg("kpf")); + fileDialog->setCaption(i18n("Choose Directory to Share - %1").arg("kpf")); } void diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp index 0dd907b3..c39f944b 100644 --- a/kpf/src/SingleServerConfigDialog.cpp +++ b/kpf/src/SingleServerConfigDialog.cpp @@ -40,7 +40,7 @@ namespace KPF parent, "KPF::SingleServerConfigDialog", false, - i18n("Configuring Server %1 - kpf").tqarg(server->root()), + i18n("Configuring Server %1 - kpf").arg(server->root()), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp index a01854a0..76c5f02e 100644 --- a/kppp/accounting.cpp +++ b/kppp/accounting.cpp @@ -74,8 +74,8 @@ AccountingBase::AccountingBase(TQObject *parent) : { TQDate dt = TQDate::currentDate(); LogFileName = TQString("%1-%2.log") - .tqarg(TQDate::shortMonthName(dt.month())) - .tqarg(dt.year(), 4); + .arg(TQDate::shortMonthName(dt.month())) + .arg(dt.year(), 4); LogFileName = KGlobal::dirs()->saveLocation("appdata", "Log") + "/" + LogFileName; diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index 2b8ae563..f44d2a22 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -324,7 +324,7 @@ void AccountWidget::copyaccount() { void AccountWidget::deleteaccount() { TQString s = i18n("Are you sure you want to delete\nthe account \"%1\"?") - .tqarg(accountlist_l->text(accountlist_l->currentItem())); + .arg(accountlist_l->text(accountlist_l->currentItem())); if(KMessageBox::warningYesNo(this, s, i18n("Confirm"), KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::cancel()) != KMessageBox::Yes) return; diff --git a/kppp/connect.cpp b/kppp/connect.cpp index 6878d072..9343bae1 100644 --- a/kppp/connect.cpp +++ b/kppp/connect.cpp @@ -210,7 +210,7 @@ void ConnectWidget::init() { comlist = &gpppdata.scriptType(); arglist = &gpppdata.script(); - TQString tit = i18n("Connecting to: %1").tqarg(gpppdata.accname()); + TQString tit = i18n("Connecting to: %1").arg(gpppdata.accname()); setCaption(tit); kapp->processEvents(); @@ -398,7 +398,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { TQStringList &plist = gpppdata.phonenumbers(); TQString bmarg= gpppdata.dialPrefix(); bmarg += *plist.at(dialnumber); - TQString bm = i18n("Dialing %1").tqarg(bmarg); + TQString bm = i18n("Dialing %1").arg(bmarg); messg->setText(bm); emit debugMessage(bm); @@ -434,7 +434,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { Modem::modem->hangup(); if(gpppdata.busyWait() > 0) { - TQString bm = i18n("Line busy. Waiting: %1 seconds").tqarg(gpppdata.busyWait()); + TQString bm = i18n("Line busy. Waiting: %1 seconds").arg(gpppdata.busyWait()); messg->setText(bm); emit debugMessage(bm); @@ -467,7 +467,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { timeout_timer->start(gpppdata.modemTimeout()*1000); if(gpppdata.busyWait() > 0) { - TQString bm = i18n("No carrier. Waiting: %1 seconds").tqarg(gpppdata.busyWait()); + TQString bm = i18n("No carrier. Waiting: %1 seconds").arg(gpppdata.busyWait()); messg->setText(bm); emit debugMessage(bm); @@ -553,7 +553,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { } if (scriptCommand == "Scan") { - TQString bm = i18n("Scanning %1").tqarg(scriptArgument); + TQString bm = i18n("Scanning %1").arg(scriptArgument); messg->setText(bm); emit debugMessage(bm); @@ -563,7 +563,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { } if (scriptCommand == "Save") { - TQString bm = i18n("Saving %1").tqarg(scriptArgument); + TQString bm = i18n("Saving %1").arg(scriptArgument); messg->setText(bm); emit debugMessage(bm); @@ -591,10 +591,10 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { arg = arg.replace(re2, gpppdata.storedPassword()); if (scriptCommand == "Send") - bm = bm.tqarg(scriptArgument); + bm = bm.arg(scriptArgument); else { for(uint i = 0; i < scriptArgument.length(); i++) - bm = bm.tqarg("*"); + bm = bm.arg("*"); } messg->setText(bm); @@ -606,7 +606,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { } if (scriptCommand == "Expect") { - TQString bm = i18n("Expecting %1").tqarg(scriptArgument); + TQString bm = i18n("Expecting %1").arg(scriptArgument); messg->setText(bm); emit debugMessage(bm); @@ -620,7 +620,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { if (scriptCommand == "Pause") { - TQString bm = i18n("Pause %1 seconds").tqarg(scriptArgument); + TQString bm = i18n("Pause %1 seconds").arg(scriptArgument); messg->setText(bm); emit debugMessage(bm); @@ -637,7 +637,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { timeout_timer->stop(); - TQString bm = i18n("Timeout %1 seconds").tqarg(scriptArgument); + TQString bm = i18n("Timeout %1 seconds").arg(scriptArgument); messg->setText(bm); emit debugMessage(bm); @@ -672,7 +672,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { } if (scriptCommand == "ID") { - TQString bm = i18n("ID %1").tqarg(scriptArgument); + TQString bm = i18n("ID %1").arg(scriptArgument); messg->setText(bm); emit debugMessage(bm); @@ -708,7 +708,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { } if (scriptCommand == "Password") { - TQString bm = i18n("Password %1").tqarg(scriptArgument); + TQString bm = i18n("Password %1").arg(scriptArgument); messg->setText(bm); emit debugMessage(bm); @@ -758,7 +758,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { ts.insert( vstart, scanvar ); } - bm = bm.tqarg(ts); + bm = bm.arg(ts); messg->setText(bm); emit debugMessage(bm); @@ -782,7 +782,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { } if (scriptCommand == "PWPrompt") { - TQString bm = i18n("PW Prompt %1").tqarg(scriptArgument); + TQString bm = i18n("PW Prompt %1").arg(scriptArgument); messg->setText(bm); emit debugMessage(bm); @@ -807,7 +807,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { if (scriptCommand == "LoopStart") { - TQString bm = i18n("Loop Start %1").tqarg(scriptArgument); + TQString bm = i18n("Loop Start %1").arg(scriptArgument); // The incrementing of the scriptindex MUST be before the // call to setExpect otherwise the expect will miss a string that is @@ -832,9 +832,9 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { } if (scriptCommand == "LoopEnd") { - TQString bm = i18n("Loop End %1").tqarg(scriptArgument); + TQString bm = i18n("Loop End %1").arg(scriptArgument); if ( loopnest <= 0 ) { - bm = i18n("LoopEnd without matching Start. Line: %1").tqarg(bm); + bm = i18n("LoopEnd without matching Start. Line: %1").arg(bm); vmain=20; cancelbutton(); KMessageBox::error(0, bm); @@ -1003,7 +1003,7 @@ void ConnectWidget::checkBuffers() { scanvar = scanvar.stripWhiteSpace(); // Show the Variabel content in the debug window - TQString sv = i18n("Scan Var: %1").tqarg(scanvar); + TQString sv = i18n("Scan Var: %1").arg(scanvar); emit debugMessage(sv); } @@ -1013,7 +1013,7 @@ void ConnectWidget::checkBuffers() { // keep everything after the expected string readbuffer.remove(0, readbuffer.find(expectstr) + expectstr.length()); - TQString ts = i18n("Found: %1").tqarg(expectstr); + TQString ts = i18n("Found: %1").arg(expectstr); emit debugMessage(ts); if (loopend) { @@ -1024,7 +1024,7 @@ void ConnectWidget::checkBuffers() { if (loopend && readbuffer.contains(loopstr[loopnest])) { expecting = false; readbuffer = ""; - TQString ts = i18n("Looping: %1").tqarg(loopstr[loopnest]); + TQString ts = i18n("Looping: %1").arg(loopstr[loopnest]); emit debugMessage(ts); scriptindex = loopstartindex[loopnest]; loopend = false; @@ -1117,7 +1117,7 @@ void ConnectWidget::setScan(const TQString &n) { scanstr = n; scanbuffer = ""; - TQString ts = i18n("Scanning: %1").tqarg(n); + TQString ts = i18n("Scanning: %1").arg(n); emit debugMessage(ts); } @@ -1126,7 +1126,7 @@ void ConnectWidget::setExpect(const TQString &n) { expecting = true; expectstr = n; - TQString ts = i18n("Expecting: %1").tqarg(n); + TQString ts = i18n("Expecting: %1").arg(n); ts.replace(TQRegExp("\n"), "<LF>"); emit debugMessage(ts); diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp index a657fd2c..8f2c8a89 100644 --- a/kppp/conwindow.cpp +++ b/kppp/conwindow.cpp @@ -264,12 +264,12 @@ void ConWindow::timeclick() { TQString tooltip = i18n("Connection: %1\n" "Connected at: %2\n" "Time connected: %3") - .tqarg(gpppdata.accname()).tqarg(info2->text()) - .tqarg(time_string2); + .arg(gpppdata.accname()).arg(info2->text()) + .arg(time_string2); if(accountingEnabled) tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2") - .tqarg(session_bill->text()).tqarg(total_bill->text()); + .arg(session_bill->text()).arg(total_bill->text()); // volume accounting if(volumeAccountingEnabled) { diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index a20d5f15..35a0cb45 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -305,7 +305,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) bool result = gpppdata.setModem(m_strCmdlModem); if (!result){ TQString string; - string = i18n("No such Modem:\n%1\nFalling back to default").tqarg(m_strCmdlModem); + string = i18n("No such Modem:\n%1\nFalling back to default").arg(m_strCmdlModem); KMessageBox::error(this, string); m_bCmdlModem = false; } @@ -315,7 +315,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) bool result = gpppdata.setAccount(m_strCmdlAccount); if (!result){ TQString string; - string = i18n("No such Account:\n%1").tqarg(m_strCmdlAccount); + string = i18n("No such Account:\n%1").arg(m_strCmdlAccount); KMessageBox::error(this, string); m_bCmdlAccount = false; show(); @@ -515,7 +515,7 @@ void KPPPWidget::resetmodems() { } label7->setShown(m_bModemCShown); modem_c->setShown(m_bModemCShown); - tqlayout()->tqinvalidate(); + tqlayout()->invalidate(); setFixedSize(sizeHint()); //set the default modem @@ -619,12 +619,12 @@ void KPPPWidget::sigPPPDDied() { msg = i18n("<p>The pppd daemon died unexpectedly!</p>"); Requester::rq->pppdExitStatus(); if (Requester::rq->lastStatus != 99) { // more recent pppds only - msg += i18n("<p>Exit status: %1").tqarg(Requester::rq->lastStatus); + msg += i18n("<p>Exit status: %1").arg(Requester::rq->lastStatus); msg += i18n("</p><p>See 'man pppd' for an explanation of the error " "codes or take a look at the kppp FAQ on " " <a href=\"%1\">%2</a></p>") - .tqarg("http://developer.kde.org/~kppp/index.html") - .tqarg("http://developer.kde.org/~kppp/index.html"); + .arg("http://developer.kde.org/~kppp/index.html") + .arg("http://developer.kde.org/~kppp/index.html"); } } @@ -715,7 +715,7 @@ void KPPPWidget::beginConnect() { string = i18n("kppp cannot execute:\n %1\n" "Please make sure that you have given kppp " "setuid permission and that " - "pppd is executable.").tqarg(gpppdata.pppdPath()); + "pppd is executable.").arg(gpppdata.pppdPath()); KMessageBox::error(this, string); return; @@ -737,7 +737,7 @@ void KPPPWidget::beginConnect() { "your modem device properly " "and/or adjust the location of the modem device on " "the modem tab of " - "the setup dialog.").tqarg(device); + "the setup dialog.").arg(device); KMessageBox::error(this, string); return; } @@ -760,7 +760,7 @@ void KPPPWidget::beginConnect() { encodeWord(gpppdata.password()))) { TQString s; s = i18n("Cannot create PAP/CHAP authentication\n" - "file \"%1\"").tqarg(PAP_AUTH_FILE); + "file \"%1\"").arg(PAP_AUTH_FILE); KMessageBox::error(this, s); return; } @@ -775,7 +775,7 @@ void KPPPWidget::beginConnect() { hide(); - TQString tit = i18n("Connecting to: %1").tqarg(gpppdata.accname()); + TQString tit = i18n("Connecting to: %1").arg(gpppdata.accname()); con->setCaption(tit); con->enableButtons(); con->show(); @@ -922,7 +922,7 @@ void KPPPWidget::startAccounting() { if(!acct->loadRuleSet(gpppdata.accountingFile())) { TQString s= i18n("Can not load the accounting " - "ruleset \"%1\".").tqarg(gpppdata.accountingFile()); + "ruleset \"%1\".").arg(gpppdata.accountingFile()); // starting the messagebox with a timer will prevent us // from blocking the calling function ConnectWidget::timerEvent diff --git a/kppp/logview/export.cpp b/kppp/logview/export.cpp index a3d55686..f236be50 100644 --- a/kppp/logview/export.cpp +++ b/kppp/logview/export.cpp @@ -219,7 +219,7 @@ void CSVExport::setFinishCode() { /***** HTMLExport *****/ HTMLExport::HTMLExport(const TQString &filename, const TQString &date) : Export(filename) { - TQString title = i18n("Connection log for %1").tqarg(date); + TQString title = i18n("Connection log for %1").arg(date); buffer = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"; buffer.append("<html>\n<head>\n <title>"+title+"</title>\n"); buffer.append(TQString::fromLatin1(" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=") diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 030cd3ba..fee59878 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -38,9 +38,9 @@ static void formatBytes(double bytes, TQString &result) { if(bytes < 1024) result.setNum(bytes); else if(bytes < 1024*1024) - result = i18n("%1 KB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); + result = i18n("%1 KB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); else - result = i18n("%1 MB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); + result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); } static void formatBytesMonth(double bytes, TQString &result) { @@ -54,23 +54,23 @@ static void formatBytesMonth(double bytes, TQString &result) { if(bytes < 1024) result.setNum(bytes); else if(bytes < 1024*1024) - result = i18n("%1 KB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); + result = i18n("%1 KB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0, 1)); else - result = i18n("%1 MB").tqarg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); + result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1)); } static void formatDuration(int seconds, TQString &result) { TQString sec; sec.sprintf("%02d", seconds%60); if(seconds < 60) - result = i18n("%1s").tqarg(sec); + result = i18n("%1s").arg(sec); else if(seconds < 3600) - result = i18n("%1m %2s").tqarg(seconds/60).tqarg(sec); + result = i18n("%1m %2s").arg(seconds/60).arg(sec); else result = i18n("%1h %2m %3s") - .tqarg(seconds/3600) - .tqarg((seconds % 3600)/60) - .tqarg(sec); + .arg(seconds/3600) + .arg((seconds % 3600)/60) + .arg(sec); } static void formatDurationMonth(int seconds, TQString &result) { @@ -84,14 +84,14 @@ static void formatDurationMonth(int seconds, TQString &result) { TQString sec; sec.sprintf("%02d", seconds%60); if(seconds < 60) - result = i18n("%1s").tqarg(sec); + result = i18n("%1s").arg(sec); else if(seconds < 3600) - result = i18n("%1m %2s").tqarg(seconds/60).tqarg(sec); + result = i18n("%1m %2s").arg(seconds/60).arg(sec); else result = i18n("%1h %2m %3s") - .tqarg(seconds/3600) - .tqarg((seconds % 3600)/60) - .tqarg(sec); + .arg(seconds/3600) + .arg((seconds % 3600)/60) + .arg(sec); } static void costsMonth(double costs, double &result) { @@ -117,7 +117,7 @@ public: { } virtual void paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); virtual TQString key(int, bool) const; @@ -125,9 +125,9 @@ public: }; void LogListItem::paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { - TQListViewItem::paintCell(p, cg, column, width, tqalignment); + TQListViewItem::paintCell(p, cg, column, width, alignment); // double line above sum //if(!li) { @@ -426,13 +426,13 @@ void MonthlyWidget::plotMonth() { if(lv->childCount() > 0) { exportBttn->setEnabled(true); // export possibility t = i18n("Connection log for %1 %2") - .tqarg(calendar->monthName(startDate)) - .tqarg(calendar->year(startDate)); + .arg(calendar->monthName(startDate)) + .arg(calendar->year(startDate)); } else { exportBttn->setEnabled(false); // nothing to export t = i18n("No connection log for %1 %2 available") - .tqarg(calendar->monthName(startDate)) - .tqarg(calendar->year(startDate)); + .arg(calendar->monthName(startDate)) + .arg(calendar->year(startDate)); } title->setText(t); @@ -465,8 +465,8 @@ void MonthlyWidget::currentMonth() { void MonthlyWidget::exportWizard() { const KCalendarSystem * calendar = KGlobal::locale()->calendar(); TQString date = TQString::fromLatin1("%1-%2") // e.g.: June-2001 - .tqarg(calendar->monthName(periodeFirst())) - .tqarg(calendar->year(periodeFirst())); + .arg(calendar->monthName(periodeFirst())) + .arg(calendar->year(periodeFirst())); ExportWizard *wizard = new ExportWizard(0, date); wizard->exec(); @@ -598,7 +598,7 @@ void MonthlyWidget::exportWizard() { TQString datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true); exportIFace->addEmptyLine(); - exportIFace->addDataline(i18n("Monthly estimates (%1)").tqarg(datetime), + exportIFace->addDataline(i18n("Monthly estimates (%1)").arg(datetime), TQString(), TQString(), TQString(), m_duration, m_costs, m_bin, m_bout); } diff --git a/kppp/main.cpp b/kppp/main.cpp index b6bb6c57..753291ba 100644 --- a/kppp/main.cpp +++ b/kppp/main.cpp @@ -241,7 +241,7 @@ int main( int argc, char **argv ) { KGlobal::dirs()->saveLocation("appdata", "Rules"); int pid = create_pidfile(); - TQString err_msg = i18n("kppp can't create or read from\n%1.").tqarg(pidfile); + TQString err_msg = i18n("kppp can't create or read from\n%1.").arg(pidfile); if(pid < 0) { KMessageBox::error(0L, err_msg); @@ -281,7 +281,7 @@ int main( int argc, char **argv ) { "Alternatively, if you have determined that " "there is no other kppp running, please " "click Continue to begin.") - .tqarg(pidfile).tqarg(pid); + .arg(pidfile).arg(pid); int button = KMessageBox::warningYesNo(0, msg, i18n("Error"), i18n("Exit"), KStdGuiItem::cont()); if (button == KMessageBox::Yes) /* exit */ diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp index fe1eb144..626a1185 100644 --- a/kppp/modemcmds.cpp +++ b/kppp/modemcmds.cpp @@ -83,7 +83,7 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) for(int i = 0; i < PPPData::NumInitStrings; i++) { initstr[i] = new TQLineEdit(dummyWidget); - TQLabel *initLabel = new TQLabel(i18n("Initialization string %1:").tqarg(i + 1), + TQLabel *initLabel = new TQLabel(i18n("Initialization string %1:").arg(i + 1), dummyWidget); ADJUSTEDIT(initstr[i]); l1->addWidget(initLabel, row, 1); diff --git a/kppp/modems.cpp b/kppp/modems.cpp index 5a13be66..f7f59a4c 100644 --- a/kppp/modems.cpp +++ b/kppp/modems.cpp @@ -190,7 +190,7 @@ void ModemsWidget::copymodem() { void ModemsWidget::deletemodem() { TQString s = i18n("Are you sure you want to delete\nthe modem \"%1\"?") - .tqarg(modemlist_l->text(modemlist_l->currentItem())); + .arg(modemlist_l->text(modemlist_l->currentItem())); if(KMessageBox::warningContinueCancel(this, s, i18n("Confirm"), KStdGuiItem::del()) != KMessageBox::Continue) return; diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp index ceb8298b..a983a8b4 100644 --- a/kppp/pppdata.cpp +++ b/kppp/pppdata.cpp @@ -350,7 +350,7 @@ void PPPData::set_dock_into_panel(bool set) { TQString PPPData::pppdVersion() { - return TQString("%1.%2.%3").tqarg(pppdVer).tqarg(pppdMod).tqarg(pppdPatch); + return TQString("%1.%2.%3").arg(pppdVer).arg(pppdMod).arg(pppdPatch); } bool PPPData::pppdVersionMin(int ver, int mod, int patch) { @@ -498,7 +498,7 @@ int PPPData::copymodem(int i) { TQMap <TQString, TQString> map = config->entryMap(cmodemgroup); TQMap <TQString, TQString>::ConstIterator it = map.begin(); - TQString newname = i18n("%1_copy").tqarg(modname()); + TQString newname = i18n("%1_copy").arg(modname()); newmodem(); @@ -1026,7 +1026,7 @@ int PPPData::copyaccount(int i) { TQMap <TQString, TQString> map = config->entryMap(caccountgroup); TQMap <TQString, TQString>::ConstIterator it = map.begin(); - TQString newname = i18n("%1_copy").tqarg(accname()); + TQString newname = i18n("%1_copy").arg(accname()); newaccount(); diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp index 0c62b152..a98a9390 100644 --- a/kppp/ppplog.cpp +++ b/kppp/ppplog.cpp @@ -171,7 +171,7 @@ void PPPL_AnalyseLog(TQStringList &list, TQStringList &result) { if(!str.isEmpty()) { msg = i18n("Notice that the remote system has sent the following" " message:\n\"%1\"\nThis may give you a hint why the" - " the connection has failed.").tqarg(str); + " the connection has failed.").arg(str); result.append(msg); } } @@ -281,7 +281,7 @@ void PPPL_ShowLog() { fclose(f); umask(old_umask); - TQString msg = i18n("The PPP log has been saved\nas \"%1\"!\n\nIf you want to send a bug report, or have\nproblems connecting to the Internet, please\nattach this file. It will help the maintainers\nto find the bug and to improve KPPP").tqarg(s); + TQString msg = i18n("The PPP log has been saved\nas \"%1\"!\n\nIf you want to send a bug report, or have\nproblems connecting to the Internet, please\nattach this file. It will help the maintainers\nto find the bug and to improve KPPP").arg(s); KMessageBox::information(0, msg); } delete dlg; diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp index 818c2c38..3fefd2a8 100644 --- a/kppp/pppstatdlg.cpp +++ b/kppp/pppstatdlg.cpp @@ -290,8 +290,8 @@ void PPPStatsDlg::paintGraph() { TQRect r; TQString s = i18n("%1 (max. %2) kb/sec") - .tqarg(KGlobal::locale()->formatNumber((float)last_max / 1024.0, 1)) - .tqarg(KGlobal::locale()->formatNumber((float)max / 1024.0, 1)); + .arg(KGlobal::locale()->formatNumber((float)last_max / 1024.0, 1)) + .arg(KGlobal::locale()->formatNumber((float)max / 1024.0, 1)); p.drawText(0, 0, pm.width(), 2*8, AlignRight|AlignVCenter, s, -1, &r); p.drawLine(0, 8, r.left() - 8, 8); diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp index c3025762..270b4b72 100644 --- a/kppp/pwentry.cpp +++ b/kppp/pwentry.cpp @@ -36,7 +36,7 @@ PWEntry::PWEntry( TQWidget *parent, const char *name ) if(parent){ TQPoint point = mapToGlobal (TQPoint (0,0)); - TQRect pos = tqgeometry(); + TQRect pos = geometry(); setGeometry(point.x() + pos.width()/2 - 300/2, point.y() + pos.height()/2 - 90/2, diff --git a/kppp/runtests.cpp b/kppp/runtests.cpp index 23f2196d..a520d116 100644 --- a/kppp/runtests.cpp +++ b/kppp/runtests.cpp @@ -253,7 +253,7 @@ int runTests() { i18n("You don't have sufficient permission to run\n" "%1\n" "Please make sure that kppp is owned by root " - "and has the SUID bit set.").tqarg(f)); + "and has the SUID bit set.").arg(f)); warning++; } } @@ -265,7 +265,7 @@ int runTests() { TQString msgstr = i18n("%1 is missing or can't be read!\n" "Ask your system administrator to create " "this file (can be empty) with appropriate " - "read and write permissions.").tqarg(file); + "read and write permissions.").arg(file); KMessageBox::error(0, msgstr); warning ++; } diff --git a/krdc/hostpreferences.cpp b/krdc/hostpreferences.cpp index 1307bd5f..1c8ec573 100644 --- a/krdc/hostpreferences.cpp +++ b/krdc/hostpreferences.cpp @@ -61,7 +61,7 @@ TQString HostPref::prefix() const { } TQString HostPref::prefix(const TQString &host, const TQString &type) { - return TQString("PerHost-%1-%2-").tqarg(type).tqarg(host); + return TQString("PerHost-%1-%2-").arg(type).arg(host); } diff --git a/krdc/keycapturewidget.ui b/krdc/keycapturewidget.ui index f08c9e7a..43af98f4 100644 --- a/krdc/keycapturewidget.ui +++ b/krdc/keycapturewidget.ui @@ -26,7 +26,7 @@ <property name="text"> <string>Enter a special key or key combination to send to the remote side:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -91,7 +91,7 @@ <property name="text"> <string>This function allows you to send a key combination like Ctrl+Alt+Del to the remote side. Press Esc to cancel.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index 1670b581..b773d7f0 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -161,7 +161,7 @@ bool KRDC::start() } } - setCaption(i18n("%1 - Remote Desktop Connection").tqarg(serverHost)); + setCaption(i18n("%1 - Remote Desktop Connection").arg(serverHost)); m_scrollView = new TQScrollView2(this, "remote scrollview"); m_scrollView->setFrameStyle(TQFrame::NoFrame); @@ -340,15 +340,15 @@ bool KRDC::parseHost(TQString &str, Protocol &prot, TQString &serverHost, int &s if (url.port()) { if (url.hasUser()) - str = TQString("%1@%2:%3").tqarg(userName).tqarg(serverHost).tqarg(url.port()); + str = TQString("%1@%2:%3").arg(userName).arg(serverHost).arg(url.port()); else - str = TQString("%1:%2").tqarg(serverHost).tqarg(url.port()); + str = TQString("%1:%2").arg(serverHost).arg(url.port()); } else { if (url.hasUser()) - str = TQString("%1@%2").tqarg(userName).tqarg(serverHost); + str = TQString("%1@%2").arg(userName).arg(serverHost); else - str = TQString("%1").tqarg(serverHost); + str = TQString("%1").arg(serverHost); } return true; } diff --git a/krdc/main.cpp b/krdc/main.cpp index 95657483..6d80d741 100644 --- a/krdc/main.cpp +++ b/krdc/main.cpp @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) TQString passwordFile = args->getOption("password-file"); TQFile f(passwordFile); if (!f.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("The password file '%1' does not exist.").tqarg(passwordFile)); + KMessageBox::error(0, i18n("The password file '%1' does not exist.").arg(passwordFile)); return 1; } password = TQTextStream(&f).readLine(); @@ -149,7 +149,7 @@ int main(int argc, char *argv[]) if (!is.isNull()) { TQRegExp re("([0-9]+)[xX]([0-9]+)"); if (!re.exactMatch(is)) - args->usage(i18n("Wrong tqgeometry format, must be widthXheight")); + args->usage(i18n("Wrong geometry format, must be widthXheight")); initialWindowSize = TQSize(re.cap(1).toInt(), re.cap(2).toInt()); } diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp index df4d687b..09b0de52 100644 --- a/krdc/maindialogwidget.cpp +++ b/krdc/maindialogwidget.cpp @@ -56,7 +56,7 @@ class UrlListViewItem : public KListViewItem if ( !desc.isNull() ) setText( 0, desc ); if ( ( !userid.isEmpty() ) && ( !fullname.isEmpty() ) ) - setText( 0, TQString( "%1 (%2)" ).tqarg( fullname ).tqarg( userid ) ); + setText( 0, TQString( "%1 (%2)" ).arg( fullname ).arg( userid ) ); else if ( !userid.isNull() ) setText( 0, userid ); else if ( !fullname.isNull() ) diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index 672b7b00..b91e42b1 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -169,7 +169,7 @@ bool KRdpView::editPreferences( HostPrefPtr host ) // show preferences dialog KDialogBase *dlg = new KDialogBase( 0L, "dlg", true, - i18n( "RDP Host Preferences for %1" ).tqarg( host->host() ), + i18n( "RDP Host Preferences for %1" ).arg( host->host() ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ); TQVBox *vbox = dlg->makeVBoxMainWidget(); diff --git a/krdc/rdp/rdphostpref.cpp b/krdc/rdp/rdphostpref.cpp index 00ce88d7..4f677aaf 100644 --- a/krdc/rdp/rdphostpref.cpp +++ b/krdc/rdp/rdphostpref.cpp @@ -110,8 +110,8 @@ void RdpHostPref::setDefaults() TQString RdpHostPref::prefDescription() const { return i18n("Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, KWallet: %6") - .tqarg(m_askOnConnect ? i18n("yes") : i18n("no")).tqarg(m_width).tqarg(m_height) - .tqarg(m_colorDepth).tqarg(m_layout).tqarg(m_useKWallet ? i18n("yes") : i18n("no")); + .arg(m_askOnConnect ? i18n("yes") : i18n("no")).arg(m_width).arg(m_height) + .arg(m_colorDepth).arg(m_layout).arg(m_useKWallet ? i18n("yes") : i18n("no")); } void RdpHostPref::setWidth(int w) diff --git a/krdc/rdp/rdpprefs.ui b/krdc/rdp/rdpprefs.ui index 46f791a0..e22908c6 100644 --- a/krdc/rdp/rdpprefs.ui +++ b/krdc/rdp/rdpprefs.ui @@ -124,7 +124,7 @@ <property name="text"> <string>H&eight:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -422,7 +422,7 @@ <property name="text"> <string>&Width:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/krdc/smartptr.h b/krdc/smartptr.h index 53cbfeea..49fa25c2 100644 --- a/krdc/smartptr.h +++ b/krdc/smartptr.h @@ -425,7 +425,7 @@ public: rcrcount = rc->refsToThis; } return TQString("SmartPtr: ptr=%1, refcounts=%2, ptrnum=%3") - .tqarg((int)ptr).tqarg(objrcount).tqarg(rcrcount); + .arg((int)ptr).arg(objrcount).arg(rcrcount); } }; diff --git a/krdc/vnc/desktop.c b/krdc/vnc/desktop.c index 003a7160..73b2e423 100644 --- a/krdc/vnc/desktop.c +++ b/krdc/vnc/desktop.c @@ -626,7 +626,7 @@ void SyncScreenRegionX11Thread(int x, int y, int width, int height) { } /* - * ToplevelInitBeforeRealization sets the title, tqgeometry and other resources + * ToplevelInitBeforeRealization sets the title, geometry and other resources * on the toplevel window. */ diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index eabadc7d..a5e42061 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -236,7 +236,7 @@ bool KVncView::editPreferences( HostPrefPtr host ) // show preferences dialog KDialogBase *dlg = new KDialogBase( 0L, "dlg", true, - i18n( "VNC Host Preferences for %1" ).tqarg( host->host() ), + i18n( "VNC Host Preferences for %1" ).arg( host->host() ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ); TQVBox *vbox = dlg->makeVBoxMainWidget(); diff --git a/krdc/vnc/rfbproto.c b/krdc/vnc/rfbproto.c index 22909533..8424e6ac 100644 --- a/krdc/vnc/rfbproto.c +++ b/krdc/vnc/rfbproto.c @@ -734,7 +734,7 @@ static void *MakeSoftCursor(int bpp, int cursorWidth, int cursorHeight, /********************************************************************* - * HandleCursorShape(). Support for XCursor and RichCursor tqshape + * HandleCursorShape(). Support for XCursor and RichCursor shape * updates. We emulate cursor operating on the frame buffer (that is * why we call it "software cursor"). ********************************************************************/ diff --git a/krdc/vnc/rfbproto.h b/krdc/vnc/rfbproto.h index 1b5fd839..f08fe66a 100644 --- a/krdc/vnc/rfbproto.h +++ b/krdc/vnc/rfbproto.h @@ -27,7 +27,7 @@ * * All multiple byte integers are in big endian (network) order (most * significant byte first). Unless noted otherwise there is no special - * tqalignment of protocol structures. + * alignment of protocol structures. * * * Once the initial handshaking is done, all messages start with a type byte, @@ -54,7 +54,7 @@ /*----------------------------------------------------------------------------- * Structure used to specify a rectangle. This structure is a multiple of 4 * bytes so that it can be interspersed with 32-bit pixel data without - * affecting tqalignment. + * affecting alignment. */ typedef struct { @@ -299,7 +299,7 @@ typedef struct { /* * Special encoding numbers: * 0xFFFFFF00 .. 0xFFFFFF0F -- encoding-specific compression levels; - * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor tqshape data; + * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor shape data; * 0xFFFFFF20 .. 0xFFFFFF2F -- various protocol extensions; * 0xFFFFFF30 .. 0xFFFFFFDF -- not allocated yet; * 0xFFFFFFE0 .. 0xFFFFFFEF -- quality level for JPEG compressor; @@ -350,7 +350,7 @@ typedef struct { * This message consists of a header giving the number of rectangles of pixel * data followed by the rectangles themselves. The header is padded so that * together with the type byte it is an exact multiple of 4 bytes (to help - * with tqalignment of 32-bit pixels): + * with alignment of 32-bit pixels): */ typedef struct { @@ -633,7 +633,7 @@ typedef struct { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * XCursor encoding. This is a special encoding used to transmit X-style - * cursor tqshapes from server to clients. Note that for this encoding, + * cursor shapes from server to clients. Note that for this encoding, * coordinates in rfbFramebufferUpdateRectHeader structure hold hotspot * position (r.x, r.y) and cursor size (r.w, r.h). If (w * h != 0), two RGB * samples are sent after header in the rfbXCursorColors structure. They @@ -664,7 +664,7 @@ typedef struct { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * RichCursor encoding. This is a special encoding used to transmit cursor - * tqshapes from server to clients. It is similar to the XCursor encoding but + * shapes from server to clients. It is similar to the XCursor encoding but * uses client pixel format instead of two RGB colors to represent cursor * image. For this encoding, coordinates in rfbFramebufferUpdateRectHeader * structure hold hotspot position (r.x, r.y) and cursor size (r.w, r.h). diff --git a/krdc/vnc/threads.cpp b/krdc/vnc/threads.cpp index ebd02c8e..097e1367 100644 --- a/krdc/vnc/threads.cpp +++ b/krdc/vnc/threads.cpp @@ -185,7 +185,7 @@ bool WriterThread::sendIncrementalUpdateRequest() { } bool WriterThread::sendUpdateRequest(const TQRegion ®ion) { - TQMemArray<TQRect> r = region.tqrects(); + TQMemArray<TQRect> r = region.rects(); for (unsigned int i = 0; i < r.size(); i++) if (!SendFramebufferUpdateRequest(r[i].x(), r[i].y(), diff --git a/krdc/vnc/vnchostpref.cpp b/krdc/vnc/vnchostpref.cpp index 3ae6ed92..7fea2889 100644 --- a/krdc/vnc/vnchostpref.cpp +++ b/krdc/vnc/vnchostpref.cpp @@ -96,7 +96,7 @@ TQString VncHostPref::prefDescription() const { Q_ASSERT(true); } return i18n("Show Preferences: %1, Quality: %2, KWallet: %3") - .tqarg(m_askOnConnect ? i18n("yes") : i18n("no")).tqarg(q).tqarg(m_useKWallet ? i18n("yes") : i18n("no")); + .arg(m_askOnConnect ? i18n("yes") : i18n("no")).arg(q).arg(m_useKWallet ? i18n("yes") : i18n("no")); } void VncHostPref::setQuality(int q) { diff --git a/krfb/kcm_krfb/configurationwidget.ui b/krfb/kcm_krfb/configurationwidget.ui index f4e79d39..0eb11995 100644 --- a/krfb/kcm_krfb/configurationwidget.ui +++ b/krfb/kcm_krfb/configurationwidget.ui @@ -53,7 +53,7 @@ <property name="title"> <string>Invitations</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> <vbox> diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp index 688b674b..50595505 100644 --- a/krfb/kcm_krfb/kcm_krfb.cpp +++ b/krfb/kcm_krfb/kcm_krfb.cpp @@ -97,7 +97,7 @@ void KcmKRfb::setInvitationNum(int num) { if (num == 0) m_confWidget->invitationNumLabel->setText(i18n("You have no open invitation.")); else - m_confWidget->invitationNumLabel->setText(i18n("Open invitations: %1").tqarg(num)); + m_confWidget->invitationNumLabel->setText(i18n("Open invitations: %1").arg(num)); } void KcmKRfb::checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) { diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp index e0d37f61..2aa7a0cd 100644 --- a/krfb/kinetd/kinetd.cpp +++ b/krfb/kinetd/kinetd.cpp @@ -210,7 +210,7 @@ void PortListener::accepted(KSocket *sock) { } KExtendedSocket::resolve(ksa, host, port); KNotifyClient::event("IncomingConnection", - i18n("Connection from %1").tqarg(host)); + i18n("Connection from %1").arg(host)); delete ksa; if ((!m_enabled) || @@ -226,9 +226,9 @@ void PortListener::accepted(KSocket *sock) { m_process << m_execPath << m_argument << TQString::number(sock->socket()); if (!m_process.start(KProcess::DontCare)) { KNotifyClient::event("ProcessFailed", - i18n("Call \"%1 %2 %3\" failed").tqarg(m_execPath) - .tqarg(m_argument) - .tqarg(sock->socket())); + i18n("Call \"%1 %2 %3\" failed").arg(m_execPath) + .arg(m_argument) + .arg(sock->socket())); } delete sock; diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc index efab5974..bf0e31a7 100644 --- a/krfb/krfb/configuration.cc +++ b/krfb/krfb/configuration.cc @@ -453,15 +453,15 @@ void Configuration::inviteEmail() { " http://%7:%8/\n" "\n" "For security reasons this invitation will expire at %9.") - .tqarg(inv.password()) - .tqarg(hostname()) - .tqarg(port()) - .tqarg(hostname()) - .tqarg(port()) - .tqarg(inv.password()) - .tqarg(hostname()) - .tqarg(5800) // determine with dcop ... later ... - .tqarg(KGlobal::locale()->formatDateTime(inv.expirationTime()))); + .arg(inv.password()) + .arg(hostname()) + .arg(port()) + .arg(hostname()) + .arg(port()) + .arg(inv.password()) + .arg(hostname()) + .arg(5800) // determine with dcop ... later ... + .arg(KGlobal::locale()->formatDateTime(inv.expirationTime()))); } ////////////// invoke kcontrol module ////////////////////////// diff --git a/krfb/krfb/connectionwidget.ui b/krfb/krfb/connectionwidget.ui index e5378cbe..db280527 100644 --- a/krfb/krfb/connectionwidget.ui +++ b/krfb/krfb/connectionwidget.ui @@ -71,7 +71,7 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="indent"> diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cc index ce7e19d8..8cb51ca2 100644 --- a/krfb/krfb/invitation.cc +++ b/krfb/krfb/invitation.cc @@ -71,9 +71,9 @@ Invitation::Invitation(const Invitation &x) : } Invitation::Invitation(KConfig* config, int num) { - m_password = cryptStr(config->readEntry(TQString("password%1").tqarg(num), "")); - m_creationTime = config->readDateTimeEntry(TQString("creation%1").tqarg(num)); - m_expirationTime = config->readDateTimeEntry(TQString("expiration%1").tqarg(num)); + m_password = cryptStr(config->readEntry(TQString("password%1").arg(num), "")); + m_creationTime = config->readDateTimeEntry(TQString("creation%1").arg(num)); + m_expirationTime = config->readDateTimeEntry(TQString("expiration%1").arg(num)); m_viewItem = 0; } @@ -93,9 +93,9 @@ Invitation &Invitation::operator= (const Invitation&x) { } void Invitation::save(KConfig *config, int num) const { - config->writeEntry(TQString("password%1").tqarg(num), cryptStr(m_password)); - config->writeEntry(TQString("creation%1").tqarg(num), m_creationTime); - config->writeEntry(TQString("expiration%1").tqarg(num), m_expirationTime); + config->writeEntry(TQString("password%1").arg(num), cryptStr(m_password)); + config->writeEntry(TQString("creation%1").arg(num), m_creationTime); + config->writeEntry(TQString("expiration%1").arg(num), m_expirationTime); } TQString Invitation::password() const { diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cc index 73d55b75..f3b202a9 100644 --- a/krfb/krfb/invitedialog.cc +++ b/krfb/krfb/invitedialog.cc @@ -59,7 +59,7 @@ void InviteDialog::enableInviteButton( bool enable ) void InviteDialog::setInviteCount( int count ) { m_inviteWidget->btnManageInvite->setText( - i18n( "&Manage Invitations (%1)..." ).tqarg( count ) ); + i18n( "&Manage Invitations (%1)..." ).arg( count ) ); } #include "invitedialog.moc" diff --git a/krfb/krfb/invitewidget.ui b/krfb/krfb/invitewidget.ui index e60ee6c8..589f929c 100644 --- a/krfb/krfb/invitewidget.ui +++ b/krfb/krfb/invitewidget.ui @@ -80,7 +80,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cc index 245e0069..a5664bcb 100644 --- a/krfb/krfb/personalinvitedialog.cc +++ b/krfb/krfb/personalinvitedialog.cc @@ -40,7 +40,7 @@ PersonalInviteDialog::PersonalInviteDialog( TQWidget *parent, const char *name ) void PersonalInviteDialog::setHost( const TQString &host, uint port ) { m_inviteWidget->hostLabel->setText( TQString( "%1:%2" ) - .tqarg( host ).tqarg( port ) ); + .arg( host ).arg( port ) ); } void PersonalInviteDialog::setPassword( const TQString &passwd ) diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc index 81c00da7..411d3098 100644 --- a/krfb/krfb/rfbcontroller.cc +++ b/krfb/krfb/rfbcontroller.cc @@ -373,7 +373,7 @@ RFBController::RFBController(Configuration *c) : if (gethostname(hostname, 255)) hostname[0] = 0; hostname[255] = 0; - desktopName = i18n("%1@%2 (shared desktop)").tqarg(KUser().loginName()).tqarg(hostname); + desktopName = i18n("%1@%2 (shared desktop)").arg(KUser().loginName()).arg(hostname); } RFBController::~RFBController() @@ -508,7 +508,7 @@ void RFBController::acceptConnection(bool aRemoteControl) { KNotifyClient::event("UserAcceptsConnection", i18n("User accepts connection from %1") - .tqarg(remoteIp)); + .arg(remoteIp)); if (state != RFB_CONNECTING) return; @@ -521,7 +521,7 @@ void RFBController::refuseConnection() { KNotifyClient::event("UserRefusesConnection", i18n("User refuses connection from %1") - .tqarg(remoteIp)); + .arg(remoteIp)); if (state != RFB_CONNECTING) return; @@ -569,7 +569,7 @@ void RFBController::connectionClosed() { KNotifyClient::event("ConnectionClosed", i18n("Closed connection: %1.") - .tqarg(remoteIp)); + .arg(remoteIp)); idleTimer.stop(); initIdleTimer.stop(); @@ -698,12 +698,12 @@ bool RFBController::handleCheckPassword(rfbClientPtr cl, if (configuration->invitations().size() > 0) { sendKNotifyEvent("InvalidPasswordInvitations", i18n("Failed login attempt from %1: wrong password") - .tqarg(remoteIp)); + .arg(remoteIp)); } else sendKNotifyEvent("InvalidPassword", i18n("Failed login attempt from %1: wrong password") - .tqarg(remoteIp)); + .arg(remoteIp)); return FALSE; } @@ -739,7 +739,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl) if (state != RFB_WAITING) { sendKNotifyEvent("TooManyConnections", i18n("Connection refused from %1, already connected.") - .tqarg(host)); + .arg(host)); return RFB_CLIENT_REFUSE; } remoteIp = host; @@ -749,7 +749,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl) (configuration->invitations().size() == 0)) { sendKNotifyEvent("NewConnectionAutoAccepted", i18n("Accepted uninvited connection from %1") - .tqarg(remoteIp)); + .arg(remoteIp)); connectionAccepted(configuration->allowDesktopControl()); return RFB_CLIENT_ACCEPT; @@ -757,7 +757,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl) sendKNotifyEvent("NewConnectionOnHold", i18n("Received connection from %1, on hold (waiting for confirmation)") - .tqarg(remoteIp)); + .arg(remoteIp)); dialog.setRemoteHost(remoteIp); dialog.setAllowRemoteControl( true ); diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index 5878b633..14c94bc2 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -101,7 +101,7 @@ void TrayIcon::showConnectedMessage(TQString host) { i18n("The remote user has been authenticated and is now connected."), trayIconOpen, this); - TQToolTip::add(this, i18n("Desktop Sharing - connected with %1").tqarg(host)); + TQToolTip::add(this, i18n("Desktop Sharing - connected with %1").arg(host)); } void TrayIcon::showDisconnectedMessage() { diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c index ebbaedee..a27a2fef 100644 --- a/krfb/libvncserver/cursor.c +++ b/krfb/libvncserver/cursor.c @@ -1,5 +1,5 @@ /* - * cursor.c - support for cursor tqshape updates. + * cursor.c - support for cursor shape updates. */ /* @@ -25,7 +25,7 @@ #include "rfb.h" /* - * Send cursor tqshape either in X-style format or in client pixel format. + * Send cursor shape either in X-style format or in client pixel format. */ Bool diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h index 9e097f59..e8dbfb65 100644 --- a/krfb/libvncserver/rfb.h +++ b/krfb/libvncserver/rfb.h @@ -535,10 +535,10 @@ typedef struct _rfbClientRec { Bool enableLastRectEncoding; /* client supports LastRect encoding */ Bool enableSoftCursorUpdates; /* client supports softcursor updates */ Bool disableBackground; /* client wants to disable background */ - Bool enableCursorShapeUpdates; /* client supports cursor tqshape updates */ + Bool enableCursorShapeUpdates; /* client supports cursor shape updates */ Bool useRichCursorEncoding; /* rfbEncodingRichCursor is preferred */ - Bool cursorWasChanged; /* cursor tqshape update should be sent */ - Bool cursorWasMoved; /* cursor move tqshape update should be sent */ + Bool cursorWasChanged; /* cursor shape update should be sent */ + Bool cursorWasMoved; /* cursor move shape update should be sent */ #ifdef BACKCHANNEL Bool enableBackChannel; #endif diff --git a/krfb/libvncserver/rfbproto.h b/krfb/libvncserver/rfbproto.h index e511006e..cd619dff 100644 --- a/krfb/libvncserver/rfbproto.h +++ b/krfb/libvncserver/rfbproto.h @@ -30,7 +30,7 @@ * * All multiple byte integers are in big endian (network) order (most * significant byte first). Unless noted otherwise there is no special - * tqalignment of protocol structures. + * alignment of protocol structures. * * * Once the initial handshaking is done, all messages start with a type byte, @@ -56,7 +56,7 @@ /*----------------------------------------------------------------------------- * Structure used to specify a rectangle. This structure is a multiple of 4 * bytes so that it can be interspersed with 32-bit pixel data without - * affecting tqalignment. + * affecting alignment. */ typedef struct { @@ -306,7 +306,7 @@ typedef struct { /* * Special encoding numbers: * 0xFFFFFF00 .. 0xFFFFFF0F -- encoding-specific compression levels; - * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor tqshape data; + * 0xFFFFFF10 .. 0xFFFFFF1F -- mouse cursor shape data; * 0xFFFFFF20 .. 0xFFFFFF2F -- various protocol extensions; * 0xFFFFFF30 .. 0xFFFFFFDF -- not allocated yet; * 0xFFFFFFE0 .. 0xFFFFFFEF -- quality level for JPEG compressor; @@ -356,7 +356,7 @@ typedef struct { * This message consists of a header giving the number of rectangles of pixel * data followed by the rectangles themselves. The header is padded so that * together with the type byte it is an exact multiple of 4 bytes (to help - * with tqalignment of 32-bit pixels): + * with alignment of 32-bit pixels): */ typedef struct { @@ -517,7 +517,7 @@ typedef struct { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * XCursor encoding. This is a special encoding used to transmit X-style - * cursor tqshapes from server to clients. Note that for this encoding, + * cursor shapes from server to clients. Note that for this encoding, * coordinates in rfbFramebufferUpdateRectHeader structure hold hotspot * position (r.x, r.y) and cursor size (r.w, r.h). If (w * h != 0), two RGB * samples are sent after header in the rfbXCursorColors structure. They @@ -548,7 +548,7 @@ typedef struct { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * RichCursor encoding. This is a special encoding used to transmit cursor - * tqshapes from server to clients. It is similar to the XCursor encoding but + * shapes from server to clients. It is similar to the XCursor encoding but * uses client pixel format instead of two RGB colors to represent cursor * image. For this encoding, coordinates in rfbFramebufferUpdateRectHeader * structure hold hotspot position (r.x, r.y) and cursor size (r.w, r.h). diff --git a/krfb/libvncserver/rfbserver.c b/krfb/libvncserver/rfbserver.c index 493f22c9..66cc4ee3 100644 --- a/krfb/libvncserver/rfbserver.c +++ b/krfb/libvncserver/rfbserver.c @@ -966,7 +966,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion) cl->screen->displayHook(cl); /* - * If this client understands cursor tqshape updates, cursor should be + * If this client understands cursor shape updates, cursor should be * removed from the framebuffer. Otherwise, make sure it's put up. */ diff --git a/krfb/libvncserver/stats.c b/krfb/libvncserver/stats.c index 86934011..954e6d14 100644 --- a/krfb/libvncserver/stats.c +++ b/krfb/libvncserver/stats.c @@ -82,7 +82,7 @@ rfbPrintStats(rfbClientPtr cl) cl->rfbLastRectMarkersSent, cl->rfbLastRectBytesSent); if (cl->rfbCursorUpdatesSent != 0) - rfbLog(" cursor tqshape updates %d, bytes %d\n", + rfbLog(" cursor shape updates %d, bytes %d\n", cl->rfbCursorUpdatesSent, cl->rfbCursorBytesSent); for (i = 0; i < MAX_ENCODINGS; i++) { diff --git a/krfb/libvncserver/zlib.c b/krfb/libvncserver/zlib.c index d1b300b0..5661d265 100644 --- a/krfb/libvncserver/zlib.c +++ b/krfb/libvncserver/zlib.c @@ -89,7 +89,7 @@ rfbSendOneRectEncodingZlib(cl, x, y, w, h) int result; /* The translation function (used also by the in raw encoding) - * requires 4/2/1 byte tqalignment in the output buffer (which is + * requires 4/2/1 byte alignment in the output buffer (which is * updateBuf for the raw encoding) based on the bitsPerPixel of * the viewer/client. This prevents SIGBUS errors on some * architectures like SPARC, PARISC... diff --git a/krfb/srvloc/kserviceregistry.cpp b/krfb/srvloc/kserviceregistry.cpp index eac3ac18..1dd57881 100644 --- a/krfb/srvloc/kserviceregistry.cpp +++ b/krfb/srvloc/kserviceregistry.cpp @@ -119,7 +119,7 @@ bool KServiceRegistry::registerService(const TQString &serviceURL, while (it != attributes.end()) { if (!s.isEmpty()) s += ","; - s += TQString("(%1=%2)").tqarg(it.key()).tqarg(it.data()); + s += TQString("(%1=%2)").arg(it.key()).arg(it.data()); it++; } return registerService(serviceURL, s, lifetime); diff --git a/krfb/srvloc/kserviceregistry.h b/krfb/srvloc/kserviceregistry.h index 05e88780..ad2c0b1a 100644 --- a/krfb/srvloc/kserviceregistry.h +++ b/krfb/srvloc/kserviceregistry.h @@ -78,7 +78,7 @@ class KServiceRegistryPrivate; * <pre> * KServiceRegistry ksr; * KInetAddress kia = KInetAddress->getLocalAddress(); - * ksr.registerService(TQString("service:remotedesktop.kde:vnc://%1:0").tqarg(kia->nodeName()), + * ksr.registerService(TQString("service:remotedesktop.kde:vnc://%1:0").arg(kia->nodeName()), * "(type=shared)"); * delete kia; * </pre> diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp index 76a6a2ef..76fd1190 100644 --- a/ksirc/FilterRuleEditor.cpp +++ b/ksirc/FilterRuleEditor.cpp @@ -132,7 +132,7 @@ void FilterRuleEditor::updateListBox(int citem ) } if(filter->RuleList->count() > 0) filter->RuleList->setCurrentItem(citem); - filter->RuleList->tqrepaint(); + filter->RuleList->repaint(); filter->DeleteButton->setEnabled( filter->RuleList->currentItem() > -1 ); filter->ModifyButton->setEnabled( filter->RuleList->currentItem() > -1 ); diff --git a/ksirc/KSOpenkSirc/open_ksircData.ui b/ksirc/KSOpenkSirc/open_ksircData.ui index b3dcc2da..24dcccd7 100644 --- a/ksirc/KSOpenkSirc/open_ksircData.ui +++ b/ksirc/KSOpenkSirc/open_ksircData.ui @@ -134,7 +134,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp index 49920e42..1b311682 100644 --- a/ksirc/KSPrefs/page_autoconnect.cpp +++ b/ksirc/KSPrefs/page_autoconnect.cpp @@ -59,7 +59,7 @@ void PageAutoConnect::saveConfig() if(it->text(SSL).length() > 0) server += " (SSL)"; if(it->text(PASS).length() > 0) - server += TQString(" (pass: %1)").tqarg(it->text(PASS)); + server += TQString(" (pass: %1)").arg(it->text(PASS)); servers << server; @@ -73,7 +73,7 @@ void PageAutoConnect::saveConfig() channel = ch->text(NAME); if(ch->text(PK).length() > 0) - channel += TQString(" (key: %1)").tqarg(ch->text(PK)); + channel += TQString(" (key: %1)").arg(ch->text(PK)); channels << channel; @@ -183,7 +183,7 @@ void PageAutoConnect::add_pressed() } parent->setText(NAME, ServerLE->text()); - parent->setText(PK, TQString("%1").tqarg(PortKI->value())); + parent->setText(PK, TQString("%1").arg(PortKI->value())); parent->setText(PASS, PassLE->text()); if(sslCB->isChecked()) parent->setText(SSL, i18n("SSL")); diff --git a/ksirc/KSPrefs/page_looknfeelbase.ui b/ksirc/KSPrefs/page_looknfeelbase.ui index a691708f..5b366680 100644 --- a/ksirc/KSPrefs/page_looknfeelbase.ui +++ b/ksirc/KSPrefs/page_looknfeelbase.ui @@ -106,7 +106,7 @@ <property name="text"> <string>Choose your favorite window mode:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="vAlign" stdset="0"> diff --git a/ksirc/KSPrefs/page_rmbmenubase.ui b/ksirc/KSPrefs/page_rmbmenubase.ui index b4234c4b..1073d179 100644 --- a/ksirc/KSPrefs/page_rmbmenubase.ui +++ b/ksirc/KSPrefs/page_rmbmenubase.ui @@ -41,7 +41,7 @@ <property name="text"> <string>This page allows configuration of the RMB Menu for the nicklist located on the right. You can define names for certain actions. Look at the predefined commands to learn how it works.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index 7394d3fb..7b3f793a 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -110,7 +110,7 @@ void KSTicker::show() if(currentStr.length() != 0) startTicker(); currentChar = 0; - tqrepaint(TRUE); + repaint(TRUE); } void KSTicker::hide() @@ -129,7 +129,7 @@ void KSTicker::setString(TQString str) { strlist.clear(); strlist.append(str); - tqrepaint(TRUE); + repaint(TRUE); startTicker(); } @@ -138,7 +138,7 @@ void KSTicker::mergeString(TQString str, TQColor c) int num = KSPainter::colour2num(c); if(num != -1){ - str.prepend(TQString("~%1").tqarg(num)); + str.prepend(TQString("~%1").arg(num)); } mergeString(str); @@ -150,7 +150,7 @@ void KSTicker::mergeString(TQString str) if(rx.search(str) >= 0){ int value = nickColourMaker::colourMaker()->findIdx(rx.cap(1)); if(value >= 0){ - TQString newText = TQString("~%1\\1~c").tqarg(value); + TQString newText = TQString("~%1\\1~c").arg(value); str.replace(rx, newText); } } diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index 5477cf5a..3dd44896 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -102,13 +102,13 @@ void aHistLineEdit::slotMaybeResize() if(text().length() > IRC_SAFE_MAX_LINE){ if(m_drawrect == false){ m_drawrect = true; - tqrepaint(); + repaint(); } } else { if(m_drawrect == true){ m_drawrect = false; - tqrepaint(); + repaint(); } } @@ -133,7 +133,7 @@ void aHistLineEdit::slotMaybeResize() setFixedHeight( h ); TQLayout *l = topLevelWidget()->tqlayout(); if(l){ - l->tqinvalidate(); + l->invalidate(); l->activate(); } emit resized(); diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp index b79ba1e2..26b09ffd 100644 --- a/ksirc/chanButtons.cpp +++ b/ksirc/chanButtons.cpp @@ -93,7 +93,7 @@ void chanButtons::limited() } else { Popupmenu->setItemChecked(toggleMenu[1], true); - emit mode(TQString("+l %1").tqarg(chanDialog->sendLimitedUsers()), 0); + emit mode(TQString("+l %1").arg(chanDialog->sendLimitedUsers()), 0); } delete chanDialog; } @@ -104,12 +104,12 @@ void chanButtons::key() if (Popupmenu->isItemChecked(toggleMenu[2])) { chanDialog->exec(); Popupmenu->setItemChecked(toggleMenu[2], false); - emit mode(TQString("-k %1").tqarg(chanDialog->sendKey()), 0); + emit mode(TQString("-k %1").arg(chanDialog->sendKey()), 0); } else { chanDialog->exec(); Popupmenu->setItemChecked(toggleMenu[2], true); - emit mode(TQString("+k %1").tqarg(chanDialog->sendKey()), 0); + emit mode(TQString("+k %1").arg(chanDialog->sendKey()), 0); } delete chanDialog; } diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index a297dc95..6392721f 100644 --- a/ksirc/chanparser.cpp +++ b/ksirc/chanparser.cpp @@ -118,7 +118,7 @@ parseResult * ChannelParser::parseSSFEClear(TQString string) { // top->mainw->clear(); top->clearWindow(); -// top->mainw->tqrepaint(TRUE); +// top->mainw->repaint(TRUE); string.truncate(0); return new parseSucc(TQString()); // Null string, don't display anything } @@ -159,7 +159,7 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string) if ( nickItem ) { if(nickItem->away() != away){ nickItem->setAway( away ); - top->nicks->viewport()->tqrepaint( top->nicks->itemRect( nickItem ), false ); + top->nicks->viewport()->repaint( top->nicks->itemRect( nickItem ), false ); } nickItem->forceColour(&ksopts->ownNickColor); } @@ -191,7 +191,7 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string) top->channelButtons->setMenuItemMode(6, true); else top->channelButtons->setMenuItemMode(6, false); - TQString status_line = TQString("%1 (%2) %3 (%4) ").tqarg(chan).tqarg(chanmode).tqarg(nick).tqarg(modes); + TQString status_line = TQString("%1 (%2) %3 (%4) ").arg(chan).arg(chanmode).arg(nick).arg(modes); /* * Go srearching for key and limit messages @@ -199,7 +199,7 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string) TQRegExp rxKey("<key: (\\S+)>"); if(rxKey.search(string) >= 0){ top->channelButtons->setMenuItemMode(2, true); - status_line += TQString("<key: %1>").tqarg(rxKey.cap(1)); + status_line += TQString("<key: %1>").arg(rxKey.cap(1)); } else { top->channelButtons->setMenuItemMode(2, false); @@ -208,7 +208,7 @@ parseResult * ChannelParser::parseSSFEStatus(TQString string) TQRegExp rxLimit("<limit: (\\S+)>"); if(rxLimit.search(string) >= 0){ top->channelButtons->setMenuItemMode(1, true); - status_line += TQString("<limit: %1>").tqarg(rxLimit.cap(1)); + status_line += TQString("<limit: %1>").arg(rxLimit.cap(1)); } else { top->channelButtons->setMenuItemMode(1, false); @@ -367,7 +367,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) if(current_item > 0) top->nicks->setCurrentItem(current_item); top->nicks->setTopItem(top_item); - top->nicks->tqrepaint(TRUE); + top->nicks->repaint(TRUE); return new parseSucc(TQString()); // Parsing ok, don't print anything though } else if(string[1] == '$'){ @@ -540,7 +540,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) return new parseWrongChannel(string, ksopts->errorColor, "user|kick"); if (ksopts->autoRejoin == TRUE) { - TQString str = TQString("/join %1\n").tqarg(top->channelInfo().channel()); + TQString str = TQString("/join %1\n").arg(top->channelInfo().channel()); emit top->outputUnicodeLine(str); /* if(top->ticker) top->ticker->show(); @@ -555,7 +555,7 @@ parseResult * ChannelParser::parseINFOPart(TQString string) int result = KMessageBox::questionYesNo(top, string, i18n("You Have Been Kicked"), i18n("Rejoin"), i18n("Leave")); if (result == KMessageBox::Yes) { - TQString str = TQString("/join %1\n").tqarg(top->channelInfo().channel()); + TQString str = TQString("/join %1\n").arg(top->channelInfo().channel()); emit top->outputUnicodeLine(str); /* if(top->ticker) * top->ticker->show(); @@ -642,7 +642,7 @@ parseResult * ChannelParser::parseINFOChangeNick(TQString string) return new parseSucc(" " + string, ksopts->errorColor, "user|error"); } - return new parseError(i18n("Unable to parse: %1").tqarg(string), i18n("Unable to parse change nick code")); + return new parseError(i18n("Unable to parse: %1").arg(string), i18n("Unable to parse change nick code")); } old_nick = rx.cap(1); @@ -678,7 +678,7 @@ parseResult * ChannelParser::parseINFOChangeNick(TQString string) top->changeCompleteNick(old_nick, new_nick); top->nicks->setCurrentItem(selection); - top->nicks->tqrepaint(TRUE); + top->nicks->repaint(TRUE); // We're done, so let's finish up return new parseSucc(" " + string, ksopts->channelColor, "user|join"); } @@ -801,7 +801,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) pmList.setAutoDelete(true); for(uint pos = 0; pos < modes.length(); pos++){ - switch(modes.tqat(pos).tqunicode()){ + switch(modes.at(pos).tqunicode()){ case '+': op = true; break; @@ -822,7 +822,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) case 'b': // Ban, arg is mask banned case 'k': // kcik, arg is nick if(ai == NULL) - return new parseError(i18n("Unable to parse mode change: %1").tqarg(string), TQString()); + return new parseError(i18n("Unable to parse mode change: %1").arg(string), TQString()); pmList.append(new mode_info(op, modes.at(pos), *ai)); ai++; break; @@ -878,7 +878,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) irc->setOp(mi->op()); // add new nick in sorted pass,with colour top->nicks->inSort(irc); - top->nicks->tqrepaint(TRUE); + top->nicks->repaint(TRUE); } else{ kdDebug(5008) << "Toplevel+o: nick search failed on " << mi->arg() << endl; @@ -922,7 +922,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) irc->setVoice(voice) ; // add new nick in sorted pass,with colour top->nicks->inSort(irc); - top->nicks->tqrepaint(); + top->nicks->repaint(); } } else if(mi->mode() == 'b'){ @@ -1041,7 +1041,7 @@ parseResult * ChannelParser::parseINFOTopic(TQString string) void ChannelParser::highlightNick(TQString &string, TQString &nick) { - TQRegExp rx(TQString("(^|\\s+)%1(\\s+|$)").tqarg(TQRegExp::escape(nick))); + TQRegExp rx(TQString("(^|\\s+)%1(\\s+|$)").arg(TQRegExp::escape(nick))); string.replace(rx, "\\1~n" + nick + "~n\\2"); } diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp index 47763faa..386644b9 100644 --- a/ksirc/dccManager.cpp +++ b/ksirc/dccManager.cpp @@ -38,7 +38,7 @@ dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, con if(m_type == dccChat) setText(COL_SIZE, ""); else - setText(COL_SIZE, TQString("%1").tqarg(size)); + setText(COL_SIZE, TQString("%1").arg(size)); setText(COL_PER, ""); } @@ -56,7 +56,7 @@ dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, setText(COL_WHO, who); setText(COL_STAT, enumToStatus(status)); if(type != dccChat) - setText(COL_SIZE, TQString("%1").tqarg(size)); + setText(COL_SIZE, TQString("%1").arg(size)); setText(COL_PER, ""); } @@ -108,7 +108,7 @@ TQString dccItem::enumToStatus(enum dccStatus status) void dccItem::setWhoPostfix(const TQString &post) { m_post = post; - setText(COL_WHO, TQString("%1 %2").tqarg(m_who).tqarg(post)); + setText(COL_WHO, TQString("%1 %2").arg(m_who).arg(post)); } void dccItem::changeFilename(const TQString &file) { @@ -146,13 +146,13 @@ void dccItem::setReceivedBytes(int bytes) (ctime >= (m_lasttime + 2)) ){ m_lasttime = ctime; - setText(COL_SIZE, TQString("%1/%2").tqarg(bytes).tqarg(m_size)); - setText(COL_PER, TQString("%1%").tqarg(per)); + setText(COL_SIZE, TQString("%1/%2").arg(bytes).arg(m_size)); + setText(COL_PER, TQString("%1%").arg(per)); m_percent = per; if(m_status == dccResumed) m_stime = 0; /* if we are got a resume request don't update CPS, reset it */ else - setText(COL_CPS, TQString("%1").tqarg(1.0*bytes/(time(NULL) - m_stime), 2)); + setText(COL_CPS, TQString("%1").arg(1.0*bytes/(time(NULL) - m_stime), 2)); } diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index 2c5808e8..29e6af54 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -323,7 +323,7 @@ void dockServerController::startBlink(const TQString& reason, const TQString& te if(!reason.isNull()){ TQString br(reason); if(text.isNull() && ksopts->runDocked && ksopts->dockPopups) - KPassivePopup::message(TQString("Notify: %1").tqarg(reason), this); + KPassivePopup::message(TQString("Notify: %1").arg(reason), this); else { TQStringList sl; TQString cutup = text; @@ -338,7 +338,7 @@ void dockServerController::startBlink(const TQString& reason, const TQString& te cutup = sl.join("\n"); cutup.truncate(cutup.length()-1); if(ksopts->runDocked && ksopts->dockPopups) - KPassivePopup::message(TQString("%1").tqarg(reason), cutup, this); + KPassivePopup::message(TQString("%1").arg(reason), cutup, this); } m_blink_reason.append(br); createMainPopup(); diff --git a/ksirc/ioBroadcast.cpp b/ksirc/ioBroadcast.cpp index ef0fa33b..b36e4420 100644 --- a/ksirc/ioBroadcast.cpp +++ b/ksirc/ioBroadcast.cpp @@ -5,7 +5,7 @@ $$Id$$ The IO broadcaster bassed on the ksircmessage receiver takes a - message and send it all ksircmessage tqreceivers, except of course it + message and send it all ksircmessage receivers, except of course it self. It does the same with control_messages. diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp index 52c5dc9a..f994cfa7 100644 --- a/ksirc/ioDCC.cpp +++ b/ksirc/ioDCC.cpp @@ -61,7 +61,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(str.find("DCC GET read:", 0) != -1){ /*fold01*/ TQRegExp rx("read: (.+) who: (.+) bytes: (.*)"); if(rx.search(str)){ - TQString key = TQString("%1/%2").tqarg(rx.cap(1)).tqarg(rx.cap(2)); + TQString key = TQString("%1/%2").arg(rx.cap(1)).arg(rx.cap(2)); uint bytesXfer = rx.cap(3).toUInt(); // @@ -76,7 +76,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) else if(str.find("DCC SEND write:", 0) != -1){ /*fold01*/ TQRegExp rx("write: (.+) who: (.+) bytes: (.*)"); if(rx.search(str)){ - TQString key = TQString("%1/%2").tqarg(rx.cap(1)).tqarg(rx.cap(2)); + TQString key = TQString("%1/%2").arg(rx.cap(1)).arg(rx.cap(2)); uint bytesXfer = rx.cap(3).toUInt(); if(DCCSendItems[key]){ @@ -103,7 +103,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) this, TQT_SLOT(dccRenameDone(dccItem *, TQString, TQString))); it->setWhoPostfix("(" + ip + ")"); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCGetItems[key]){ /* * don't add duplicates, this cuases real headaches @@ -113,11 +113,11 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) dccItem *old = DCCGetItems.take(key); int i; for(i = 0; i <= (int) DCCGetItems.count()+1; i++){ - renamed = TQString("%1 (finished %2)/%3").tqarg(filename).tqarg(i+1).tqarg(old->who()); + renamed = TQString("%1 (finished %2)/%3").arg(filename).arg(i+1).arg(old->who()); if( DCCGetItems[renamed] == 0x0) break; } - old->changeFilename(TQString("%1 (finished %2)").tqarg(filename).tqarg(i+1)); + old->changeFilename(TQString("%1 (finished %2)").arg(filename).arg(i+1)); DCCGetItems.insert(renamed, it); } @@ -139,7 +139,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // setup dcc dialog displayMgr->show(mgr); dccItem *it = mgr->mgr()->newSendItem(filename, who, dccItem::dccSentOffer, fileSize); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCSendItems[key]){ /* * don't add duplicates, this cuases real headaches @@ -151,11 +151,11 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) dccItem *old = DCCSendItems.take(key); int i; for(i = 0; i <= (int) DCCSendItems.count()+1; i++){ - renamed = TQString("%1 (sent %2)/%3").tqarg(filename).tqarg(i+1).tqarg(old->who()); + renamed = TQString("%1 (sent %2)/%3").arg(filename).arg(i+1).arg(old->who()); if( DCCSendItems[renamed] == 0x0) break; } - old->changeFilename(TQString("%1 (sent %2)").tqarg(filename).tqarg(i+1)); + old->changeFilename(TQString("%1 (sent %2)").arg(filename).arg(i+1)); DCCSendItems.insert(renamed, it); } DCCSendItems.insert(key, it); @@ -211,9 +211,9 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } if(error != "OK"){ status = dccItem::dccError; - KPassivePopup::message(i18n("DCC SEND with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC SEND with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr()); } - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCSendItems[key]){ kdDebug(5008) << "SendPercent: " << DCCSendItems[key]->getPercent() << endl; if((status == dccItem::dccDone) && (DCCSendItems[key]->getPercent() < 100)) @@ -233,9 +233,9 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(error != "OK"){ status = dccItem::dccError; - KPassivePopup::message(i18n("DCC GET with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC GET with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr()); } - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCGetItems[key]){ kdDebug(5008) << "GetPercent: " << DCCGetItems[key]->getPercent() << endl; if((status == dccItem::dccDone) && (DCCGetItems[key]->getPercent() < 100)) @@ -252,7 +252,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCGetItems[key]){ dccItem *it = DCCGetItems[key]; kdDebug(5008) << "Got DCC GET resumed message..." << it->file() << endl; @@ -267,7 +267,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCSendItems[key]){ DCCSendItems[key]->changeStatus(dccItem::dccResumed); } @@ -278,7 +278,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCGetItems[key]){ DCCGetItems[key]->changeStatus(dccItem::dccRecving); } @@ -290,7 +290,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString ip = rx.cap(3); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCSendItems[key]){ DCCSendItems[key]->setWhoPostfix("(" + ip + ")"); DCCSendItems[key]->changeStatus(dccItem::dccSending); @@ -325,11 +325,11 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString filename = rx.cap(2); TQString error = rx.cap(3); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCGetItems[key]){ DCCGetItems[key]->changeStatus(dccItem::dccError); } - KPassivePopup::message(i18n("DCC Get with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC Get with %1 for %2 failed because of %3").arg(who).arg(filename).arg(error), mgr->mgr()); } } else if(str.find("DCC CHAT failed") != -1){ /*FOLD01*/ @@ -340,7 +340,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(DCCChatItems[who]){ DCCChatItems[who]->changeStatus(dccItem::dccError); } - KPassivePopup::message(i18n("DCC Chat with %1 failed because of %2").tqarg(who).tqarg(error), mgr->mgr()); + KPassivePopup::message(i18n("DCC Chat with %1 failed because of %2").arg(who).arg(error), mgr->mgr()); } } else if(str.find("DCC CHAT renamed") != -1){ /*FOLD01*/ @@ -360,7 +360,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) if(rx.search(str)){ TQString who = rx.cap(1); TQString filename = rx.cap(2); - TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + TQString key = TQString("%1/%2").arg(filename).arg(who); if(DCCGetItems[key]){ DCCGetItems[key]->changeStatus(dccItem::dccCancel); } @@ -371,7 +371,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // if(rx.search(str)){ // TQString who = rx.cap(1); // TQString filename = rx.cap(2); -// TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); +// TQString key = TQString("%1/%2").arg(filename).arg(who); // if(DCCSendItems[key]){ // DCCSendItems[key]->changeStatus(dccItem::dccCancel); // } @@ -392,7 +392,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) TQString who = rx.cap(1); TQString filename = rx.cap(2); - //TQString key = TQString("%1/%2").tqarg(filename).tqarg(who); + //TQString key = TQString("%1/%2").arg(filename).arg(who); TQPtrList<dccItem> toDel; TQDict<dccItem> new_list; @@ -583,10 +583,10 @@ void KSircIODCC::dccAbortClicked(dccItem *it) case dccItem::dccError: switch(it->type()) { case dccItem::dccGet: - DCCGetItems.remove(TQString("%1/%2").tqarg(it->file()).tqarg(it->who())); + DCCGetItems.remove(TQString("%1/%2").arg(it->file()).arg(it->who())); break; case dccItem::dccSend: - DCCSendItems.remove(TQString("%1/%2").tqarg(it->file()).tqarg(it->who())); + DCCSendItems.remove(TQString("%1/%2").arg(it->file()).arg(it->who())); break; case dccItem::dccChat: DCCChatItems.remove(it->who()); @@ -615,11 +615,11 @@ void KSircIODCC::dccAbortClicked(dccItem *it) void KSircIODCC::dccRenameDone(dccItem *it, TQString oldWho, TQString oldFile) { if(it->type() == dccItem::dccGet){ - TQString str = TQString("/dcc rename %1 %2 %3\n").tqarg(oldWho).tqarg(oldFile).tqarg(it->file()); - TQString key = TQString("%1/%2").tqarg(oldFile).tqarg(oldWho); + TQString str = TQString("/dcc rename %1 %2 %3\n").arg(oldWho).arg(oldFile).arg(it->file()); + TQString key = TQString("%1/%2").arg(oldFile).arg(oldWho); if(DCCGetItems[key]){ DCCGetItems.take(key); - TQString newkey = TQString("%1/%2").tqarg(it->file()).tqarg(it->who()); + TQString newkey = TQString("%1/%2").arg(it->file()).arg(it->who()); DCCGetItems.insert(newkey, it); } emit outputLine(str.ascii()); @@ -629,7 +629,7 @@ void KSircIODCC::dccRenameDone(dccItem *it, TQString oldWho, TQString oldFile) DCCChatItems.take(oldWho); DCCChatItems.insert(it->who(), it); } - TQString str = TQString("/dcc rchat %1 %2\n").tqarg(oldWho).tqarg(it->who()); + TQString str = TQString("/dcc rchat %1 %2\n").arg(oldWho).arg(it->who()); emit outputLine(str.ascii()); } diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp index 296e9049..ae3222bb 100644 --- a/ksirc/ksirc.cpp +++ b/ksirc/ksirc.cpp @@ -103,10 +103,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) sc->restore(1, false ); } else - { // no Session management -> care about docking, tqgeometry, etc. + { // no Session management -> care about docking, geometry, etc. - if( !opts.tqgeometry.isEmpty() ) - sc->setGeometry( opts.tqgeometry ); + if( !opts.geometry.isEmpty() ) + sc->setGeometry( opts.geometry ); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 2aa02e63..26dbc8c7 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -421,7 +421,7 @@ void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name) kdDebug(5008) << "KSP: get close_toplevel: " << name << endl; // the removeTopLevel below also deletes the mditoplevel (in case - // we are using mdi) , which deletes its tqchildren, which deletes + // we are using mdi) , which deletes its children, which deletes // 'wm' , so watch out not to delete twice! (Simon) TQGuardedPtr<KSircTopLevel> guardedwm = wm; // Do this now or we get junk left on the screen diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp index b62579db..de03ab79 100644 --- a/ksirc/ksopts.cpp +++ b/ksirc/ksopts.cpp @@ -142,7 +142,7 @@ void KSOptions::load( int sections ) { KConfig *conf = kapp->config(); conf->setGroup( "ServerController" ); - tqgeometry = conf->readRectEntry( "Size" ); + geometry = conf->readRectEntry( "Size" ); // Using the fields itself as default values as they are already // set to the defaults. @@ -232,10 +232,10 @@ void KSOptions::load( int sections ) colourTheme = conf->readEntry("ColourTheme", colourTheme ); for ( int i = 0; i < 16; ++i ) { ircColors[i] = - conf->readColorEntry(TQString::fromLatin1( "IRC-%1" ).tqarg( i ), + conf->readColorEntry(TQString::fromLatin1( "IRC-%1" ).arg( i ), &ircColors[i] ); nickHighlight[i] = - conf->readBoolEntry(TQString::fromLatin1( "nickHighlight-%1" ).tqarg( i ), + conf->readBoolEntry(TQString::fromLatin1( "nickHighlight-%1" ).arg( i ), &nickHighlight[i] ); } } @@ -422,8 +422,8 @@ void KSOptions::save( int sections ) conf->writeEntry( "nickColourization", nickColourization ); conf->writeEntry( "ColourTheme", colourTheme ); for ( int i = 0; i < 16; ++i ) { - conf->writeEntry( TQString::fromLatin1( "IRC-%1" ).tqarg( i ), ircColors[i] ); - conf->writeEntry( TQString::fromLatin1( "nickHighlight-%1" ).tqarg( i ), nickHighlight[i] ); + conf->writeEntry( TQString::fromLatin1( "IRC-%1" ).arg( i ), ircColors[i] ); + conf->writeEntry( TQString::fromLatin1( "nickHighlight-%1" ).arg( i ), nickHighlight[i] ); } /* Store the font setting */ conf->setGroup( "GlobalOptions" ); diff --git a/ksirc/ksopts.h b/ksirc/ksopts.h index 421370fb..9bd96192 100644 --- a/ksirc/ksopts.h +++ b/ksirc/ksopts.h @@ -99,7 +99,7 @@ class KSOStartup public: KSOStartup(); - TQRect tqgeometry; + TQRect geometry; // TQString nick; // TQString altNick; // TQString realName; diff --git a/ksirc/ksparser.cpp b/ksirc/ksparser.cpp index e2ebf903..100fc4c4 100644 --- a/ksirc/ksparser.cpp +++ b/ksirc/ksparser.cpp @@ -63,12 +63,12 @@ TQString KSParser::parse( const TQString &message ) TQString at; TQColor c = ircColor(fg); if ( c.isValid() ) { - at += TQString( "color=\"%1\" " ).tqarg( c.name() ); + at += TQString( "color=\"%1\" " ).arg( c.name() ); } c = ircColor(bg); if ( c.isValid() ) { - at += TQString( "bgcolor=\"%1\" " ).tqarg( c.name() ); + at += TQString( "bgcolor=\"%1\" " ).arg( c.name() ); } if(at.length() > 0){ res += pushTag( "font", at ); @@ -108,13 +108,13 @@ TQString KSParser::parse( const TQString &message ) res += toggleTag( "u" ); break; case 'n': - res += toggleTag( "font", TQString( "color=\"%1\"" ).tqarg( ksopts->nickForeground.name() ) ); + res += toggleTag( "font", TQString( "color=\"%1\"" ).arg( ksopts->nickForeground.name() ) ); break; case 'o': - res += pushTag( "font", TQString( "color=\"%1\"" ).tqarg( ksopts->msgContainNick.name() ) ); + res += pushTag( "font", TQString( "color=\"%1\"" ).arg( ksopts->msgContainNick.name() ) ); break; case '#': - res += pushTag( "font", TQString( "color=\"#%1\"" ).tqarg( message.mid(i, 6) )); + res += pushTag( "font", TQString( "color=\"#%1\"" ).arg( message.mid(i, 6) )); i+=6; break; case '~': diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index ff198c02..65a9d725 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -1768,14 +1768,14 @@ bool TextView::removeParag( const TextParagIterator ¶g ) return true; } -void TextView::clearSelection( bool tqrepaint ) +void TextView::clearSelection( bool repaint ) { m_selectionStart = SelectionPoint(); m_selectionEnd = SelectionPoint(); m_selectionEndBeforeStart = false; m_selectedText = TQString(); clearSelectionInternal(); - if ( tqrepaint ) + if ( repaint ) updateContents(); } diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h index 4499f370..1ac273eb 100644 --- a/ksirc/kstextview.h +++ b/ksirc/kstextview.h @@ -482,7 +482,7 @@ public: bool removeParag( const TextParagIterator ¶g ); - void clearSelection( bool tqrepaint = false ); // ### re-consider the tqrepaint arg... + void clearSelection( bool repaint = false ); // ### re-consider the repaint arg... TQString selectedText() const { return m_selectedText; } diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index 62a4bca4..32c37e47 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -74,9 +74,9 @@ TQString KSircView::makeTimeStamp() { TQTime now = TQTime::currentTime(); TQString timeStamp = TQString::fromLatin1( "[%1:%2:%3] " ) - .tqarg( TQString::number( now.hour() ).rightJustify( 2, '0' ) ) - .tqarg( TQString::number( now.minute() ).rightJustify( 2, '0' ) ) - .tqarg( TQString::number( now.second() ).rightJustify( 2, '0' ) ); + .arg( TQString::number( now.hour() ).rightJustify( 2, '0' ) ) + .arg( TQString::number( now.minute() ).rightJustify( 2, '0' ) ) + .arg( TQString::number( now.second() ).rightJustify( 2, '0' ) ); return timeStamp; } @@ -109,14 +109,14 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const //kdDebug(5008) << "Start Text: " << _text << endl; TQString richText( "<font color=\"%1\">" ); - richText = richText.tqarg( color.name() ); + richText = richText.arg( color.name() ); if ( !pixmap.isEmpty() ) - richText.prepend( TQString::fromLatin1( "<img src=\"%1\"></img>" ).tqarg( pixmap ) ); + richText.prepend( TQString::fromLatin1( "<img src=\"%1\"></img>" ).arg( pixmap ) ); TQString timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" ) - .tqarg( ksopts->textColor.name() ) - .tqarg( makeTimeStamp() ); + .arg( ksopts->textColor.name() ) + .arg( makeTimeStamp() ); m_timeStamps.append(timeStamp); if ( m_timestamps ) richText.prepend( timeStamp ); @@ -147,13 +147,13 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const if( nickCol.cap(1) != m_proc->getNick()){ TQColor col = nickColourMaker::colourMaker()->findFg(nickCol.cap(1)); - newText.prepend(TQString("<font color=\"%1\">").tqarg(col.name())); + newText.prepend(TQString("<font color=\"%1\">").arg(col.name())); newText.append("</font>"); } else { TQColor col = ksopts->ownNickColor.name(); if( ! col.isValid()) nickColourMaker::colourMaker()->findFg(nickCol.cap(1)); - newText.prepend(TQString("<font color=\"%1\">").tqarg(col.name())); + newText.prepend(TQString("<font color=\"%1\">").arg(col.name())); newText.append("</font>"); if(ksopts->ownNickBold){ newText.prepend("<b>"); @@ -225,8 +225,8 @@ void KSircView::addRichText(const TQString &_text) } else { timeStamp = TQString::fromLatin1( "<font color=\"%1\">%2</font>" ) - .tqarg( ksopts->textColor.name() ) - .tqarg( makeTimeStamp() ); + .arg( ksopts->textColor.name() ) + .arg( makeTimeStamp() ); if ( m_timestamps ) text.prepend( timeStamp ); } diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod index 600f2111..8cae9c86 100644 --- a/ksirc/puke/HOWTO-PUKE.pod +++ b/ksirc/puke/HOWTO-PUKE.pod @@ -106,7 +106,7 @@ These set and return your widget. If you care about inheritance, which you should, all these functions should be virtual. (Since we are using pointers to PWidget's -everywhere, it's a good bet you want your tqchildren's overriden +everywhere, it's a good bet you want your children's overriden functions called, not yours) The structure internally will have to hold a local copy of the widget, diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h index 2baa316e..fc7f0f0d 100644 --- a/ksirc/puke/commands.h +++ b/ksirc/puke/commands.h @@ -130,38 +130,38 @@ // cArg: not define #define PUKE_WIDGET_HIDE_ACK -1003 -// Desc: tqrepaint widget -// iWinId: widget to tqrepaint +// Desc: repaint widget +// iWinId: widget to repaint // iArg: erase, 0 for false, 1 for true // cArg: no defines #define PUKE_WIDGET_REPAINT 1005 -// Desc: tqrepaint widget ack -// iWinId: widget to tqrepaint +// Desc: repaint widget ack +// iWinId: widget to repaint // iArg: not defined // cArg: not defined #define PUKE_WIDGET_REPAINT_ACK -1005 // Desc: update widget on next event loop -// iWinId: widget to tqrepaint +// iWinId: widget to repaint // iArg: erase, 0 for false, 1 for true // cArg: no defines #define PUKE_WIDGET_UPDATE 1010 -// Desc: tqrepaint widget ack -// iWinId: widget to tqrepaint +// Desc: repaint widget ack +// iWinId: widget to repaint // iArg: not defined // cArg: not defined #define PUKE_WIDGET_UPDATE_ACK -1010 // Desc: resize the widget -// iWinId: widget to tqrepaint +// iWinId: widget to repaint // iArg: width in the low 16 bit, height in next 16 bits // cArg: not defined #define PUKE_WIDGET_RESIZE 1015 -// Desc: tqrepaint widget ack -// iWinId: widget to tqrepaint +// Desc: repaint widget ack +// iWinId: widget to repaint // iArg: new widget in lower 16 bit, new height in lower 16 bits // cArg: not defined #define PUKE_WIDGET_RESIZE_ACK -1015 @@ -766,13 +766,13 @@ // Desc: Set label's allignment // iWinId: window id -// iArg: tqalignment +// iArg: alignment // cArg: not defined #define PUKE_LABEL_SETALIGNMENT 1715 // Desc: Set label's allignment, ACK // iWinId: window id -// iArg: tqalignment +// iArg: alignment // cArg: not defined #define PUKE_LABEL_SETALIGNMENT_ACK -1715 @@ -1012,7 +1012,7 @@ // Desc: add widget into tqlayout manager // iWinId: Layout Manager to add widget too // iArg: Widget Id to be added -// cArg: 2 characters, char[0] strech, char[1] tqalignment +// cArg: 2 characters, char[0] strech, char[1] alignment #define PUKE_LAYOUT_ADDWIDGET 11010 // Desc: ack for add widget // iWinId: Layout manager diff --git a/ksirc/puke/palistbox.cpp b/ksirc/puke/palistbox.cpp index 05124441..9f43b124 100644 --- a/ksirc/puke/palistbox.cpp +++ b/ksirc/puke/palistbox.cpp @@ -88,7 +88,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm) widget()->removeItem(index); item->setVoice(pm->iArg); widget()->inSort(item); - widget()->tqrepaint(TRUE); + widget()->repaint(TRUE); pmRet.iCommand = - pm->iCommand; pmRet.iWinId = pm->iWinId; @@ -108,7 +108,7 @@ void PAListBox::messageHandler(int fd, PukeMessage *pm) widget()->removeItem(index); item->setOp(pm->iArg); widget()->inSort(item); - widget()->tqrepaint(TRUE); + widget()->repaint(TRUE); pmRet.iCommand = - pm->iCommand; pmRet.iWinId = pm->iWinId; diff --git a/ksirc/puke/pframe.pm b/ksirc/puke/pframe.pm index 2ef36ebc..f851cdb8 100644 --- a/ksirc/puke/pframe.pm +++ b/ksirc/puke/pframe.pm @@ -44,13 +44,13 @@ sub setFrameStyle { my $self = shift; my $frame = shift; - my $tqrepaint = shift; + my $repaint = shift; $self->sendMessage('iCommand' => $::PUKE_QFRAME_SET_FRAME, 'iArg' => $frame, 'CallBack' => sub {}); - $self->tqrepaint(1) if($tqrepaint == 1); + $self->repaint(1) if($repaint == 1); } diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp index ab729315..9e46e042 100644 --- a/ksirc/puke/pobject.cpp +++ b/ksirc/puke/pobject.cpp @@ -131,7 +131,7 @@ void PObject::manTerm() { void PObject::errorInvalidSet(TQObject *_w) { - m_error = TQString("Tried setting a %1 to %2").tqarg(_w->className()).tqarg(className()); + m_error = TQString("Tried setting a %1 to %2").arg(_w->className()).arg(className()); m_hasError = true; } #include "pobject.moc" diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp index af041c19..b62f64c1 100644 --- a/ksirc/puke/pwidget.cpp +++ b/ksirc/puke/pwidget.cpp @@ -90,7 +90,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm) emit outputMessage(fd, &pmRet); break; case PUKE_WIDGET_REPAINT: - widget()->tqrepaint(pm->iArg); + widget()->repaint(pm->iArg); pmRet.iCommand = PUKE_WIDGET_REPAINT_ACK; pmRet.iWinId = pm->iWinId; pmRet.iArg = 0; diff --git a/ksirc/puke/pwidget.pm b/ksirc/puke/pwidget.pm index 56381db6..5a73d393 100644 --- a/ksirc/puke/pwidget.pm +++ b/ksirc/puke/pwidget.pm @@ -61,7 +61,7 @@ sub hide { $self->sendMessage('iCommand' => $::PUKE_WIDGET_HIDE); } -sub tqrepaint { +sub repaint { my $self = shift; my $erase = shift; # 1 for erase and reapint diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 6448dd5a..3b888da0 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -253,7 +253,7 @@ void servercontroller::new_ksircprocess(KSircServer &kss) return; server_id = kss.server(); while(proc_list[server_id]){ // if it already exists, quit - server_id = TQString("%1 %2").tqarg(kss.server()).tqarg(id++); + server_id = TQString("%1 %2").arg(kss.server()).arg(id++); } // Insert new base @@ -435,7 +435,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args) if(online_item->childCount() == 0) delete online_item; if(ksopts->runDocked && ksopts->dockPopups) - KPassivePopup::message(i18n("%1 just went offline on %2").tqarg(args).tqarg(server), dockWidget); + KPassivePopup::message(i18n("%1 just went offline on %2").arg(args).arg(server), dockWidget); } dockWidget->nickOffline(server, args); break; @@ -457,7 +457,7 @@ void servercontroller::ProcMessage(TQString server, int command, TQString args) item = new TQListViewItem(online_item, args); item->setPixmap( 0, pic_run ); if(ksopts->runDocked && ksopts->dockPopups) - KPassivePopup::message(i18n("%1 just came online on %2").tqarg(args).tqarg(server), dockWidget); + KPassivePopup::message(i18n("%1 just came online on %2").arg(args).arg(server), dockWidget); dockWidget->nickOnline(server, args); break; } @@ -615,7 +615,7 @@ void servercontroller::saveGlobalProperties(KConfig *ksc) ksc->setGroup("ServerController"); // ksc->writeEntry("Docked", !isVisible()); - ksc->writeEntry("Size", tqgeometry()); + ksc->writeEntry("Size", geometry()); ksc->setGroup(group); } diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp index 91754dd8..e1623a3c 100644 --- a/ksirc/topic.cpp +++ b/ksirc/topic.cpp @@ -40,7 +40,7 @@ KSircTopic::KSircTopic( TQWidget *parent, const char *name ) setTextFormat( RichText ); setWordWrap(TQTextEdit::NoWrap); doResize(); -// setAlignment( tqalignment() | WordBreak ); +// setAlignment( alignment() | WordBreak ); } void KSircTopic::setText( const TQString &_text) @@ -49,7 +49,7 @@ void KSircTopic::setText( const TQString &_text) TQString text = _text; TQString richText( "<font color=\"%1\">" ); - richText = richText.tqarg( ksopts->textColor.name() ); + richText = richText.arg( ksopts->textColor.name() ); text.replace('&', "&"); text.replace('<', "<"); @@ -111,7 +111,7 @@ void KSircTopic::contentsMouseReleaseEvent( TQMouseEvent *e ) * the size really breaks and you get * a huge widget */ - m_editor->setGeometry( tqgeometry() ); + m_editor->setGeometry( geometry() ); m_editor->setFocus(); m_editor->show(); diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index ccd377f2..074f2af4 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -587,9 +587,9 @@ void KSircTopLevel::setMode(TQString mode, int mode_type, TQString currentNick) { TQString command; if (mode_type == 0) - command = TQString::fromLatin1("/mode %1 %2\n").tqarg(m_channelInfo.channel()).tqarg(mode); + command = TQString::fromLatin1("/mode %1 %2\n").arg(m_channelInfo.channel()).arg(mode); else - command = TQString::fromLatin1("/mode %1 %2\n").tqarg(currentNick).tqarg(mode); + command = TQString::fromLatin1("/mode %1 %2\n").arg(currentNick).arg(mode); sirc_write(command); linee->setFocus(); } @@ -829,7 +829,7 @@ void KSircTopLevel::sirc_receive(TQString str, bool broadcast) // that we enter a local event loop (think of the ssfeprompt dialog!) // which might trigger a socketnotifier activation which in turn // might result in the execution of code that modifies the LineBuffer, - // which would tqinvalidate iterators (Simon) + // which would invalidate iterators (Simon) while ( LineBuffer.begin() != LineBuffer.end() ) { TQString plainText(""); @@ -877,7 +877,7 @@ void KSircTopLevel::sirc_receive(TQString str, bool broadcast) list = pan->sizes(); it = list.begin(); while( it != list.end()){ - values += TQString("%1 ").tqarg(*it); + values += TQString("%1 ").arg(*it); ++it; } } @@ -974,7 +974,7 @@ void KSircTopLevel::sirc_write(const TQString &str) return; } else if ( plain.startsWith( "/away" ) ) { - TQString awayEvalCommand = TQString::fromLatin1( "/eval $publicAway = %1\n" ).tqarg( ksopts->publicAway ? '1' : '0' ); + TQString awayEvalCommand = TQString::fromLatin1( "/eval $publicAway = %1\n" ).arg( ksopts->publicAway ? '1' : '0' ); emit outputUnicodeLine( awayEvalCommand ); } @@ -985,7 +985,7 @@ void KSircTopLevel::sirc_write(const TQString &str) if(!isSpecialWindow()) { // channel or private chat if(plain[0].latin1() != '/'){ - command.prepend(TQString::fromLatin1("/msg %1 ").tqarg(m_channelInfo.channel())); + command.prepend(TQString::fromLatin1("/msg %1 ").arg(m_channelInfo.channel())); } else if(plain.startsWith("/me ")) { command.remove(0, 3); @@ -1147,15 +1147,15 @@ void KSircTopLevel::UserParseMenu(int id) return; TQString s; - s = TQString("/eval $dest_nick='%1';\n").tqarg(nicks->text(nicks->currentItem())); + s = TQString("/eval $dest_nick='%1';\n").arg(nicks->text(nicks->currentItem())); sirc_write(s); // set $$dest_chan variable - s = TQString("/eval $dest_chan='%1';\n").tqarg(m_channelInfo.channel()); + s = TQString("/eval $dest_chan='%1';\n").arg(m_channelInfo.channel()); sirc_write(s); TQString action = user_menu->at(id)->action; if (action.length() && action[0] == '/') action.remove(0, 1); - s = TQString("/eval &docommand(eval{\"%1\"});\n").tqarg(action); + s = TQString("/eval &docommand(eval{\"%1\"});\n").arg(action); s.replace(TQRegExp("\\$\\$"), "$"); sirc_write(s); } @@ -1233,7 +1233,7 @@ void KSircTopLevel::gotFocus() if(isVisible() == TRUE){ if(have_focus == 0){ if(m_channelInfo.channel()[0] != '!' ){ - TQString str = TQString("/join %1").tqarg(m_channelInfo.channel()); + TQString str = TQString("/join %1").arg(m_channelInfo.channel()); if(m_channelInfo.key().length() > 0){ str.append(" " + m_channelInfo.key()); } @@ -1247,7 +1247,7 @@ void KSircTopLevel::gotFocus() } if(m_gotMsgWithoutFocus == true){ m_gotMsgWithoutFocus = false; - servercontroller::self()->decreaseNotificationCount(TQString("%1 -> %2 got message").tqarg(ksircProcess()->serverID()).tqarg(m_channelInfo.channel())); + servercontroller::self()->decreaseNotificationCount(TQString("%1 -> %2 got message").arg(ksircProcess()->serverID()).arg(m_channelInfo.channel())); } } @@ -1293,14 +1293,14 @@ void KSircTopLevel::control_message(int command, TQString str) emit currentWindow(this); if(m_channelInfo.channel()[0] == '#' || m_channelInfo.channel()[0] == '&'){ - TQString str = TQString("/join %1 %2\n").tqarg(m_channelInfo.channel()).tqarg(m_channelInfo.key()); + TQString str = TQString("/join %1 %2\n").arg(m_channelInfo.channel()).arg(m_channelInfo.key()); kdDebug(5008) << "Doing /join " << m_channelInfo.channel() << " :" << str << endl; emit outputUnicodeLine(str); emit outputLine("/eval $query=''\n"); } else if (m_channelInfo.channel()[0] != '!') { - emit outputUnicodeLine(TQString("/eval $query='%1'\n").tqarg(m_channelInfo.channel())); + emit outputUnicodeLine(TQString("/eval $query='%1'\n").arg(m_channelInfo.channel())); } bool isPrivate = isPrivateChat(); @@ -1329,7 +1329,7 @@ void KSircTopLevel::control_message(int command, TQString str) } if(tqlayout()) { //kdDebug(5008) << "Redoeing tqlayout" << endl; - tqlayout()->tqinvalidate(); + tqlayout()->invalidate(); tqlayout()->activate(); } else { @@ -1574,7 +1574,7 @@ void KSircTopLevel::slotTextDropped( const TQString& _text ) approx_lines = lines; if (lines > 4) { int result = KMessageBox::warningContinueCancel(this, - i18n("You are about to send %1 lines of text.\nDo you really want to send that much?").tqarg(approx_lines), + i18n("You are about to send %1 lines of text.\nDo you really want to send that much?").arg(approx_lines), TQString(), i18n("Send")); if (result != KMessageBox::Continue) { @@ -1700,7 +1700,7 @@ void KSircTopLevel::slotDccURLs( const TQStringList& urls, const TQString& nick TQString file( *it ); kdDebug(5008) << "........ " << file << endl; if ( !file.isEmpty() ) - sirc_write(s.tqarg( file )); + sirc_write(s.arg( file )); } } @@ -1727,7 +1727,7 @@ void KSircTopLevel::outputUnicodeLine( const TQString &message ) void KSircTopLevel::setTopicIntern( const TQString &topic ) { - TQString command = TQString::fromLatin1( "/topic %1 %2\n" ).tqarg( m_channelInfo.channel() ).tqarg( topic ); + TQString command = TQString::fromLatin1( "/topic %1 %2\n" ).arg( m_channelInfo.channel() ).arg( topic ); sirc_write( command ); linee->setFocus(); } @@ -1742,12 +1742,12 @@ void KSircTopLevel::doChange(bool pers, TQString text) int winId = !ticker ? topLevelWidget()->winId() : ticker->winId(); KNotifyClient::event(winId, TQString::fromLatin1("ChannelPersonal"), - i18n("Your nick appeared on channel %1").tqarg(m_channelInfo.channel())); + i18n("Your nick appeared on channel %1").arg(m_channelInfo.channel())); } else { int winId = !ticker ? topLevelWidget()->winId() : ticker->winId(); KNotifyClient::event(winId, TQString::fromLatin1("ChannelChanged"), - i18n("Channel %1 changed").tqarg(m_channelInfo.channel())); + i18n("Channel %1 changed").arg(m_channelInfo.channel())); } lastBeep = ctime; } @@ -1755,7 +1755,7 @@ void KSircTopLevel::doChange(bool pers, TQString text) if(have_focus == 0 && pers == true && m_gotMsgWithoutFocus == false){ m_gotMsgWithoutFocus = true; - servercontroller::self()->increaseNotificationCount(TQString("%1 -> %2").tqarg(ksircProcess()->serverID()).tqarg(m_channelInfo.channel()), text); + servercontroller::self()->increaseNotificationCount(TQString("%1 -> %2").arg(ksircProcess()->serverID()).arg(m_channelInfo.channel()), text); } } diff --git a/ksirc/toplevel.h b/ksirc/toplevel.h index ba1a25bc..47da2064 100644 --- a/ksirc/toplevel.h +++ b/ksirc/toplevel.h @@ -454,7 +454,7 @@ private: */ TQPoint mypoint; /** - * Ticker's size and tqgeometry + * Ticker's size and geometry */ TQRect tickerrect; /** diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp index 26b82f59..cc62da3f 100644 --- a/ktalkd/kcmktalkd/soundpage.cpp +++ b/ktalkd/kcmktalkd/soundpage.cpp @@ -193,7 +193,7 @@ void KSoundPageConfig::sound_listDropEvent(TQDropEvent* e){ if (url.path().right(4).upper() != ".WAV") { TQString msg = i18n("%1\ndoes not appear "\ - "to be a WAV file.").tqarg(url.path()); + "to be a WAV file.").arg(url.path()); KMessageBox::sorry(this, msg, i18n("Improper File Extension")); @@ -203,7 +203,7 @@ void KSoundPageConfig::sound_listDropEvent(TQDropEvent* e){ if (!addToSound_List(url.path())) { // did not add file because it is already in the list - TQString msg = i18n("The file %1 is already in the list").tqarg(url.path()); + TQString msg = i18n("The file %1 is already in the list").arg(url.path()); KMessageBox::information(this, msg, i18n("File Already in List")); diff --git a/ktalkd/ktalkd/threads.cpp b/ktalkd/ktalkd/threads.cpp index c0c7b5d8..09d5bb4c 100644 --- a/ktalkd/ktalkd/threads.cpp +++ b/ktalkd/ktalkd/threads.cpp @@ -44,7 +44,7 @@ static int nb_child_to_wait=0; #undef DEBUG_THREADS -/** Register a new process (by just increasing the number of tqchildren */ +/** Register a new process (by just increasing the number of children */ void new_process() { nb_child_to_wait++; @@ -76,7 +76,7 @@ int wait_process(int pid) return status; } -/** Wait for tqchildren (if any) to exit. Return 1 if no more child to wait */ +/** Wait for children (if any) to exit. Return 1 if no more child to wait */ int ack_process() { if (nb_child_to_wait>0) diff --git a/ktalkd/ktalkd/threads.h b/ktalkd/ktalkd/threads.h index 280262da..5d76e54e 100644 --- a/ktalkd/ktalkd/threads.h +++ b/ktalkd/ktalkd/threads.h @@ -31,9 +31,9 @@ * (BSD License, from kdelibs/doc/common/bsd-license.html) */ -/** Register a new process (by just increasing the number of tqchildren */ +/** Register a new process (by just increasing the number of children */ void new_process(); /** Wait for a given process - not registered - and see if others exited */ int wait_process(int pid); -/** Wait for tqchildren (if any) to exit. Return 1 if no more child to wait */ +/** Wait for children (if any) to exit. Return 1 if no more child to wait */ int ack_process(); diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp index b7fa0684..c987179e 100644 --- a/ktalkd/ktalkdlg/ktalkdlg.cpp +++ b/ktalkd/ktalkdlg/ktalkdlg.cpp @@ -98,7 +98,7 @@ int main (int argc, char **argv) { s += '\n'; TQString callee = args->arg(1); - s += i18n ("for user %1").tqarg( callee.isEmpty() ? i18n("<nobody>") : callee ); + s += i18n ("for user %1").arg( callee.isEmpty() ? i18n("<nobody>") : callee ); } s += "."; diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index bbc613c9..0766170d 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -288,7 +288,7 @@ void LisaSettings::save() confStream<<"PingNames = "<<writeStuff.latin1()<<"\n"; tmp.close(); - TQString suCommand=TQString("cp '%1' '%2'; chmod 644 '%3'; rm -f '%4'").tqarg(m_tmpFilename).tqarg(m_configFilename).tqarg(m_configFilename).tqarg(m_tmpFilename); + TQString suCommand=TQString("cp '%1' '%2'; chmod 644 '%3'; rm -f '%4'").arg(m_tmpFilename).arg(m_configFilename).arg(m_configFilename).arg(m_tmpFilename); KProcess *proc = new KProcess(); connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(saveDone(KProcess *))); *proc<<"kdesu"<<"-c"<<suCommand; @@ -298,7 +298,7 @@ void LisaSettings::save() delete proc; } else - KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").tqarg(m_configFilename)); + KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").arg(m_configFilename)); } } @@ -337,7 +337,7 @@ void LisaSettings::suggestSettings() { msg+="<b>"+tmp->name+": </b>"+tmp->addr+"/"+tmp->netmask+";<br>"; } - KMessageBox::information(0,TQString("<html>%1</html>").tqarg(msg)); + KMessageBox::information(0,TQString("<html>%1</html>").arg(msg)); } emit changed(); diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp index 1ced6c13..5d6285d0 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.cpp +++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp @@ -237,9 +237,9 @@ void ResLisaSettings::suggestSettings() { msg+="<b>"+tmp->name+": </b>"+tmp->addr+"/"+tmp->netmask+";<br>"; } - KMessageBox::information(0,TQString("<html>%1</html>").tqarg(msg)); + KMessageBox::information(0,TQString("<html>%1</html>").arg(msg)); } - KMessageBox::information(0,TQString("<html>%1</html>").tqarg(i18n("The ResLISa daemon is now configured " + KMessageBox::information(0,TQString("<html>%1</html>").arg(i18n("The ResLISa daemon is now configured " "correctly, hopefully.<br>Make sure that the reslisa binary is installed <i>suid root</i>."))); emit changed(); diff --git a/lanbrowsing/kio_lan/kio_lan.cpp b/lanbrowsing/kio_lan/kio_lan.cpp index 06eb0a18..55cc13b4 100644 --- a/lanbrowsing/kio_lan/kio_lan.cpp +++ b/lanbrowsing/kio_lan/kio_lan.cpp @@ -187,7 +187,7 @@ int LANProtocol::lanReadDataFromServer() if ((bytesRead<0) || (receivedBytes<4)) { delete [] receiveBuffer; - error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").tqarg(m_currentHost)); + error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(m_currentHost)); return 0; } @@ -206,7 +206,7 @@ int LANProtocol::lanReadDataFromServer() if ((memchr(currentBuf,0,bytesLeft)==0) || (memchr(currentBuf,int('\n'),bytesLeft)==0)) { delete [] receiveBuffer; - error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").tqarg(m_currentHost)); + error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(m_currentHost)); return 0; } kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: processing "<<currentBuf; @@ -381,7 +381,7 @@ int LANProtocol::rlanReadDataFromServer() if ((memchr(currentBuf,0,bytesLeft)==0) || (memchr(currentBuf,int('\n'),bytesLeft)==0)) { delete [] receiveBuffer; - error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").tqarg(socketname.data())); + error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(socketname.data())); return 0; } kdDebug(7101)<<"RLANProtocol::readDataFromServer: processing "<<currentBuf; diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp index 36ca0daf..743f3d2e 100644 --- a/wifi/kcmwifi/kcmwifi.cpp +++ b/wifi/kcmwifi/kcmwifi.cpp @@ -54,7 +54,7 @@ KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &) for ( int i=0; i<config->m_numConfigs; ++i ) { IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" ); - tabs->addTab(ifConfigPage, i18n ("Config &%1").tqarg( i+1 )); + tabs->addTab(ifConfigPage, i18n ("Config &%1").arg( i+1 )); connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); m_ifConfigPage[ i ] = ifConfigPage; @@ -146,7 +146,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor ) if (vendor) { IfConfigPage *ifConfigPage = new IfConfigPage( vendorBase + m_activeVendorCount, tabs, "m_configPage" ); - tabs->addTab(ifConfigPage, i18n ("Vendor %1").tqarg( m_activeVendorCount+1 ) ); + tabs->addTab(ifConfigPage, i18n ("Vendor %1").arg( m_activeVendorCount+1 ) ); connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); m_ifConfigPage[ vendorBase+m_activeVendorCount ] = ifConfigPage; m_mainConfig->registerConfig( vendorBase+m_activeVendorCount ); @@ -169,7 +169,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor ) for ( int i=config->m_numConfigs; i<config->m_numConfigs+count; i++ ) { IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" ); - tabs->insertTab(ifConfigPage, i18n ("Config &%1").tqarg( i+1 ), i ); + tabs->insertTab(ifConfigPage, i18n ("Config &%1").arg( i+1 ), i ); connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); m_ifConfigPage[ i ] = ifConfigPage; m_mainConfig->registerConfig( i+1 ); @@ -295,8 +295,8 @@ void KCMWifi::activate() if ( ifconfig.m_keys[ i ].isValid( ifconfig.m_keys[ i ].key() ) > INVALID ) { proc << "key" - << TQString( "[%1]").tqarg( i+1 ) - << TQString( "%1").tqarg( ifconfig.m_keys[ i ].rawKey() ); + << TQString( "[%1]").arg( i+1 ) + << TQString( "%1").arg( ifconfig.m_keys[ i ].rawKey() ); } } @@ -308,7 +308,7 @@ void KCMWifi::activate() proc << "key" << ifconfig.cryptomodeAsString(); proc << "key" - << TQString( "[%1]" ).tqarg( ifconfig.activeKeyId() ); + << TQString( "[%1]" ).arg( ifconfig.activeKeyId() ); proc << "key" << "on"; } @@ -334,10 +334,10 @@ void KCMWifi::activate() { proc << "power" << "period" - << TQString( "%1" ).tqarg( ifconfig.m_wakeupPeriod ); + << TQString( "%1" ).arg( ifconfig.m_wakeupPeriod ); proc << "power" << "timeout" - << TQString( "%1" ).tqarg( ifconfig.m_sleepTimeout ); + << TQString( "%1" ).arg( ifconfig.m_sleepTimeout ); proc << ifconfig.powermodeAsString(); } diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp index ca2a666d..c740df69 100644 --- a/wifi/kcmwifi/mainconfig.cpp +++ b/wifi/kcmwifi/mainconfig.cpp @@ -39,7 +39,7 @@ MainConfig::MainConfig( TQWidget *parent, const char *name ) WifiConfig *config = WifiConfig::instance(); for (int i=1;i<=config->m_numConfigs;i++) { - cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( i ) ); + cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( i ) ); } @@ -91,12 +91,12 @@ void MainConfig::registerConfig( int number ) { if ( number >= KCMWifi::vendorBase ) { - cmb_presetConfig->insertItem( i18n( "Vendor %1" ).tqarg( number-KCMWifi::vendorBase+1 ) ); + cmb_presetConfig->insertItem( i18n( "Vendor %1" ).arg( number-KCMWifi::vendorBase+1 ) ); } else { WifiConfig* config = WifiConfig::instance(); - cmb_presetConfig->insertItem( i18n( "Config %1" ).tqarg( number ), number-1 ); + cmb_presetConfig->insertItem( i18n( "Config %1" ).arg( number ), number-1 ); } } diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index bce6afd9..1cd6b3f2 100644 --- a/wifi/kcmwifi/wificonfig.cpp +++ b/wifi/kcmwifi/wificonfig.cpp @@ -119,7 +119,7 @@ void IfConfig::load( KConfig *config, int i ) { TQString entry; - TQString group = TQString( "Configuration %1" ).tqarg( i+1 ); + TQString group = TQString( "Configuration %1" ).arg( i+1 ); config->setGroup( group ); m_networkName = config->readEntry( "NetworkName" ); @@ -150,7 +150,7 @@ void IfConfig::load( KConfig *config, int i ) void IfConfig::save( KConfig *config, int i ) { - TQString group = TQString( "Configuration %1" ).tqarg( i+1 ); + TQString group = TQString( "Configuration %1" ).arg( i+1 ); config->setGroup( group ); config->writeEntry( "NetworkName", m_networkName ); diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index 87c95b20..bc9926be 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -385,17 +385,17 @@ KWiFiManagerApp::initView () zentraltqlayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft); connect (device, TQT_SIGNAL (interfaceChanged ()), this, TQT_SLOT (slotChangeWindowCaption ())); connect (device, TQT_SIGNAL (strengthChanged ()), this, TQT_SLOT (slotChangeTrayIcon ())); - connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (tqrepaint ())); - connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (tqrepaint ())); - connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (tqrepaint ())); - connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (tqrepaint ())); + connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (repaint ())); connect (device, TQT_SIGNAL (essidChanged (TQString)), this, TQT_SLOT (slotLogESSID (TQString))); - connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (tqrepaint ())); - connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (tqrepaint ())); + connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (repaint ())); connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotTXPowerChanged ())); connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotChangeTrayIcon ())); - connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (tqrepaint ())); - connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (tqrepaint ())); + connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (repaint ())); + connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (repaint ())); connect (scan, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotNetworkScan())); } @@ -427,7 +427,7 @@ KWiFiManagerApp::slotStartStatViewer () delete statistik; statistik = new Statistics (device, showStatsNoise); statistik->setFixedSize (590, 300); - connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(tqrepaint())); + connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(repaint())); statistik->show (); } diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp index 86bb6ed7..77e20128 100644 --- a/wifi/kwireless/kwirelesswidget.cpp +++ b/wifi/kwireless/kwirelesswidget.cpp @@ -50,7 +50,7 @@ float DeviceInfo::quality() TQString DeviceInfo::qualityString() { - return i18n("%1%").tqarg(TQString::number(m_quality*100, 'f', 0)); + return i18n("%1%").arg(TQString::number(m_quality*100, 'f', 0)); } float DeviceInfo::signal() @@ -60,7 +60,7 @@ float DeviceInfo::signal() TQString DeviceInfo::signalString() { - return i18n("%1%").tqarg(TQString::number(m_signal*100, 'f', 0)); + return i18n("%1%").arg(TQString::number(m_signal*100, 'f', 0)); } float DeviceInfo::noise() @@ -70,7 +70,7 @@ float DeviceInfo::noise() TQString DeviceInfo::noiseString() { - return i18n("%1%").tqarg(TQString::number(m_noise*100, 'f', 0)); + return i18n("%1%").arg(TQString::number(m_noise*100, 'f', 0)); } const TQString& DeviceInfo::device() diff --git a/wifi/kwireless/linuxwirelesswidget.cpp b/wifi/kwireless/linuxwirelesswidget.cpp index 02b7e217..3efdbf98 100644 --- a/wifi/kwireless/linuxwirelesswidget.cpp +++ b/wifi/kwireless/linuxwirelesswidget.cpp @@ -187,7 +187,7 @@ void LinuxWireLessWidget::poll() if(updateNeeded) { emit(updateDeviceInfo(&deviceInfo)); - tqrepaint(false); + repaint(false); } if(updateToolTip) { @@ -199,9 +199,9 @@ void LinuxWireLessWidget::poll() if (!text.isEmpty()) text.append('\n'); text += i18n("%1: Link Quality %2, Bitrate: %3") - .tqarg(info->device()) - .tqarg(info->qualityString()) - .tqarg(info->bitrateString()); + .arg(info->device()) + .arg(info->qualityString()) + .arg(info->bitrateString()); } TQToolTip::add(this, text); diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp index 429cb525..57743584 100644 --- a/wifi/networkscanning.cpp +++ b/wifi/networkscanning.cpp @@ -119,26 +119,26 @@ NetworkScanning::switchToNetwork() TQString tempfilename = tempfile->name(); cmdline = (TQString)"ifconfig %1 down\n"; - cmdline = cmdline.tqarg( device->get_interface_name() ); + cmdline = cmdline.arg( device->get_interface_name() ); write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) ); cmdline = (TQString)"iwconfig %1 essid %2 mode %3 enc %4\n"; - cmdline = cmdline.tqarg( device->get_interface_name() ); - cmdline = cmdline.tqarg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) ); + cmdline = cmdline.arg( device->get_interface_name() ); + cmdline = cmdline.arg( KProcess::quote( networks->text( networks->currentRow(), 0 ) ) ); TQString modetemp; if (networks->text( networks->currentRow(), 1 ) == i18n("Managed") ) modetemp = "Managed"; else modetemp = "Ad-Hoc"; - cmdline = cmdline.tqarg( modetemp ); + cmdline = cmdline.arg( modetemp ); if ( encryption != NONE ) { - cmdline = cmdline.tqarg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) ); + cmdline = cmdline.arg( (encryption == VALID_STRING ? "s:" : "" ) + KProcess::quote( networks->text( networks->currentRow(), 3 ) ) ); } else { - cmdline = cmdline.tqarg("off"); + cmdline = cmdline.arg("off"); } write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) ); cmdline = (TQString)"ifconfig %1 up\n"; - cmdline = cmdline.tqarg( device->get_interface_name() ); + cmdline = cmdline.arg( device->get_interface_name() ); write( tempfile->handle(), cmdline.ascii(), strlen( cmdline.ascii() ) ); delete tempfile; // autoDeletion off, so the file remains on disk diff --git a/wifi/status.cpp b/wifi/status.cpp index 3d344800..4d8b5784 100644 --- a/wifi/status.cpp +++ b/wifi/status.cpp @@ -69,79 +69,79 @@ bool Status::generateStatsWidget () { if (freq / 1000000. > 5690.) { - temp3 = temp3.tqarg(140); + temp3 = temp3.arg(140); } else if (freq / 1000000. > 5670.) { - temp3 = temp3.tqarg(136); + temp3 = temp3.arg(136); } else if (freq / 1000000. > 5650.) { - temp3 = temp3.tqarg(132); + temp3 = temp3.arg(132); } else if (freq / 1000000. > 5630.) { - temp3 = temp3.tqarg(128); + temp3 = temp3.arg(128); } else if (freq / 1000000. > 5610.) { - temp3 = temp3.tqarg(124); + temp3 = temp3.arg(124); } else if (freq / 1000000. > 5590.) { - temp3 = temp3.tqarg(120); + temp3 = temp3.arg(120); } else if (freq / 1000000. > 5570.) { - temp3 = temp3.tqarg(116); + temp3 = temp3.arg(116); } else if (freq / 1000000. > 5550.) { - temp3 = temp3.tqarg(112); + temp3 = temp3.arg(112); } else if (freq / 1000000. > 5530.) { - temp3 = temp3.tqarg(108); + temp3 = temp3.arg(108); } else if (freq / 1000000. > 5510.) { - temp3 = temp3.tqarg(104); + temp3 = temp3.arg(104); } else if (freq / 1000000. > 5490.) { - temp3 = temp3.tqarg(100); + temp3 = temp3.arg(100); } else if (freq / 1000000. > 5310.) { - temp3 = temp3.tqarg(64); + temp3 = temp3.arg(64); } else if (freq / 1000000. > 5290.) { - temp3 = temp3.tqarg(60); + temp3 = temp3.arg(60); } else if (freq / 1000000. > 5270.) { - temp3 = temp3.tqarg(56); + temp3 = temp3.arg(56); } else if (freq / 1000000. > 5250.) { - temp3 = temp3.tqarg(52); + temp3 = temp3.arg(52); } else if (freq / 1000000. > 5230.) { - temp3 = temp3.tqarg(48); + temp3 = temp3.arg(48); } else if (freq / 1000000. > 5210.) { - temp3 = temp3.tqarg(44); + temp3 = temp3.arg(44); } else if (freq / 1000000. > 5190.) { - temp3 = temp3.tqarg(40); + temp3 = temp3.arg(40); } else if (freq / 1000000. > 5170.) { - temp3 = temp3.tqarg(36); + temp3 = temp3.arg(36); } else if (freq / 1000000. > 2474.) { |