summaryrefslogtreecommitdiffstats
path: root/kwallet
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:52 -0600
commitbf280726d5d22f33d33e4f9e771220c725249407 (patch)
tree48b7496821910eb85179d543acee981cf5d16dd8 /kwallet
parentc78266617c282543427d2c000b3b68fe2b6b6722 (diff)
downloadtdeutils-bf280726d5d22f33d33e4f9e771220c725249407.tar.gz
tdeutils-bf280726d5d22f33d33e4f9e771220c725249407.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kwallet')
-rw-r--r--kwallet/allyourbase.cpp20
-rw-r--r--kwallet/kbetterthankdialogbase.ui6
-rw-r--r--kwallet/konfigurator/konfigurator.cpp2
-rw-r--r--kwallet/konfigurator/walletconfigwidget.ui12
-rw-r--r--kwallet/kwalleteditor.cpp58
-rw-r--r--kwallet/kwalleteditor.h2
-rw-r--r--kwallet/kwalletmanager.cpp10
-rw-r--r--kwallet/kwmapeditor.cpp8
-rw-r--r--kwallet/walletwidget.ui24
9 files changed, 71 insertions, 71 deletions
diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp
index c031b35..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;
}
@@ -263,7 +263,7 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst
TQDataStream *ds = 0L;
if (e->provides("application/x-kwallet-folder")) {
- TQByteArray edata = e->tqencodedData("application/x-kwallet-folder");
+ TQByteArray edata = e->encodedData("application/x-kwallet-folder");
if (!edata.isEmpty()) {
ds = new TQDataStream(edata, IO_ReadOnly);
}
@@ -407,7 +407,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
return;
}
isEntry = true;
- TQByteArray data = e->tqencodedData("application/x-kwallet-entry");
+ TQByteArray data = e->encodedData("application/x-kwallet-entry");
if (data.isEmpty()) {
e->ignore();
return;
@@ -420,7 +420,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
return;
}
isEntry = false;
- TQByteArray data = e->tqencodedData("application/x-kwallet-folder");
+ TQByteArray data = e->encodedData("application/x-kwallet-folder");
if (data.isEmpty()) {
e->ignore();
return;
@@ -589,11 +589,11 @@ class KWalletIconDrag : public TQIconDrag {
return 0L;
}
- TQByteArray tqencodedData(const char *mime) const {
+ TQByteArray encodedData(const char *mime) const {
TQByteArray a;
TQCString mimetype(mime);
if (mimetype == "application/x-qiconlist") {
- return TQIconDrag::tqencodedData(mime);
+ return TQIconDrag::encodedData(mime);
} else if (mimetype == "text/uri-list") {
TQCString s = _urls.join("\r\n").latin1();
if (_urls.count() > 0) {
@@ -638,7 +638,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueList<TQIconDragIt
return;
}
- TQByteArray edata = e->tqencodedData("text/uri-list");
+ TQByteArray edata = e->encodedData("text/uri-list");
TQCString urls = edata.data();
TQStringList ul = TQStringList::split("\r\n", urls);
diff --git a/kwallet/kbetterthankdialogbase.ui b/kwallet/kbetterthankdialogbase.ui
index 0b421c7..65d8b5a 100644
--- a/kwallet/kbetterthankdialogbase.ui
+++ b/kwallet/kbetterthankdialogbase.ui
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -46,7 +46,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp
index fd058ad..c6429cc 100644
--- a/kwallet/konfigurator/konfigurator.cpp
+++ b/kwallet/konfigurator/konfigurator.cpp
@@ -32,7 +32,7 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistview.h>
#include <tqpushbutton.h>
#include <tqspinbox.h>
diff --git a/kwallet/konfigurator/walletconfigwidget.ui b/kwallet/konfigurator/walletconfigwidget.ui
index eaf5cf2..da3a642 100644
--- a/kwallet/konfigurator/walletconfigwidget.ui
+++ b/kwallet/konfigurator/walletconfigwidget.ui
@@ -64,7 +64,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -187,7 +187,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -281,7 +281,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -319,7 +319,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>16</height>
@@ -415,7 +415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>369</width>
<height>21</height>
diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp
index e79610f..ec07768 100644
--- a/kwallet/kwalleteditor.cpp
+++ b/kwallet/kwalleteditor.cpp
@@ -47,15 +47,15 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlistview.h>
#include <tqptrstack.h>
#include <tqpushbutton.h>
-#include <tqstylesheet.h>
-#include <tqtextedit.h>
+#include <stylesheet.h>
+#include <textedit.h>
#include <tqtimer.h>
#include <tqwidgetstack.h>
@@ -133,7 +133,7 @@ KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *pare
setCaption(wallet);
- TQTimer::singleShot(0, this, TQT_SLOT(tqlayout()));
+ TQTimer::singleShot(0, this, TQT_SLOT(layout()));
}
KWalletEditor::~KWalletEditor() {
@@ -149,7 +149,7 @@ KWalletEditor::~KWalletEditor() {
}
}
-void KWalletEditor::tqlayout() {
+void KWalletEditor::layout() {
TQValueList<int> sz = _ww->_splitter->sizes();
int sum = sz[0] + sz[1];
sz[0] = sum/2;
@@ -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();
@@ -617,7 +617,7 @@ void KWalletEditor::copyPassword() {
if (_w && item) {
TQString pass;
if (_w->readPassword(item->text(0), pass) == 0) {
- TQApplication::tqclipboard()->setText(pass);
+ TQApplication::clipboard()->setText(pass);
}
}
}
@@ -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/kwalleteditor.h b/kwallet/kwalleteditor.h
index 02f1342..d38f4a2 100644
--- a/kwallet/kwalleteditor.h
+++ b/kwallet/kwalleteditor.h
@@ -52,7 +52,7 @@ class KWalletEditor : public KMainWindow {
void deleteFolder();
private slots:
- void tqlayout();
+ void layout();
void updateFolderList(bool checkEntries = false);
void entrySelectionChanged(TQListViewItem *item);
void listItemRenamed(TQListViewItem *, int, const TQString&);
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/kwmapeditor.cpp b/kwallet/kwmapeditor.cpp
index d5a9722..dc6d4fb 100644
--- a/kwallet/kwmapeditor.cpp
+++ b/kwallet/kwmapeditor.cpp
@@ -27,9 +27,9 @@
#include <twin.h>
#include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqpushbutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name)
: TQTable(0, 3, parent, name), _map(map) {
@@ -125,7 +125,7 @@ void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) {
void KWMapEditor::copy() {
- TQApplication::tqclipboard()->setText(text(_contextRow, 2));
+ TQApplication::clipboard()->setText(text(_contextRow, 2));
}
@@ -142,7 +142,7 @@ class InlineEditor : public TQTextEdit {
protected:
virtual void focusOutEvent(TQFocusEvent* fe) {
if (fe->reason() == TQFocusEvent::Popup) {
- TQWidget *focusW = tqApp->tqfocusWidget();
+ TQWidget *focusW = tqApp->focusWidget();
if (focusW && focusW == popup) {
return;
}
diff --git a/kwallet/walletwidget.ui b/kwallet/walletwidget.ui
index dbe761e..9979097 100644
--- a/kwallet/walletwidget.ui
+++ b/kwallet/walletwidget.ui
@@ -47,7 +47,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>227</width>
<height>21</height>
@@ -105,7 +105,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -150,7 +150,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>
@@ -222,7 +222,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>271</width>
<height>20</height>
@@ -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>
@@ -282,7 +282,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>41</height>
@@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>41</height>
@@ -316,7 +316,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>41</height>
@@ -333,7 +333,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -366,7 +366,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>236</width>
<height>21</height>
@@ -383,7 +383,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>358</height>