summaryrefslogtreecommitdiffstats
path: root/kwallet
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:59:52 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-04 03:15:15 +0200
commit632b7d40cf87562965abb5c7dffc1bae509bad2c (patch)
tree65cd81a82890e9be95bf2ad49d1174a36369ff4d /kwallet
parent7ee38ebc22d177c8f0f4805d0e8479736ec94f79 (diff)
downloadtdeutils-632b7d40cf87562965abb5c7dffc1bae509bad2c.tar.gz
tdeutils-632b7d40cf87562965abb5c7dffc1bae509bad2c.zip
Remove additional unneeded tq method conversions
(cherry picked from commit 7ea89afa119615e547323a7a482ea7fef8e67029)
Diffstat (limited to 'kwallet')
-rw-r--r--kwallet/allyourbase.cpp8
-rw-r--r--kwallet/kwalleteditor.cpp44
-rw-r--r--kwallet/kwalletmanager.cpp10
-rw-r--r--kwallet/walletwidget.ui4
4 files changed, 33 insertions, 33 deletions
diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp
index 328e0d5..d06898c 100644
--- a/kwallet/allyourbase.cpp
+++ b/kwallet/allyourbase.cpp
@@ -40,7 +40,7 @@
*/
KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString &name, int entries)
: KListViewItem(parent),_wallet(w),_name(name),_entries(entries) {
- setText(0, TQString("%1 (%2)").tqarg(_name).tqarg(_entries));
+ setText(0, TQString("%1 (%2)").arg(_name).arg(_entries));
setRenameEnabled(0, false);
setDragEnabled(true);
setDropEnabled(true);
@@ -66,7 +66,7 @@ TQPixmap KWalletFolderItem::getFolderIcon(KIcon::Group group){
void KWalletFolderItem::refresh() {
TQString saveFolder = _wallet->currentFolder();
_wallet->setFolder(_name);
- setText(0, TQString("%1 (%2)").tqarg(_name).tqarg(_wallet->entryList().count()));
+ setText(0, TQString("%1 (%2)").arg(_name).arg(_wallet->entryList().count()));
_wallet->setFolder(saveFolder);
}
@@ -194,7 +194,7 @@ static bool decodeEntry(KWallet::Wallet *_wallet, TQDataStream& ds) {
KWallet::Wallet::EntryType et;
ds >> name;
if (_wallet->hasEntry(name)) {
- int rc = KMessageBox::warningContinueCancel(0L, i18n("An entry by the name '%1' already exists. Would you like to continue?").tqarg(name));
+ int rc = KMessageBox::warningContinueCancel(0L, i18n("An entry by the name '%1' already exists. Would you like to continue?").arg(name));
if (rc == KMessageBox::Cancel) {
return false;
}
@@ -217,7 +217,7 @@ static bool decodeFolder(KWallet::Wallet *_wallet, TQDataStream& ds) {
TQString folder;
ds >> folder;
if (_wallet->hasFolder(folder)) {
- int rc = KMessageBox::warningYesNoCancel(0L, i18n("A folder by the name '%1' already exists. What would you like to do?").tqarg(folder), TQString(), KStdGuiItem::cont(), i18n("Replace"));
+ int rc = KMessageBox::warningYesNoCancel(0L, i18n("A folder by the name '%1' already exists. What would you like to do?").arg(folder), TQString(), KStdGuiItem::cont(), i18n("Replace"));
if (rc == KMessageBox::Cancel) {
return false;
}
diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp
index e79610f..996f05e 100644
--- a/kwallet/kwalleteditor.cpp
+++ b/kwallet/kwalleteditor.cpp
@@ -293,7 +293,7 @@ void KWalletEditor::deleteFolder() {
return;
}
- int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the folder '%1' from the wallet?").tqarg(fi->name()),"",KStdGuiItem::del());
+ int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the folder '%1' from the wallet?").arg(fi->name()),"",KStdGuiItem::del());
if (rc == KMessageBox::Continue) {
bool rc = _w->removeFolder(fi->name());
if (!rc) {
@@ -366,7 +366,7 @@ void KWalletEditor::saveEntry() {
}
}
- KMessageBox::sorry(this, i18n("Error saving entry. Error code: %1").tqarg(rc));
+ KMessageBox::sorry(this, i18n("Error saving entry. Error code: %1").arg(rc));
}
@@ -402,7 +402,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
if (_w->readPassword(item->text(0), pass) == 0) {
_ww->_entryStack->raiseWidget(int(4));
_ww->_entryName->setText(i18n("Password: %1")
- .tqarg(item->text(0)));
+ .arg(item->text(0)));
_ww->_passwordValue->setText(pass);
_ww->_saveChanges->setEnabled(false);
_ww->_undoChanges->setEnabled(false);
@@ -413,7 +413,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
showHideMapEditorValue(false);
if (_w->readMap(item->text(0), _currentMap) == 0) {
_mapEditor->reload();
- _ww->_entryName->setText(i18n("Name-Value Map: %1").tqarg(item->text(0)));
+ _ww->_entryName->setText(i18n("Name-Value Map: %1").arg(item->text(0)));
_ww->_saveChanges->setEnabled(false);
_ww->_undoChanges->setEnabled(false);
}
@@ -422,7 +422,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
TQByteArray ba;
if (_w->readEntry(item->text(0), ba) == 0) {
_ww->_entryName->setText(i18n("Binary Data: %1")
- .tqarg(item->text(0)));
+ .arg(item->text(0)));
_ww->_saveChanges->setEnabled(false);
_ww->_undoChanges->setEnabled(false);
}
@@ -454,7 +454,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
if (fi) {
_currentFolder = fi->name();
- _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0)));
+ _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0)));
_ww->_iconTitle->setPixmap(fi->getFolderIcon(KIcon::Toolbar));
}
}
@@ -540,7 +540,7 @@ void KWalletEditor::updateEntries(const TQString& folder) {
}
fi->refresh();
if (fi->name() == _currentFolder) {
- _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0)));
+ _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0)));
}
if (!_entryList->selectedItem()) {
_ww->_entryName->clear();
@@ -700,7 +700,7 @@ void KWalletEditor::newEntry() {
abort();
}
fi->refresh();
- _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0)));
+ _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0)));
}
}
@@ -734,11 +734,11 @@ void KWalletEditor::listItemRenamed(TQListViewItem* item, int, const TQString& t
return;
}
if (ci->type() == KWallet::Wallet::Password) {
- _ww->_entryName->setText(i18n("Password: %1").tqarg(item->text(0)));
+ _ww->_entryName->setText(i18n("Password: %1").arg(item->text(0)));
} else if (ci->type() == KWallet::Wallet::Map) {
- _ww->_entryName->setText(i18n("Name-Value Map: %1").tqarg(item->text(0)));
+ _ww->_entryName->setText(i18n("Name-Value Map: %1").arg(item->text(0)));
} else if (ci->type() == KWallet::Wallet::Stream) {
- _ww->_entryName->setText(i18n("Binary Data: %1").tqarg(item->text(0)));
+ _ww->_entryName->setText(i18n("Binary Data: %1").arg(item->text(0)));
}
} else {
i->setText(0, i->oldName());
@@ -750,7 +750,7 @@ void KWalletEditor::listItemRenamed(TQListViewItem* item, int, const TQString& t
void KWalletEditor::deleteEntry() {
TQListViewItem *item = _entryList->selectedItem();
if (_w && item) {
- int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the item '%1'?").tqarg(item->text(0)),"",KStdGuiItem::del());
+ int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the item '%1'?").arg(item->text(0)),"",KStdGuiItem::del());
if (rc == KMessageBox::Continue) {
KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(item->parent()->parent());
if (!fi) {
@@ -761,7 +761,7 @@ void KWalletEditor::deleteEntry() {
delete item;
entrySelectionChanged(_entryList->currentItem());
fi->refresh();
- _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0)));
+ _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0)));
}
}
}
@@ -818,7 +818,7 @@ void KWalletEditor::importWallet() {
TQString tmpFile;
if (!KIO::NetAccess::download(url, tmpFile, this)) {
- KMessageBox::sorry(this, i18n("Unable to access wallet '<b>%1</b>'.").tqarg(url.prettyURL()));
+ KMessageBox::sorry(this, i18n("Unable to access wallet '<b>%1</b>'.").arg(url.prettyURL()));
return;
}
@@ -847,7 +847,7 @@ void KWalletEditor::importWallet() {
if (hasEntry && mp == Prompt) {
KBetterThanKDialogBase *bd;
bd = new KBetterThanKDialogBase(this);
- bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(TQStyleSheet::escape(me.key())));
+ bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(me.key())));
mp = (MergePlan)bd->exec();
delete bd;
bool ok = false;
@@ -877,7 +877,7 @@ void KWalletEditor::importWallet() {
if (hasEntry && mp == Prompt) {
KBetterThanKDialogBase *bd;
bd = new KBetterThanKDialogBase(this);
- bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(TQStyleSheet::escape(pe.key())));
+ bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(pe.key())));
mp = (MergePlan)bd->exec();
delete bd;
bool ok = false;
@@ -907,7 +907,7 @@ void KWalletEditor::importWallet() {
if (hasEntry && mp == Prompt) {
KBetterThanKDialogBase *bd;
bd = new KBetterThanKDialogBase(this);
- bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(TQStyleSheet::escape(ee.key())));
+ bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(ee.key())));
mp = (MergePlan)bd->exec();
delete bd;
bool ok = false;
@@ -946,20 +946,20 @@ void KWalletEditor::importXML() {
TQString tmpFile;
if (!KIO::NetAccess::download(url, tmpFile, this)) {
- KMessageBox::sorry(this, i18n("Unable to access XML file '<b>%1</b>'.").tqarg(url.prettyURL()));
+ KMessageBox::sorry(this, i18n("Unable to access XML file '<b>%1</b>'.").arg(url.prettyURL()));
return;
}
TQFile qf(tmpFile);
if (!qf.open(IO_ReadOnly)) {
- KMessageBox::sorry(this, i18n("Error opening XML file '<b>%1</b>' for input.").tqarg(url.prettyURL()));
+ KMessageBox::sorry(this, i18n("Error opening XML file '<b>%1</b>' for input.").arg(url.prettyURL()));
KIO::NetAccess::removeTempFile(tmpFile);
return;
}
TQDomDocument doc(tmpFile);
if (!doc.setContent(&qf)) {
- KMessageBox::sorry(this, i18n("Error reading XML file '<b>%1</b>' for input.").tqarg(url.prettyURL()));
+ KMessageBox::sorry(this, i18n("Error reading XML file '<b>%1</b>' for input.").arg(url.prettyURL()));
KIO::NetAccess::removeTempFile(tmpFile);
return;
}
@@ -998,7 +998,7 @@ void KWalletEditor::importXML() {
if (hasEntry && mp == Prompt) {
KBetterThanKDialogBase *bd;
bd = new KBetterThanKDialogBase(this);
- bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(fname)).tqarg(TQStyleSheet::escape(ename)));
+ bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").arg(TQStyleSheet::escape(fname)).arg(TQStyleSheet::escape(ename)));
mp = (MergePlan)bd->exec();
delete bd;
bool ok = false;
@@ -1106,7 +1106,7 @@ void KWalletEditor::exportXML() {
if (!url.isEmpty()) {
bool ok = true;
if (KIO::NetAccess::exists(url, false, this)) {
- int rc = KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists. Would you like to overwrite this file?").tqarg(url.prettyURL()), i18n("Overwrite"));
+ int rc = KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists. Would you like to overwrite this file?").arg(url.prettyURL()), i18n("Overwrite"));
if (rc == KMessageBox::Cancel) {
ok = false;
}
diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp
index d65dcd2..89de393 100644
--- a/kwallet/kwalletmanager.cpp
+++ b/kwallet/kwalletmanager.cpp
@@ -220,13 +220,13 @@ void KWalletManager::contextMenu(TQIconViewItem *item, const TQPoint& pos) {
void KWalletManager::deleteWallet(const TQString& walletName) {
- int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the wallet '%1'?").tqarg(walletName),"",KStdGuiItem::del());
+ int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the wallet '%1'?").arg(walletName),"",KStdGuiItem::del());
if (rc != KMessageBox::Continue) {
return;
}
rc = KWallet::Wallet::deleteWallet(walletName);
if (rc != 0) {
- KMessageBox::sorry(this, i18n("Unable to delete the wallet. Error code was %1.").tqarg(rc));
+ KMessageBox::sorry(this, i18n("Unable to delete the wallet. Error code was %1.").arg(rc));
}
updateWalletDisplay();
}
@@ -239,7 +239,7 @@ void KWalletManager::closeWallet(const TQString& walletName) {
if (rc == KMessageBox::Yes) {
rc = KWallet::Wallet::closeWallet(walletName, true);
if (rc != 0) {
- KMessageBox::sorry(this, i18n("Unable to force the wallet closed. Error code was %1.").tqarg(rc));
+ KMessageBox::sorry(this, i18n("Unable to force the wallet closed. Error code was %1.").arg(rc));
}
}
}
@@ -260,7 +260,7 @@ void KWalletManager::openWalletFile(const TQString& path) {
this, TQT_SLOT(editorClosed(KMainWindow*)));
we->show();
} else {
- KMessageBox::sorry(this, i18n("Error opening wallet %1.").tqarg(path));
+ KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(path));
delete we;
}
}
@@ -302,7 +302,7 @@ void KWalletManager::openWallet(const TQString& walletName, bool newWallet) {
we->show();
_windows.append(we);
} else if (!newWallet) {
- KMessageBox::sorry(this, i18n("Error opening wallet %1.").tqarg(walletName));
+ KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(walletName));
delete we;
}
}
diff --git a/kwallet/walletwidget.ui b/kwallet/walletwidget.ui
index fad3875..2d34c3e 100644
--- a/kwallet/walletwidget.ui
+++ b/kwallet/walletwidget.ui
@@ -150,7 +150,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>
@@ -268,7 +268,7 @@
<property name="text">
<string>This is a binary data entry. It cannot be editted as its format is unknown and application specific.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>