From 955e20356d63ed405198c8143617a8a0ca8bfc02 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:17 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit bf280726d5d22f33d33e4f9e771220c725249407. --- kwallet/allyourbase.cpp | 20 +++++------ kwallet/kbetterthankdialogbase.ui | 6 ++-- kwallet/konfigurator/konfigurator.cpp | 2 +- kwallet/konfigurator/walletconfigwidget.ui | 12 +++---- kwallet/kwalleteditor.cpp | 58 +++++++++++++++--------------- kwallet/kwalleteditor.h | 2 +- kwallet/kwalletmanager.cpp | 10 +++--- kwallet/kwmapeditor.cpp | 8 ++--- kwallet/walletwidget.ui | 24 ++++++------- 9 files changed, 71 insertions(+), 71 deletions(-) (limited to 'kwallet') diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp index d06898c..c031b35 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)").arg(_name).arg(_entries)); + setText(0, TQString("%1 (%2)").tqarg(_name).tqarg(_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)").arg(_name).arg(_wallet->entryList().count())); + setText(0, TQString("%1 (%2)").tqarg(_name).tqarg(_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?").arg(name)); + int rc = KMessageBox::warningContinueCancel(0L, i18n("An entry by the name '%1' already exists. Would you like to continue?").tqarg(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?").arg(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?").tqarg(folder), TQString(), KStdGuiItem::cont(), i18n("Replace")); if (rc == KMessageBox::Cancel) { return false; } @@ -263,7 +263,7 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList& lst TQDataStream *ds = 0L; if (e->provides("application/x-kwallet-folder")) { - TQByteArray edata = e->encodedData("application/x-kwallet-folder"); + TQByteArray edata = e->tqencodedData("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->encodedData("application/x-kwallet-entry"); + TQByteArray data = e->tqencodedData("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->encodedData("application/x-kwallet-folder"); + TQByteArray data = e->tqencodedData("application/x-kwallet-folder"); if (data.isEmpty()) { e->ignore(); return; @@ -589,11 +589,11 @@ class KWalletIconDrag : public TQIconDrag { return 0L; } - TQByteArray encodedData(const char *mime) const { + TQByteArray tqencodedData(const char *mime) const { TQByteArray a; TQCString mimetype(mime); if (mimetype == "application/x-qiconlist") { - return TQIconDrag::encodedData(mime); + return TQIconDrag::tqencodedData(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 TQValueListencodedData("text/uri-list"); + TQByteArray edata = e->tqencodedData("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 65d8b5a..0b421c7 100644 --- a/kwallet/kbetterthankdialogbase.ui +++ b/kwallet/kbetterthankdialogbase.ui @@ -37,7 +37,7 @@ Expanding - + 41 21 @@ -46,7 +46,7 @@ - layout1 + tqlayout1 @@ -99,7 +99,7 @@ Expanding - + 61 21 diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp index c6429cc..fd058ad 100644 --- a/kwallet/konfigurator/konfigurator.cpp +++ b/kwallet/konfigurator/konfigurator.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/kwallet/konfigurator/walletconfigwidget.ui b/kwallet/konfigurator/walletconfigwidget.ui index da3a642..eaf5cf2 100644 --- a/kwallet/konfigurator/walletconfigwidget.ui +++ b/kwallet/konfigurator/walletconfigwidget.ui @@ -64,7 +64,7 @@ - layout1 + tqlayout1 @@ -133,7 +133,7 @@ Expanding - + 20 20 @@ -187,7 +187,7 @@ Expanding - + 20 20 @@ -281,7 +281,7 @@ Fixed - + 20 20 @@ -319,7 +319,7 @@ Expanding - + 31 16 @@ -415,7 +415,7 @@ Expanding - + 369 21 diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp index ec07768..e79610f 100644 --- a/kwallet/kwalleteditor.cpp +++ b/kwallet/kwalleteditor.cpp @@ -47,15 +47,15 @@ #include #include -#include +#include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include @@ -133,7 +133,7 @@ KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *pare setCaption(wallet); - TQTimer::singleShot(0, this, TQT_SLOT(layout())); + TQTimer::singleShot(0, this, TQT_SLOT(tqlayout())); } KWalletEditor::~KWalletEditor() { @@ -149,7 +149,7 @@ KWalletEditor::~KWalletEditor() { } } -void KWalletEditor::layout() { +void KWalletEditor::tqlayout() { TQValueList 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?").arg(fi->name()),"",KStdGuiItem::del()); + int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the folder '%1' from the wallet?").tqarg(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").arg(rc)); + KMessageBox::sorry(this, i18n("Error saving entry. Error code: %1").tqarg(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") - .arg(item->text(0))); + .tqarg(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").arg(item->text(0))); + _ww->_entryName->setText(i18n("Name-Value Map: %1").tqarg(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") - .arg(item->text(0))); + .tqarg(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("%1").arg(fi->text(0))); + _ww->_entryTitle->setText(TQString("%1").tqarg(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("%1").arg(fi->text(0))); + _ww->_entryTitle->setText(TQString("%1").tqarg(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::clipboard()->setText(pass); + TQApplication::tqclipboard()->setText(pass); } } } @@ -700,7 +700,7 @@ void KWalletEditor::newEntry() { abort(); } fi->refresh(); - _ww->_entryTitle->setText(TQString("%1").arg(fi->text(0))); + _ww->_entryTitle->setText(TQString("%1").tqarg(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").arg(item->text(0))); + _ww->_entryName->setText(i18n("Password: %1").tqarg(item->text(0))); } else if (ci->type() == KWallet::Wallet::Map) { - _ww->_entryName->setText(i18n("Name-Value Map: %1").arg(item->text(0))); + _ww->_entryName->setText(i18n("Name-Value Map: %1").tqarg(item->text(0))); } else if (ci->type() == KWallet::Wallet::Stream) { - _ww->_entryName->setText(i18n("Binary Data: %1").arg(item->text(0))); + _ww->_entryName->setText(i18n("Binary Data: %1").tqarg(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'?").arg(item->text(0)),"",KStdGuiItem::del()); + int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the item '%1'?").tqarg(item->text(0)),"",KStdGuiItem::del()); if (rc == KMessageBox::Continue) { KWalletFolderItem *fi = dynamic_cast(item->parent()->parent()); if (!fi) { @@ -761,7 +761,7 @@ void KWalletEditor::deleteEntry() { delete item; entrySelectionChanged(_entryList->currentItem()); fi->refresh(); - _ww->_entryTitle->setText(TQString("%1").arg(fi->text(0))); + _ww->_entryTitle->setText(TQString("%1").tqarg(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 '%1'.").arg(url.prettyURL())); + KMessageBox::sorry(this, i18n("Unable to access wallet '%1'.").tqarg(url.prettyURL())); return; } @@ -847,7 +847,7 @@ void KWalletEditor::importWallet() { if (hasEntry && mp == Prompt) { KBetterThanKDialogBase *bd; bd = new KBetterThanKDialogBase(this); - bd->setLabel(i18n("Folder '%1' already contains an entry '%2'. Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(me.key()))); + bd->setLabel(i18n("Folder '%1' already contains an entry '%2'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(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 '%1' already contains an entry '%2'. Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(pe.key()))); + bd->setLabel(i18n("Folder '%1' already contains an entry '%2'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(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 '%1' already contains an entry '%2'. Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(ee.key()))); + bd->setLabel(i18n("Folder '%1' already contains an entry '%2'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(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 '%1'.").arg(url.prettyURL())); + KMessageBox::sorry(this, i18n("Unable to access XML file '%1'.").tqarg(url.prettyURL())); return; } TQFile qf(tmpFile); if (!qf.open(IO_ReadOnly)) { - KMessageBox::sorry(this, i18n("Error opening XML file '%1' for input.").arg(url.prettyURL())); + KMessageBox::sorry(this, i18n("Error opening XML file '%1' for input.").tqarg(url.prettyURL())); KIO::NetAccess::removeTempFile(tmpFile); return; } TQDomDocument doc(tmpFile); if (!doc.setContent(&qf)) { - KMessageBox::sorry(this, i18n("Error reading XML file '%1' for input.").arg(url.prettyURL())); + KMessageBox::sorry(this, i18n("Error reading XML file '%1' for input.").tqarg(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 '%1' already contains an entry '%2'. Do you wish to replace it?").arg(TQStyleSheet::escape(fname)).arg(TQStyleSheet::escape(ename))); + bd->setLabel(i18n("Folder '%1' already contains an entry '%2'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(fname)).tqarg(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?").arg(url.prettyURL()), i18n("Overwrite")); + int rc = KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists. Would you like to overwrite this file?").tqarg(url.prettyURL()), i18n("Overwrite")); if (rc == KMessageBox::Cancel) { ok = false; } diff --git a/kwallet/kwalleteditor.h b/kwallet/kwalleteditor.h index d38f4a2..02f1342 100644 --- a/kwallet/kwalleteditor.h +++ b/kwallet/kwalleteditor.h @@ -52,7 +52,7 @@ class KWalletEditor : public KMainWindow { void deleteFolder(); private slots: - void layout(); + void tqlayout(); 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 89de393..d65dcd2 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'?").arg(walletName),"",KStdGuiItem::del()); + int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the wallet '%1'?").tqarg(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.").arg(rc)); + KMessageBox::sorry(this, i18n("Unable to delete the wallet. Error code was %1.").tqarg(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.").arg(rc)); + KMessageBox::sorry(this, i18n("Unable to force the wallet closed. Error code was %1.").tqarg(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.").arg(path)); + KMessageBox::sorry(this, i18n("Error opening wallet %1.").tqarg(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.").arg(walletName)); + KMessageBox::sorry(this, i18n("Error opening wallet %1.").tqarg(walletName)); delete we; } } diff --git a/kwallet/kwmapeditor.cpp b/kwallet/kwmapeditor.cpp index dc6d4fb..d5a9722 100644 --- a/kwallet/kwmapeditor.cpp +++ b/kwallet/kwmapeditor.cpp @@ -27,9 +27,9 @@ #include #include -#include +#include #include -#include +#include KWMapEditor::KWMapEditor(TQMap& 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::clipboard()->setText(text(_contextRow, 2)); + TQApplication::tqclipboard()->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->focusWidget(); + TQWidget *focusW = tqApp->tqfocusWidget(); if (focusW && focusW == popup) { return; } diff --git a/kwallet/walletwidget.ui b/kwallet/walletwidget.ui index 9979097..dbe761e 100644 --- a/kwallet/walletwidget.ui +++ b/kwallet/walletwidget.ui @@ -47,7 +47,7 @@ - layout3 + tqlayout3 @@ -82,7 +82,7 @@ Expanding - + 227 21 @@ -105,7 +105,7 @@ - layout2 + tqlayout2 @@ -150,7 +150,7 @@ RichText - + AlignVCenter @@ -222,7 +222,7 @@ Expanding - + 271 20 @@ -268,7 +268,7 @@ This is a binary data entry. It cannot be editted as its format is unknown and application specific. - + WordBreak|AlignVCenter @@ -282,7 +282,7 @@ Expanding - + 31 41 @@ -299,7 +299,7 @@ Expanding - + 31 41 @@ -316,7 +316,7 @@ Expanding - + 61 41 @@ -333,7 +333,7 @@ Expanding - + 41 21 @@ -366,7 +366,7 @@ Expanding - + 236 21 @@ -383,7 +383,7 @@ Expanding - + 31 358 -- cgit v1.2.1