From 4432e0a1145b0ef95d741fea6d04b565f36fa626 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:35:00 -0600 Subject: [PATCH] Remove additional unneeded tq method conversions (cherry picked from commit 522c7294f06d294c77bc1ea7d0dec4b371c43373) --- src/archive.cpp | 4 ++-- src/backup.cpp | 26 +++++++++++------------ src/basket.cpp | 26 +++++++++++------------ src/basketfactory.cpp | 4 ++-- src/basketlistview.cpp | 44 +++++++++++++++++++-------------------- src/bnpview.cpp | 24 ++++++++++----------- src/crashhandler.cpp | 16 +++++++------- src/formatimporter.cpp | 4 ++-- src/htmlexporter.cpp | 18 ++++++++-------- src/kcolorcombo2.cpp | 2 +- src/kgpgme.cpp | 18 ++++++++-------- src/kiconcanvas.cpp | 2 +- src/likeback.cpp | 6 +++--- src/linklabel.cpp | 18 ++++++++-------- src/mainwindow.cpp | 2 +- src/notecontent.cpp | 32 ++++++++++++++-------------- src/noteedit.cpp | 8 +++---- src/notefactory.cpp | 8 +++---- src/password.cpp | 2 +- src/qeffects.cpp | 24 ++++++++++----------- src/regiongrabber.cpp | 10 ++++----- src/settings.cpp | 4 ++-- src/softwareimporters.cpp | 2 +- src/systemtray.cpp | 4 ++-- src/tag.cpp | 22 ++++++++++---------- src/tagsedit.cpp | 6 +++--- src/variouswidgets.cpp | 2 +- 27 files changed, 169 insertions(+), 169 deletions(-) diff --git a/src/archive.cpp b/src/archive.cpp index 6345a00..6f57f87 100644 --- a/src/archive.cpp +++ b/src/archive.cpp @@ -313,7 +313,7 @@ void Archive::open(const TQString &path) "It can be opened but not every information will be available to you. " "For instance, some notes may be missing because they are of a type only available in new versions. " "When saving the file back, consider to save it to another file, to preserve the original one.") - .tqarg(kapp->aboutData()->programName()), + .arg(kapp->aboutData()->programName()), i18n("Basket Archive Error") ); } @@ -321,7 +321,7 @@ void Archive::open(const TQString &path) KMessageBox::error( 0, i18n("This file was created with a recent version of %1. Please upgrade to a newer version to be able to open that file.") - .tqarg(kapp->aboutData()->programName()), + .arg(kapp->aboutData()->programName()), i18n("Basket Archive Error") ); file.close(); diff --git a/src/backup.cpp b/src/backup.cpp index d49313a..807ac35 100644 --- a/src/backup.cpp +++ b/src/backup.cpp @@ -65,7 +65,7 @@ BackupDialog::BackupDialog(TQWidget *parent, const char *name) savesFolder = savesFolder.left(savesFolder.length() - 1); // savesFolder ends with "/" TQGroupBox *folderGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Save Folder"), page); - new TQLabel("" + i18n("Your baskets are currently stored in that folder:
%1").tqarg(savesFolder), folderGroup); + new TQLabel("" + i18n("Your baskets are currently stored in that folder:
%1").arg(savesFolder), folderGroup); TQWidget *folderWidget = new TQWidget(folderGroup); TQHBoxLayout *folderLayout = new TQHBoxLayout(folderWidget, 0, spacingHint()); TQPushButton *moveFolder = new TQPushButton(i18n("&Move to Another Folder..."), folderWidget); @@ -77,9 +77,9 @@ BackupDialog::BackupDialog(TQWidget *parent, const char *name) "In this case, mount the shared-folder to the local file system and ask %2 to use that mount point.
" "Warning: you should not run %3 at the same time on both computers, or you risk to loss data while the two applications are desynced." "

Please remember that you should not change the content of that folder manually (eg. adding a file in a basket folder will not add that file to the basket).

") - .tqarg(kapp->aboutData()->programName()) - .tqarg(kapp->aboutData()->programName()) - .tqarg(kapp->aboutData()->programName()), + .arg(kapp->aboutData()->programName()) + .arg(kapp->aboutData()->programName()) + .arg(kapp->aboutData()->programName()), folderWidget); folderLayout->addWidget(moveFolder); folderLayout->addWidget(useFolder); @@ -114,7 +114,7 @@ void BackupDialog::populateLastBackup() { TQString lastBackupText = i18n("Last backup: never"); if (Settings::lastBackup().isValid()) - lastBackupText = i18n("Last backup: %1").tqarg(Settings::lastBackup().toString(Qt::LocalDate)); + lastBackupText = i18n("Last backup: %1").arg(Settings::lastBackup().toString(Qt::LocalDate)); m_lastBackup->setText(lastBackupText); } @@ -135,7 +135,7 @@ void BackupDialog::moveToAnotherFolder() if (content.count() > 2) { // "." and ".." int result = KMessageBox::questionYesNo( 0, - "" + i18n("The folder %1 is not empty. Do you want to override it?").tqarg(folder), + "" + i18n("The folder %1 is not empty. Do you want to override it?").arg(folder), i18n("Override Folder?"), KGuiItem(i18n("&Override"), "filesave") ); @@ -170,7 +170,7 @@ void BackupDialog::backup() config->setGroup("Backups"); TQString folder = config->readEntry("lastFolder", TQDir::homeDirPath()) + "/"; TQString fileName = i18n("Backup filename (without extension), %1 is the date", "Baskets_%1") - .tqarg(TQDate::currentDate().toString(Qt::ISODate)); + .arg(TQDate::currentDate().toString(Qt::ISODate)); TQString url = folder + fileName; // Ask a file name & path to the user: @@ -187,7 +187,7 @@ void BackupDialog::backup() int result = KMessageBox::questionYesNoCancel( 0, "" + i18n("The file %1 already exists. Do you really want to override it?") - .tqarg(KURL(destination).fileName()), + .arg(KURL(destination).fileName()), i18n("Override File?"), KGuiItem(i18n("&Override"), "filesave") ); @@ -245,7 +245,7 @@ void BackupDialog::restore() TQFile file(readmePath); if (file.open(IO_WriteOnly)) { TQTextStream stream(&file); - stream << i18n("This is a safety copy of your baskets like they were before you started to restore the backup %1.").tqarg(KURL(path).fileName()) + "\n\n" + stream << i18n("This is a safety copy of your baskets like they were before you started to restore the backup %1.").arg(KURL(path).fileName()) + "\n\n" << i18n("If the restoration was a success and you restored what you wanted to restore, you can remove this folder.") + "\n\n" << i18n("If something went wrong during the restoration process, you can re-use this folder to store your baskets and nothing will be lost.") + "\n\n" << i18n("Choose \"Basket\" -> \"Backup & Restore...\" -> \"Use Another Existing Folder...\" and select that folder.") + "\n"; @@ -253,8 +253,8 @@ void BackupDialog::restore() } TQString message = - "

" + i18n("Restoring %1. Please wait...").tqarg(KURL(path).fileName()) + "

" + - i18n("If something goes wrong during the restoration process, read the file %1.").tqarg(readmePath); + "

" + i18n("Restoring %1. Please wait...").arg(KURL(path).fileName()) + "

" + + i18n("If something goes wrong during the restoration process, read the file %1.").arg(readmePath); KProgressDialog *dialog = new KProgressDialog(0, 0, i18n("Restore Baskets"), message, /*modal=*/true); dialog->setAllowCancel(false); @@ -332,7 +332,7 @@ void Backup::setFolderAndRestart(const TQString &folder, const TQString &message // This is important for users to trust the application in such a critical phase and understands what's happening: KMessageBox::information( 0, - "" + message.tqarg( + "" + message.arg( (folder.endsWith("/") ? folder.left(folder.length() - 1) : folder), kapp->aboutData()->programName()), i18n("Restart") @@ -353,7 +353,7 @@ TQString Backup::newSafetyFolder() return fullPath; for (int i = 2; ; ++i) { - fullPath = TQDir::homeDirPath() + "/" + i18n("Safety folder name before restoring a basket data archive", "Baskets Before Restoration (%1)").tqarg(i) + "/"; + fullPath = TQDir::homeDirPath() + "/" + i18n("Safety folder name before restoring a basket data archive", "Baskets Before Restoration (%1)").arg(i) + "/"; if (!dir.exists(fullPath)) return fullPath; } diff --git a/src/basket.cpp b/src/basket.cpp index 73aef51..370c10e 100644 --- a/src/basket.cpp +++ b/src/basket.cpp @@ -2533,7 +2533,7 @@ void Basket::doAutoScrollSelection() dx = pos.x() - visibleWidth() + AUTO_SCROLL_MARGIN; if (dx || dy) { - kapp->sendPostedEvents(); // Do the repaints, because the scrolling will make the area to tqrepaint to be wrong + kapp->sendPostedEvents(); // Do the repaints, because the scrolling will make the area to repaint to be wrong scrollBy(dx, dy); if (!m_autoScrollSelectionTimer.isActive()) m_autoScrollSelectionTimer.start(AUTO_SCROLL_DELAY); @@ -2707,7 +2707,7 @@ void Basket::mouseEnteredEditorWidget() void Basket::removeInserter() { - if (m_inserterShown) { // Do not hide (and then update/tqrepaint the view) if it is already hidden! + if (m_inserterShown) { // Do not hide (and then update/repaint the view) if it is already hidden! m_inserterShown = false; updateContents(m_inserterRect); } @@ -2836,9 +2836,9 @@ void Basket::maybeTip(const TQPoint &pos) if (tagsString.isEmpty()) tagsString = tagName; else - tagsString = i18n("%1, %2").tqarg(tagsString, tagName); + tagsString = i18n("%1, %2").arg(tagsString, tagName); } - message = message.tqarg(tagsString); + message = message.arg(tagsString); } break; case Note::Custom0: message = note->content()->zoneTip(zone); break; //"Open this link/Open this file/Open this sound file/Launch this application" @@ -2875,7 +2875,7 @@ void Basket::maybeTip(const TQPoint &pos) TQStringList::iterator key; TQStringList::iterator value; for (key = keys.begin(), value = values.begin(); key != keys.end() && value != values.end(); ++key, ++value) - message += "
" + i18n("of the form 'key: value'", "%1: %2").tqarg(*key, *value); + message += "
" + i18n("of the form 'key: value'", "%1: %2").arg(*key, *value); message += ""; } else if (m_inserterSplit && (zone == Note::TopInsert || zone == Note::BottomInsert)) message += "\n" + i18n("Click on the right to group instead of insert"); @@ -3083,7 +3083,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt #ifdef HAVE_LIBGPGME label->setText( text + i18n("Press Unlock to access it.") ); #else - label->setText( text + i18n("Encryption is not supported by
this version of %1.").tqarg(kapp->aboutData()->programName()) ); + label->setText( text + i18n("Encryption is not supported by
this version of %1.").arg(kapp->aboutData()->programName()) ); #endif label->setAlignment( int( TQLabel::AlignTop ) ); tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 ); @@ -3132,7 +3132,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt if (!m_loaded) { TQPixmap pixmap(visibleWidth(), visibleHeight()); // TODO: Clip it to asked size only! TQPainter painter2(&pixmap); - TQSimpleRichText rt(TQString("

%1
").tqarg(i18n("Loading...")), TQScrollView::font()); + TQSimpleRichText rt(TQString("
%1
").arg(i18n("Loading...")), TQScrollView::font()); rt.setWidth(visibleWidth()); int hrt = rt.height(); painter2.fillRect(0, 0, visibleWidth(), visibleHeight(), brush); @@ -5001,13 +5001,13 @@ void Basket::keyPressEvent(TQKeyEvent *event) if (event->state() & TQt::ShiftButton) { // Shift+arrowKeys selection if (m_startOfShiftSelectionNote == 0L) m_startOfShiftSelectionNote = toFocus; - ensureNoteVisible(toFocus); // Important: this line should be before the other ones because else tqrepaint would be done on the wrong part! + ensureNoteVisible(toFocus); // Important: this line should be before the other ones because else repaint would be done on the wrong part! selectRange(m_startOfShiftSelectionNote, toFocus); setFocusedNote(toFocus); event->accept(); return; } else /*if (toFocus != m_focusedNote)*/ { // Move focus to ANOTHER note... - ensureNoteVisible(toFocus); // Important: this line should be before the other ones because else tqrepaint would be done on the wrong part! + ensureNoteVisible(toFocus); // Important: this line should be before the other ones because else repaint would be done on the wrong part! setFocusedNote(toFocus); m_startOfShiftSelectionNote = toFocus; if ( ! (event->state() & TQt::ControlButton) ) // ... select only current note if Control @@ -5282,7 +5282,7 @@ bool Basket::loadFromFile(const TQString &fullPath, TQByteArray *array) if(m_encryptionType == PrivateKeyEncryption) m_gpg->setText(i18n("Please enter the password for the following private key:"), false); else - m_gpg->setText(i18n("Please enter the password for the basket %1:").tqarg(basketName()), false); // Used when decrypting + m_gpg->setText(i18n("Please enter the password for the basket %1:").arg(basketName()), false); // Used when decrypting return m_gpg->decrypt(tmp, array); } #else @@ -5327,7 +5327,7 @@ bool Basket::saveToFile(const TQString& fullPath, const TQByteArray& array, TQ_U m_gpg->setText("", false); } else - m_gpg->setText(i18n("Please assign a password to the basket %1:").tqarg(basketName()), true); // Used when defining a new password + m_gpg->setText(i18n("Please assign a password to the basket %1:").arg(basketName()), true); // Used when defining a new password success = m_gpg->encrypt(array, length, &tmp, key); length = tmp.size(); @@ -5394,9 +5394,9 @@ bool Basket::saveToFile(const TQString& fullPath, const TQByteArray& array, TQ_U ), (openSuccess ? i18n("Please remove files on the disk %1 to let the application safely save your changes.") - .tqarg(KIO::findPathMountPoint(fullPath)) + .arg(KIO::findPathMountPoint(fullPath)) : i18n("File permissions are bad for %1. Please check that you have write access to it and the parent folders.") - .tqarg(fullPath) + .arg(fullPath) ), TQT_TQWIDGET(kapp->activeWindow()) ); diff --git a/src/basketfactory.cpp b/src/basketfactory.cpp index ed01301..5c54fd3 100644 --- a/src/basketfactory.cpp +++ b/src/basketfactory.cpp @@ -76,12 +76,12 @@ TQString BasketFactory::unpackTemplate(const TQString &templateName) " \n" " \n" " \n" - " \n" ).tqarg( (templateName == "mindmap" ? "true" : "false"), + " \n" ).arg( (templateName == "mindmap" ? "true" : "false"), TQString::number(nbColumns), (templateName == "free" || templateName == "mindmap" ? "true" : "false") ); if (nbColumns > 0) for (int i = 0; i < nbColumns; ++i) - stream << TQString(" \n").tqarg(columnWidth); + stream << TQString(" \n").arg(columnWidth); stream << " \n" "\n"; file.close(); diff --git a/src/basketlistview.cpp b/src/basketlistview.cpp index 1ec5cd5..a963f8f 100644 --- a/src/basketlistview.cpp +++ b/src/basketlistview.cpp @@ -109,8 +109,8 @@ TQString BasketListViewItem::escapedName(const TQString &string) TQString letter; // Find the letter TQString altKey = /*i18n(*/"Alt"/*)*/; //i18n("The [Alt] key, as shown in shortcuts like Alt+C...", "Alt"); TQString shiftKey = /*i18n(*/"Shift"/*)*/; //i18n("The [Shift] key, as shown in shortcuts like Alt+Shift+1...", "Shift"); - TQRegExp altLetterExp( TQString("^%1\\+(.)$").tqarg(altKey) ); - TQRegExp altShiftLetterExp( TQString("^%1\\+%2\\+(.)$").tqarg(altKey, shiftKey) ); + TQRegExp altLetterExp( TQString("^%1\\+(.)$").arg(altKey) ); + TQRegExp altShiftLetterExp( TQString("^%1\\+%2\\+(.)$").arg(altKey, shiftKey) ); if (altLetterExp.search(m_basket->shortcut().toStringInternal()) != -1) letter = altLetterExp.cap(1); if (letter.isEmpty() && altShiftLetterExp.search(m_basket->shortcut().toStringInternal()) != -1) @@ -140,7 +140,7 @@ void BasketListViewItem::setup() setPixmap(/*column=*/0, icon); - tqrepaint(); + repaint(); } BasketListViewItem* BasketListViewItem::lastChild() @@ -260,7 +260,7 @@ extern void drawGradient( TQPainter *p, const TQColor &colorTop, const TQColor & TQPixmap BasketListViewItem::circledTextPixmap(const TQString &text, int height, const TQFont &font, const TQColor &color) { TQString key = TQString("BLI-%1.%2.%3.%4") - .tqarg(text).tqarg(height).tqarg(font.toString()).tqarg(color.rgb()); + .arg(text).arg(height).arg(font.toString()).arg(color.rgb()); if (TQPixmap* cached=TQPixmapCache::find(key)) { return *cached; } @@ -335,12 +335,12 @@ TQPixmap BasketListViewItem::foundCountPixmap(bool isLoading, int countFound, bo TQString text; if (childsAreLoading) { if (countChildsFound > 0) - text = i18n("%1+%2+").tqarg(TQString::number(countFound), TQString::number(countChildsFound)); + text = i18n("%1+%2+").arg(TQString::number(countFound), TQString::number(countChildsFound)); else - text = i18n("%1+").tqarg(TQString::number(countFound)); + text = i18n("%1+").arg(TQString::number(countFound)); } else { if (countChildsFound > 0) - text = i18n("%1+%2").tqarg(TQString::number(countFound), TQString::number(countChildsFound)); + text = i18n("%1+%2").arg(TQString::number(countFound), TQString::number(countChildsFound)); else if (countFound > 0) text = TQString::number(countFound); else @@ -452,21 +452,21 @@ void BasketListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*col // Don't forget to update the key computation if parameters // affecting the rendering logic change TQString key = TQString("BLVI::pC-%1.%2.%3.%4.%5.%6.%7.%8.%9.%10.%11.%12.%13.%14.%15") - .tqarg(effectiveWidth) - .tqarg(drawRoundRect) - .tqarg(textColor.rgb()) - .tqarg(m_basket->backgroundColor().rgb()) - .tqarg(isCurrentBasket()) - .tqarg(shownBelow && shownBelow->isCurrentBasket()) - .tqarg(shownAbove && shownAbove->isCurrentBasket()) - .tqarg(showLoadingIcon) - .tqarg(showEncryptedIcon) - .tqarg(showCountPixmap) - .tqarg(m_basket->countFounds()) - .tqarg(countHiddenChildsFound()) - .tqarg(m_isUnderDrag) - .tqarg(m_basket->basketName()) - .tqarg(m_basket->icon()); + .arg(effectiveWidth) + .arg(drawRoundRect) + .arg(textColor.rgb()) + .arg(m_basket->backgroundColor().rgb()) + .arg(isCurrentBasket()) + .arg(shownBelow && shownBelow->isCurrentBasket()) + .arg(shownAbove && shownAbove->isCurrentBasket()) + .arg(showLoadingIcon) + .arg(showEncryptedIcon) + .arg(showCountPixmap) + .arg(m_basket->countFounds()) + .arg(countHiddenChildsFound()) + .arg(m_isUnderDrag) + .arg(m_basket->basketName()) + .arg(m_basket->icon()); if (TQPixmap* cached = TQPixmapCache::find(key)) { // TQt's documentation recommends copying the pointer // into a TQPixmap immediately diff --git a/src/bnpview.cpp b/src/bnpview.cpp index 649dbd2..c7cd29d 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -1354,7 +1354,7 @@ void BNPView::notesStateChanged() if (basket->countFounds() != basket->count()) showns = i18n("%n match", "%n matches", basket->countFounds()); setSelectionStatus( - i18n("e.g. '18 notes, 10 matches, 5 selected'", "%1, %2, %3").tqarg(count, showns, selecteds) ); + i18n("e.g. '18 notes, 10 matches, 5 selected'", "%1, %2, %3").arg(count, showns, selecteds) ); } // If we added a note that match the global filter, update the count number in the tree: @@ -1544,8 +1544,8 @@ TQPopupMenu* BNPView::popupMenu(const TQString &menuName) "

As last ressort, if you are sure the application is correctly installed " "but you had a preview version of it, try to remove the " "file %5basketui.rc

") - .tqarg(kapp->aboutData()->programName(), kapp->aboutData()->programName(), - stdDirs.saveLocation("data", "basket/")).tqarg(stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/")), + .arg(kapp->aboutData()->programName(), kapp->aboutData()->programName(), + stdDirs.saveLocation("data", "basket/")).arg(stdDirs.saveLocation("data", "basket/"), stdDirs.saveLocation("data", "basket/")), i18n("Ressource not Found"), KMessageBox::AllowLink ); } if(!isPart()) @@ -1701,13 +1701,13 @@ void BNPView::delBasket() KMessageBox::createKMessageBox( dialog, TQMessageBox::Information, i18n("Do you really want to remove the basket %1 and its contents?") - .tqarg(Tools::textToHTMLWithoutP(basket->basketName())), + .arg(Tools::textToHTMLWithoutP(basket->basketName())), basketsList, /*ask=*/"", /*checkboxReturn=*/0, /*options=*/KMessageBox::Notify/*, const TQString &details=TQString()*/); #endif int really = KMessageBox::questionYesNo( this, i18n("Do you really want to remove the basket %1 and its contents?") - .tqarg(Tools::textToHTMLWithoutP(basket->basketName())), + .arg(Tools::textToHTMLWithoutP(basket->basketName())), i18n("Remove Basket") #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x , KGuiItem(i18n("&Remove Basket"), "editdelete"), KStdGuiItem::cancel()); @@ -1721,8 +1721,8 @@ void BNPView::delBasket() TQStringList basketsList = listViewItemForBasket(basket)->childNamesTree(); if (basketsList.count() > 0) { int deleteChilds = KMessageBox::questionYesNoList( this, - i18n("%1 have the following tqchildren baskets.
Do you want to remove them too?") - .tqarg(Tools::textToHTMLWithoutP(basket->basketName())), + i18n("%1 have the following children baskets.
Do you want to remove them too?") + .arg(Tools::textToHTMLWithoutP(basket->basketName())), basketsList, i18n("Remove Children Baskets") #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x @@ -1808,7 +1808,7 @@ void BNPView::saveAsArchive() int result = KMessageBox::questionYesNoCancel( this, "" + i18n("The file %1 already exists. Do you really want to override it?") - .tqarg(KURL(destination).fileName()), + .arg(KURL(destination).fileName()), i18n("Override File?"), KGuiItem(i18n("&Override"), "filesave") ); @@ -1955,7 +1955,7 @@ void BNPView::showPassiveDroppedDelayed() TQPixmap contentsPixmap = NoteDrag::feedbackPixmap(m_passiveDroppedSelection); TQMimeSourceFactory::defaultFactory()->setPixmap("_passivepopup_image_", contentsPixmap); m_passivePopup->setView( - title.tqarg(Tools::textToHTMLWithoutP(currentBasket()->basketName())), + title.arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())), (contentsPixmap.isNull() ? "" : ""), kapp->iconLoader()->loadIcon(currentBasket()->icon(), KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true)); m_passivePopup->show(); @@ -1967,8 +1967,8 @@ void BNPView::showPassiveImpossible(const TQString &message) m_passivePopup = new KPassivePopup(Settings::useSystray() ? (TQWidget*)Global::systemTray : (TQWidget*)this); m_passivePopup->setView( TQString("%1") - .tqarg(i18n("Basket %1 is locked")) - .tqarg(Tools::textToHTMLWithoutP(currentBasket()->basketName())), + .arg(i18n("Basket %1 is locked")) + .arg(Tools::textToHTMLWithoutP(currentBasket()->basketName())), message, kapp->iconLoader()->loadIcon(currentBasket()->icon(), KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true)); m_passivePopup->show(); @@ -1992,7 +1992,7 @@ void BNPView::showPassiveContent(bool forceShow/* = false*/) m_passivePopup->setView( "" + kapp->makeStdCaption( currentBasket()->isLocked() ? TQString("%1 %2") - .tqarg(Tools::textToHTMLWithoutP(currentBasket()->basketName()), i18n("(Locked)")) + .arg(Tools::textToHTMLWithoutP(currentBasket()->basketName()), i18n("(Locked)")) : Tools::textToHTMLWithoutP(currentBasket()->basketName()) ), message, kapp->iconLoader()->loadIcon(currentBasket()->icon(), KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true)); diff --git a/src/crashhandler.cpp b/src/crashhandler.cpp index 79f3d50..8aae33c 100644 --- a/src/crashhandler.cpp +++ b/src/crashhandler.cpp @@ -82,7 +82,7 @@ "But, all is not lost! You could potentially help us fix the crash. " "Information describing the crash is below, so just click send, " "or if you have time, write a brief description of how the crash happened first.\n\n" - "Many thanks." ).tqarg(kapp->aboutData()->programName()) + "\n\n"; + "Many thanks." ).arg(kapp->aboutData()->programName()) + "\n\n"; body += "\n\n\n\n\n\n" + i18n( "The information below is to help the developers identify the problem, " "please do not modify it." ) + "\n\n\n\n"; @@ -96,9 +96,9 @@ ;// "TagLib: %2.%3.%4\n"; /* body = body - .tqarg( TAGLIB_MAJOR_VERSION ) - .tqarg( TAGLIB_MINOR_VERSION ) - .tqarg( TAGLIB_PATCH_VERSION );*/ + .arg( TAGLIB_MAJOR_VERSION ) + .arg( TAGLIB_MINOR_VERSION ) + .arg( TAGLIB_PATCH_VERSION );*/ #ifdef NDEBUG body += "NDEBUG: true"; @@ -163,10 +163,10 @@ if( totalFrames > 0 ) { const double validity = double(validFrames) / totalFrames; - subject += TQString("[validity: %1]").tqarg( validity, 0, 'f', 2 ); + subject += TQString("[validity: %1]").arg( validity, 0, 'f', 2 ); if( validity <= 0.5 ) useful = false; } - subject += TQString("[frames: %1]").tqarg( totalFrames, 3 /*padding*/ ); + subject += TQString("[frames: %1]").arg( totalFrames, 3 /*padding*/ ); if( bt.find( TQRegExp(" at \\w*\\.cpp:\\d+\n") ) >= 0 ) subject += "[line numbers]"; @@ -174,7 +174,7 @@ else useful = false; -// subject += TQString("[%1]").tqarg( AmarokConfig::soundSystem().remove( TQRegExp("-?engine") ) ); +// subject += TQString("[%1]").arg( AmarokConfig::soundSystem().remove( TQRegExp("-?engine") ) ); // debug() << subject << endl; @@ -206,7 +206,7 @@ std::cout << ("\n" + i18n( "%1 has crashed! We're sorry about this.\n\n" "But, all is not lost! Perhaps an upgrade is already available " "which fixes the problem. Please check your distribution's software repository." ) - .tqarg(kapp->aboutData()->programName())).local8Bit().data() << std::endl; + .arg(kapp->aboutData()->programName())).local8Bit().data() << std::endl; } //_exit() exits immediately, otherwise this diff --git a/src/formatimporter.cpp b/src/formatimporter.cpp index f28df81..a0a24ad 100644 --- a/src/formatimporter.cpp +++ b/src/formatimporter.cpp @@ -131,7 +131,7 @@ void FormatImporter::importBaskets() if (folderName.startsWith("/")) { // It was a folder mirror: KMessageBox::information(0, i18n("

Folder mirroring is not possible anymore (see basket.kde.org for more information).

" "

The folder %1 has been copied for the basket needs. You can either delete this folder or delete the basket, or use both. But remember that " - "modifying one will not modify the other anymore as they are now separate entities.

").tqarg(folderName), i18n("Folder Mirror Import"), + "modifying one will not modify the other anymore as they are now separate entities.

").arg(folderName), i18n("Folder Mirror Import"), "", KMessageBox::AllowLink); // Also modify folderName to be only the folder name and not the full path anymore: TQString newFolderName = folderName; @@ -259,7 +259,7 @@ TQDomElement FormatImporter::importBasket(const TQString &folderName) "Name=%2\n" "Icon=%3\n" "Encoding=UTF-8\n" - "Type=Application\n").tqarg(runCommand, title, icon.isEmpty() ? TQString("exec") : icon); + "Type=Application\n").arg(runCommand, title, icon.isEmpty() ? TQString("exec") : icon); TQString launcherFileName = Tools::fileNameForNewFile("launcher.desktop", Global::basketsFolder() + folderName /*+ "/"*/); TQString launcherFullPath = Global::basketsFolder() + folderName /*+ "/"*/ + launcherFileName; TQFile file(launcherFullPath); diff --git a/src/htmlexporter.cpp b/src/htmlexporter.cpp index 762abe5..64fee0e 100644 --- a/src/htmlexporter.cpp +++ b/src/htmlexporter.cpp @@ -63,7 +63,7 @@ HTMLExporter::HTMLExporter(Basket *basket) int result = KMessageBox::questionYesNoCancel( 0, "" + i18n("The file %1 already exists. Do you really want to override it?") - .tqarg(KURL(destination).fileName()), + .arg(KURL(destination).fileName()), i18n("Override File?"), KGuiItem(i18n("&Override"), "filesave") ); @@ -111,7 +111,7 @@ void HTMLExporter::prepareExport(Basket *basket, const TQString &fullPath) withBasketTree = (item->firstChild() != 0); // Create and empty the files folder: - TQString filesFolderPath = i18n("HTML export folder (files)", "%1_files").tqarg(filePath) + "/"; // eg.: "/home/seb/foo.html_files/" + TQString filesFolderPath = i18n("HTML export folder (files)", "%1_files").arg(filePath) + "/"; // eg.: "/home/seb/foo.html_files/" Tools::deleteRecursively(filesFolderPath); TQDir dir; dir.mkdir(filesFolderPath); @@ -136,7 +136,7 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket) } // Compute the absolute & relative paths for this basket: - filesFolderPath = i18n("HTML export folder (files)", "%1_files").tqarg(filePath) + "/"; + filesFolderPath = i18n("HTML export folder (files)", "%1_files").arg(filePath) + "/"; if (isSubBasket) { basketFilePath = basketsFolderPath + basket->folderName().left(basket->folderName().length() - 1) + ".html"; filesFolderName = "../"; @@ -145,7 +145,7 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket) basketsFolderName = ""; } else { basketFilePath = filePath; - filesFolderName = i18n("HTML export folder (files)", "%1_files").tqarg(KURL(filePath).fileName()) + "/"; + filesFolderName = i18n("HTML export folder (files)", "%1_files").arg(KURL(filePath).fileName()) + "/"; dataFolderName = filesFolderName + i18n("HTML export folder (data)", "data") + "/"; dataFolderPath = filesFolderPath + i18n("HTML export folder (data)", "data") + "/"; basketsFolderName = filesFolderName + i18n("HTML export folder (baskets)", "baskets") + "/"; @@ -289,7 +289,7 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket) // TODO: Make sure only filtered notes are exported! // if (decoration()->filterData().isFiltering) // stream << -// "

" << i18n("Notes matching the filter "%1":").tqarg(Tools::textToHTMLWithoutP(decoration()->filterData().string)) << "

\n"; +// "

" << i18n("Notes matching the filter "%1":").arg(Tools::textToHTMLWithoutP(decoration()->filterData().string)) << "

\n"; stream << "
\n"; @@ -315,10 +315,10 @@ void HTMLExporter::exportBasket(Basket *basket, bool isSubBasket) "
\n"; stream << TQString( " \n" - "

%1

\n").tqarg( + "

%1

\n").arg( i18n("Made with %1, a KDE tool to take notes and keep information at hand.") - .tqarg("%1 %2") - .tqarg(kapp->aboutData()->programName(), VERSION)); + .arg("%1 %2") + .arg(kapp->aboutData()->programName(), VERSION)); // Copy a transparent GIF image in the folder, needed for the JavaScript hack: TQString gifFileName = "spacer.gif"; @@ -396,7 +396,7 @@ void HTMLExporter::exportNote(Note *note, int indent) widthValue = 1; if (widthValue > 100) widthValue = 100; - width = TQString(" width=\"%1%\"").tqarg(TQString::number(widthValue)); + width = TQString(" width=\"%1%\"").arg(TQString::number(widthValue)); } stream << spaces.fill(' ', indent) << "\n"; diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp index 5e73e8f..f85dce3 100644 --- a/src/kcolorcombo2.cpp +++ b/src/kcolorcombo2.cpp @@ -758,7 +758,7 @@ void KColorCombo2::fontChange(const TQFont &oldFont) { // Since the color-rectangle is the same height of the text, we should resize it if the font change: updateComboBox(); - TQComboBox::fontChange(oldFont); // To update tqgeometry. + TQComboBox::fontChange(oldFont); // To update geometry. } void KColorCombo2::virtual_hook(int /*id*/, void */*data*/) diff --git a/src/kgpgme.cpp b/src/kgpgme.cpp index cc5662e..72a5742 100644 --- a/src/kgpgme.cpp +++ b/src/kgpgme.cpp @@ -139,7 +139,7 @@ void KGpgMe::init(gpgme_protocol_t proto) err = gpgme_engine_check_version(proto); if(err) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .tqarg(gpgme_strsource(err)).tqarg(gpgme_strerror(err))); + .arg(gpgme_strsource(err)).arg(gpgme_strerror(err))); } } @@ -221,7 +221,7 @@ KGpgKeyList KGpgMe::keys(bool privateKeys /* = false */) const if(err) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .tqarg(gpgme_strsource(err)).tqarg(gpgme_strerror(err))); + .arg(gpgme_strsource(err)).arg(gpgme_strerror(err))); } else { result = gpgme_op_keylist_result(m_ctx); @@ -263,8 +263,8 @@ bool KGpgMe::encrypt(const TQByteArray& inBuffer, TQ_ULONG length, result = gpgme_op_encrypt_result(m_ctx); if (result->invalid_recipients) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .tqarg(i18n("That public key is not meant for encryption")) - .tqarg(result->invalid_recipients->fpr)); + .arg(i18n("That public key is not meant for encryption")) + .arg(result->invalid_recipients->fpr)); } else { err = readToBuffer(out, outBuffer); @@ -276,7 +276,7 @@ bool KGpgMe::encrypt(const TQByteArray& inBuffer, TQ_ULONG length, } if(err != GPG_ERR_NO_ERROR && err != GPG_ERR_CANCELED) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .tqarg(gpgme_strsource(err)).tqarg(gpgme_strerror(err))); + .arg(gpgme_strsource(err)).arg(gpgme_strerror(err))); } if(err != GPG_ERR_NO_ERROR) clearCache(); @@ -306,8 +306,8 @@ bool KGpgMe::decrypt(const TQByteArray& inBuffer, TQByteArray* outBuffer) result = gpgme_op_decrypt_result(m_ctx); if(result->unsupported_algorithm) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .tqarg(i18n("Unsupported algorithm")) - .tqarg(result->unsupported_algorithm)); + .arg(i18n("Unsupported algorithm")) + .arg(result->unsupported_algorithm)); } else { err = readToBuffer(out, outBuffer); @@ -318,7 +318,7 @@ bool KGpgMe::decrypt(const TQByteArray& inBuffer, TQByteArray* outBuffer) } if(err != GPG_ERR_NO_ERROR && err != GPG_ERR_CANCELED) { KMessageBox::error(TQT_TQWIDGET(kapp->activeWindow()), TQString("%1: %2") - .tqarg(gpgme_strsource(err)).tqarg(gpgme_strerror(err))); + .arg(gpgme_strsource(err)).arg(gpgme_strerror(err))); } if(err != GPG_ERR_NO_ERROR) clearCache(); @@ -346,7 +346,7 @@ gpgme_error_t KGpgMe::readToBuffer(gpgme_data_t in, TQByteArray* outBuffer) cons if(buf) { while((ret = gpgme_data_read(in, buf, BUF_SIZE)) > 0) { uint size = outBuffer->size(); - if(outBuffer->tqresize(size + ret)) + if(outBuffer->resize(size + ret)) memcpy(outBuffer->data() + size, buf, ret); } if(ret < 0) diff --git a/src/kiconcanvas.cpp b/src/kiconcanvas.cpp index a5d25e5..a96ed6d 100644 --- a/src/kiconcanvas.cpp +++ b/src/kiconcanvas.cpp @@ -180,7 +180,7 @@ void KIconCanvas::slotLoadFiles() // Calling kapp->processEvents() makes the iconview flicker like hell // (it's being repainted once for every new item), so we don't do this. - // Instead, we directly tqrepaint the progress bar without going through + // Instead, we directly repaint the progress bar without going through // the event-loop. We do that just once for every 10th item so that // the progress bar doesn't flicker in turn. (pfeiffer) // FIXME: TQt4 will have double buffering diff --git a/src/likeback.cpp b/src/likeback.cpp index 5840510..aa68d6e 100644 --- a/src/likeback.cpp +++ b/src/likeback.cpp @@ -430,7 +430,7 @@ void LikeBack::showInformationMessage() "

" + (isDevelopmentVersion(d->aboutData->version()) ? i18n("Welcome to this testing version of %1.") : i18n("Welcome to %1.") - ).tqarg(d->aboutData->programName()) + "

" + ).arg(d->aboutData->programName()) + "

" "

" + i18n("To help us improve it, your comments are important.") + "

" "

" + ((buttons & LikeBack::Like) && (buttons & LikeBack::Dislike) ? @@ -740,7 +740,7 @@ LikeBackDialog::~LikeBackDialog() TQString LikeBackDialog::introductionText() { - TQString text = "

" + i18n("Please provide a brief description of your opinion of %1.").tqarg(m_likeBack->aboutData()->programName()) + " "; + TQString text = "

" + i18n("Please provide a brief description of your opinion of %1.").arg(m_likeBack->aboutData()->programName()) + " "; TQString languagesMessage = ""; if (!m_likeBack->acceptedLocales().isEmpty() && !m_likeBack->acceptedLanguagesMessage().isEmpty()) { @@ -760,7 +760,7 @@ TQString LikeBackDialog::introductionText() // TODO: Replace the URL with a localized one: text += languagesMessage + " " + i18n("You may be able to use an online translation tool.") - .tqarg("http://www.google.com/language_tools?hl=" + KGlobal::locale()->language()) + .arg("http://www.google.com/language_tools?hl=" + KGlobal::locale()->language()) + " "; // If both "I Like" and "I Dislike" buttons are shown and one is clicked: diff --git a/src/linklabel.cpp b/src/linklabel.cpp index fa67c54..77d5cd2 100644 --- a/src/linklabel.cpp +++ b/src/linklabel.cpp @@ -132,7 +132,7 @@ LinkLook* LinkLook::lookForURL(const KURL &url) TQString LinkLook::toCSS(const TQString &cssClass, const TQColor &defaultTextColor) const { // Set the link class: - TQString css = TQString(" .%1 a { display: block; width: 100%;").tqarg(cssClass); + TQString css = TQString(" .%1 a { display: block; width: 100%;").arg(cssClass); if (underlineOutside()) css += " text-decoration: underline;"; else @@ -142,7 +142,7 @@ TQString LinkLook::toCSS(const TQString &cssClass, const TQColor &defaultTextCol if (m_bold == true) css += " font-weight: bold;"; TQColor textColor = (color().isValid() || m_useLinkColor ? effectiveColor() : defaultTextColor); - css += TQString(" color: %1; }\n").tqarg(textColor.name()); + css += TQString(" color: %1; }\n").arg(textColor.name()); // Set the hover state class: TQString hover; @@ -153,12 +153,12 @@ TQString LinkLook::toCSS(const TQString &cssClass, const TQColor &defaultTextCol if (effectiveHoverColor() != effectiveColor()) { if (!hover.isEmpty()) hover += " "; - hover += TQString("color: %4;").tqarg(effectiveHoverColor().name()); + hover += TQString("color: %4;").arg(effectiveHoverColor().name()); } // But include it only if it contain a different style than non-hover state: if (!hover.isEmpty()) - css += TQString(" .%1 a:hover { %2 }\n").tqarg(cssClass, hover); + css += TQString(" .%1 a:hover { %2 }\n").arg(cssClass, hover); return css; } @@ -246,7 +246,7 @@ void LinkLabel::setAlign(int hAlign, int vAlign) if (!m_look) return; - // Define tqalignment flags : + // Define alignment flags : //FIXME TODO: Use directly flags ! int hFlag, vFlag, wBreak; switch (hAlign) { @@ -540,16 +540,16 @@ TQString LinkDisplay::toHtml(HTMLExporter *exporter, const KURL &url, const TQSt TQString fullPath = exporter->iconsFolderPath + fileName; m_preview.save(fullPath, "PNG"); linkIcon = TQString("\"\"") - .tqarg(exporter->iconsFolderName + fileName, TQString::number(m_preview.width()), TQString::number(m_preview.height())); + .arg(exporter->iconsFolderName + fileName, TQString::number(m_preview.width()), TQString::number(m_preview.height())); } else { linkIcon = exporter->iconsFolderName + exporter->copyIcon(m_icon, m_look->iconSize()); linkIcon = TQString("\"\"") - .tqarg(linkIcon, TQString::number(m_look->iconSize()), TQString::number(m_look->iconSize())); + .arg(linkIcon, TQString::number(m_look->iconSize()), TQString::number(m_look->iconSize())); } TQString linkTitle = Tools::textToHTMLWithoutP(title.isEmpty() ? m_title : title); - return TQString("%2 %3").tqarg(url.prettyURL(), linkIcon, linkTitle); + return TQString("%2 %3").arg(url.prettyURL(), linkIcon, linkTitle); } /** LinkLookEditWidget **/ @@ -614,7 +614,7 @@ LinkLookEditWidget::LinkLookEditWidget(KCModule *module, const TQString exTitle, "

If you do not want the application to create notes depending on the content of the files you drop, " "go to the \"General\" page and uncheck \"Image or animation\" in the \"View Content of Added Files for the Following Types\" group.

") // TODO: Note: you can resize down maximum size of images... - .tqarg(kapp->aboutData()->programName(), kapp->aboutData()->programName()), + .arg(kapp->aboutData()->programName(), kapp->aboutData()->programName()), this); gl->addWidget(m_label, 4, 0); gl->addWidget(m_preview, 4, 1); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d40404f..e31f2b5 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -307,7 +307,7 @@ bool MainWindow::queryClose() bool MainWindow::askForQuit() { - TQString message = i18n("

Do you really want to quit %1?

").tqarg(kapp->aboutData()->programName()); + TQString message = i18n("

Do you really want to quit %1?

").arg(kapp->aboutData()->programName()); if (Settings::useSystray()) message += i18n("

Notice that you do not have to quit the application before ending your KDE session. " "If you end your session while the application is still running, the application will be reloaded the next time you log in.

"); diff --git a/src/notecontent.cpp b/src/notecontent.cpp index 01f56dc..4ba09d1 100644 --- a/src/notecontent.cpp +++ b/src/notecontent.cpp @@ -138,7 +138,7 @@ void NoteContent::contentChanged(int newMinWidth) m_minWidth = newMinWidth; if (note()) { // note()->unbufferize(); - note()->requestRetqlayout(); // TODO: It should re-set the width! m_width = 0 ? contentChanged: setWidth, geteight, if size havent changed, only tqrepaint and not retqlayout + note()->requestRetqlayout(); // TODO: It should re-set the width! m_width = 0 ? contentChanged: setWidth, geteight, if size havent changed, only repaint and not retqlayout } } @@ -210,7 +210,7 @@ TQString LinkContent::toText(const TQString &/*cuttedFullPath*/) else if (title().isEmpty()) return url().prettyURL(); else - return TQString("%1 <%2>").tqarg(title(), url().prettyURL()); + return TQString("%1 <%2>").arg(title(), url().prettyURL()); } TQString ColorContent::toText(const TQString &/*cuttedFullPath*/) { return color().name(); } TQString UnknownContent::toText(const TQString &/*cuttedFullPath*/) { return ""; } @@ -223,25 +223,25 @@ TQString HtmlContent::toHtml(const TQString &/*imageName*/, const TQString &/*cu { return Tools::htmlToParagraph(html()); } TQString ImageContent::toHtml(const TQString &/*imageName*/, const TQString &cuttedFullPath) -{ return TQString("").tqarg(cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath); } +{ return TQString("").arg(cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath); } TQString AnimationContent::toHtml(const TQString &/*imageName*/, const TQString &cuttedFullPath) -{ return TQString("").tqarg(cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath); } +{ return TQString("").arg(cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath); } TQString SoundContent::toHtml(const TQString &/*imageName*/, const TQString &cuttedFullPath) -{ return TQString("%2").tqarg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), fileName()); } // With the icon? +{ return TQString("%2").arg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), fileName()); } // With the icon? TQString FileContent::toHtml(const TQString &/*imageName*/, const TQString &cuttedFullPath) -{ return TQString("%2").tqarg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), fileName()); } // With the icon? +{ return TQString("%2").arg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), fileName()); } // With the icon? TQString LinkContent::toHtml(const TQString &/*imageName*/, const TQString &/*cuttedFullPath*/) -{ return TQString("%2").tqarg(url().prettyURL(), title()); } // With the icon? +{ return TQString("%2").arg(url().prettyURL(), title()); } // With the icon? TQString LauncherContent::toHtml(const TQString &/*imageName*/, const TQString &cuttedFullPath) -{ return TQString("%2").tqarg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), name()); } // With the icon? +{ return TQString("%2").arg((cuttedFullPath.isEmpty() ? fullPath() : cuttedFullPath), name()); } // With the icon? TQString ColorContent::toHtml(const TQString &/*imageName*/, const TQString &/*cuttedFullPath*/) -{ return TQString("%2").tqarg(color().name(), color().name()); } +{ return TQString("%2").arg(color().name(), color().name()); } TQString UnknownContent::toHtml(const TQString &/*imageName*/, const TQString &/*cuttedFullPath*/) { return ""; } @@ -804,7 +804,7 @@ bool ImageContent::saveToFile() void ImageContent::toolTipInfos(TQStringList *keys, TQStringList *values) { keys->append(i18n("Size")); - values->append(i18n("%1 by %2 pixels").tqarg(TQString::number(m_pixmap.width()), TQString::number(m_pixmap.height()))); + values->append(i18n("%1 by %2 pixels").arg(TQString::number(m_pixmap.width()), TQString::number(m_pixmap.height()))); } TQString ImageContent::messageWhenOpenning(OpenMessage where) @@ -983,7 +983,7 @@ void AnimationContent::movieStatus(int status) void AnimationContent::exportToHTML(HTMLExporter *exporter, int /*indent*/) { exporter->stream << TQString("\"\"") - .tqarg( exporter->dataFolderName + exporter->copyFile(fullPath(), /*createIt=*/true), + .arg( exporter->dataFolderName + exporter->copyFile(fullPath(), /*createIt=*/true), TQString::number(movie().framePixmap().size().width()), TQString::number(movie().framePixmap().size().height()) ); } @@ -1427,7 +1427,7 @@ void LauncherContent::toolTipInfos(TQStringList *keys, TQStringList *values) TQString exec = service.exec(); if (service.terminal()) - exec = i18n("%1 (run in terminal)").tqarg(exec); + exec = i18n("%1 (run in terminal)").arg(exec); if (!service.comment().isEmpty() && service.comment() != service.name()) { keys->append(i18n("Comment")); @@ -1570,10 +1570,10 @@ void ColorContent::toolTipInfos(TQStringList *keys, TQStringList *values) m_color.getHsv(&hue, &saturation, &value); keys->append(i18n("RGB Colorspace: Red/Green/Blue", "RGB")); - values->append(i18n("Red: %1, Green: %2, Blue: %3,").tqarg(TQString::number(m_color.red()), TQString::number(m_color.green()), TQString::number(m_color.blue()))); + values->append(i18n("Red: %1, Green: %2, Blue: %3,").arg(TQString::number(m_color.red()), TQString::number(m_color.green()), TQString::number(m_color.blue()))); keys->append(i18n("HSV Colorspace: Hue/Saturation/Value", "HSV")); - values->append(i18n("Hue: %1, Saturation: %2, Value: %3,").tqarg(TQString::number(hue), TQString::number(saturation), TQString::number(value))); + values->append(i18n("Hue: %1, Saturation: %2, Value: %3,").arg(TQString::number(hue), TQString::number(saturation), TQString::number(value))); static TQString cssColors[] = { "aqua", "00ffff", @@ -1778,12 +1778,12 @@ void ColorContent::exportToHTML(HTMLExporter *exporter, int /*indent*/) int rectHeight = (textRect.height() + 2)*3/2; int rectWidth = rectHeight * 14 / 10; // 1.4 times the height, like A4 papers. - TQString fileName = /*Tools::fileNameForNewFile(*/TQString(TQString("color_%1.png").tqarg(color().name()).lower().mid(1))/*, exportData.iconsFolderPath)*/; + TQString fileName = /*Tools::fileNameForNewFile(*/TQString(TQString("color_%1.png").arg(color().name()).lower().mid(1))/*, exportData.iconsFolderPath)*/; TQString fullPath = exporter->iconsFolderPath + fileName; TQPixmap colorIcon = KColorCombo2::colorRectPixmap(color(), /*isDefault=*/false, rectWidth, rectHeight); colorIcon.save(fullPath, "PNG"); TQString iconHtml = TQString("\"\"") - .tqarg(exporter->iconsFolderName + fileName, TQString::number(colorIcon.width()), TQString::number(colorIcon.height())); + .arg(exporter->iconsFolderName + fileName, TQString::number(colorIcon.width()), TQString::number(colorIcon.height())); exporter->stream << iconHtml + " " + color().name(); } diff --git a/src/noteedit.cpp b/src/noteedit.cpp index 056e98e..bdebdb5 100644 --- a/src/noteedit.cpp +++ b/src/noteedit.cpp @@ -279,7 +279,7 @@ void HtmlEditor::cursorPositionChanged() InlineEditors::instance()->richTextItalic->setChecked( textEdit()->italic() ); InlineEditors::instance()->richTextUnderline->setChecked( textEdit()->underline() ); - switch (textEdit()->tqalignment()) { + switch (textEdit()->alignment()) { default: case 1/*TQt::AlignLeft*/: InlineEditors::instance()->richTextLeft->setChecked(true); break; case 4/*TQt::AlignCenter*/: InlineEditors::instance()->richTextCenter->setChecked(true); break; @@ -560,7 +560,7 @@ LinkEditDialog::LinkEditDialog(LinkContent *contentNote, TQWidget *parent/*, TQK /* Icon button: */ m_icon->setIcon(m_noteContent->icon()); int minSize = m_autoIcon->sizeHint().height(); - // Make the icon button at least the same heigh than the other buttons for a better tqalignment (nicer to the eyes): + // Make the icon button at least the same heigh than the other buttons for a better alignment (nicer to the eyes): if (m_icon->sizeHint().height() < minSize) m_icon->setFixedSize(minSize, minSize); else @@ -678,7 +678,7 @@ void LinkEditDialog::slotOk() m_icon->setIconSize(linkLook->iconSize()); // So I store it's name and reload it after size change ! m_icon->setIcon(icon); int minSize = m_autoIcon->sizeHint().height(); - // Make the icon button at least the same heigh than the other buttons for a better tqalignment (nicer to the eyes): + // Make the icon button at least the same heigh than the other buttons for a better alignment (nicer to the eyes): if (m_icon->sizeHint().height() < minSize) m_icon->setFixedSize(minSize, minSize); else @@ -712,7 +712,7 @@ LauncherEditDialog::LauncherEditDialog(LauncherContent *contentNote, TQWidget *p /* Icon button: */ m_icon->setIcon(service.icon()); int minSize = guessButton->sizeHint().height(); - // Make the icon button at least the same heigh than the other buttons for a better tqalignment (nicer to the eyes): + // Make the icon button at least the same heigh than the other buttons for a better alignment (nicer to the eyes): if (m_icon->sizeHint().height() < minSize) m_icon->setFixedSize(minSize, minSize); else diff --git a/src/notefactory.cpp b/src/notefactory.cpp index 6292cef..f35728b 100644 --- a/src/notefactory.cpp +++ b/src/notefactory.cpp @@ -264,7 +264,7 @@ TQString NoteFactory::createNoteLauncherFile(const TQString &command, const TQSt "Name=%2\n" "Icon=%3\n" "Encoding=UTF-8\n" - "Type=Application\n").tqarg(command, name, icon.isEmpty() ? TQString("exec") : icon); + "Type=Application\n").arg(command, name, icon.isEmpty() ? TQString("exec") : icon); TQString fileName = fileNameForNewNote(parent, "launcher.desktop"); TQString fullPath = parent->fullPathForFileName(fileName); // parent->dontCareOfCreation(fullPath); @@ -445,7 +445,7 @@ Note* NoteFactory::dropNote(TQMimeSource *source, Basket *parent, bool fromDrop, TQString message = i18n("

%1 doesn't support the data you've dropped.
" "It however created a generic note, allowing you to drag or copy it to an application that understand it.

" "

If you want the support of these data, please contact developer or visit the " - "BasKet Drop Database.

").tqarg(kapp->aboutData()->programName()); + "BasKet Drop Database.

").arg(kapp->aboutData()->programName()); KMessageBox::information(parent, message, i18n("Unsupported MIME Type(s)"), "unsupportedDropInfo", KMessageBox::AllowLink); return note; @@ -682,7 +682,7 @@ Note* NoteFactory::copyFileAndLoad(const KURL &url, Basket *parent) if (Global::debugWindow) *Global::debugWindow << "copyFileAndLoad: " + url.prettyURL() + " to " + fullPath; -// TQString annotations = i18n("Original file: %1").tqarg(url.prettyURL()); +// TQString annotations = i18n("Original file: %1").arg(url.prettyURL()); // parent->dontCareOfCreation(fullPath); @@ -710,7 +710,7 @@ Note* NoteFactory::moveFileAndLoad(const KURL &url, Basket *parent) if (Global::debugWindow) *Global::debugWindow << "moveFileAndLoad: " + url.prettyURL() + " to " + fullPath; -// TQString annotations = i18n("Original file: %1").tqarg(url.prettyURL()); +// TQString annotations = i18n("Original file: %1").arg(url.prettyURL()); // parent->dontCareOfCreation(fullPath); diff --git a/src/password.cpp b/src/password.cpp index b7b3f12..28862e0 100644 --- a/src/password.cpp +++ b/src/password.cpp @@ -97,7 +97,7 @@ Password::Password(TQWidget *parent, const char *name) for(KGpgKeyList::iterator it = list.begin(); it != list.end(); ++it) { TQString name = gpg.checkForUtf8((*it).name); - keyCombo->insertItem(TQString("%1 <%2> %3").tqarg(name).tqarg((*it).email).tqarg((*it).id)); + keyCombo->insertItem(TQString("%1 <%2> %3").arg(name).arg((*it).email).arg((*it).id)); } publicPrivateRadioButton->setEnabled(keyCombo->count() > 0); keyCombo->setEnabled(keyCombo->count() > 0); diff --git a/src/qeffects.cpp b/src/qeffects.cpp index 7c2dd0b..28fdb83 100644 --- a/src/qeffects.cpp +++ b/src/qeffects.cpp @@ -108,7 +108,7 @@ void TQAlphaWidget::run( int time ) widget->setWState( WState_Visible ); - move( widget->tqgeometry().x(),widget->tqgeometry().y() ); + move( widget->geometry().x(),widget->geometry().y() ); resize( widget->size().width(), widget->size().height() ); front = TQImage( widget->size(), 32 ); @@ -116,8 +116,8 @@ void TQAlphaWidget::run( int time ) back = TQImage( widget->size(), 32 ); back = TQPixmap::grabWindow( TQApplication::desktop()->winId(), - widget->tqgeometry().x(), widget->tqgeometry().y(), - widget->tqgeometry().width(), widget->tqgeometry().height() ); + widget->geometry().x(), widget->geometry().y(), + widget->geometry().width(), widget->geometry().height() ); if ( !back.isNull() && checkTime.elapsed() < duration / 2 ) { mixed = back.copy(); @@ -142,7 +142,7 @@ bool TQAlphaWidget::eventFilter( TQObject* o, TQEvent* e ) case TQEvent::Move: if ( o != widget ) break; - move( widget->tqgeometry().x(),widget->tqgeometry().y() ); + move( widget->geometry().x(),widget->geometry().y() ); update(); break; case TQEvent::Hide: @@ -251,7 +251,7 @@ void TQAlphaWidget::render() widget->clearWState( WState_ForceHide ); alphaBlend(); pm = mixed; - tqrepaint( FALSE ); + repaint( FALSE ); } } @@ -348,7 +348,7 @@ bool TQRollEffect::eventFilter( TQObject* o, TQEvent* e ) case TQEvent::Move: if ( o != widget ) break; - move( widget->tqgeometry().x(),widget->tqgeometry().y() ); + move( widget->geometry().x(),widget->geometry().y() ); update(); break; case TQEvent::Hide: @@ -438,7 +438,7 @@ void TQRollEffect::run( int time ) widget->setWState( WState_Visible ); - move( widget->tqgeometry().x(),widget->tqgeometry().y() ); + move( widget->geometry().x(),widget->geometry().y() ); resize( TQMIN( currentWidth, totalWidth ), TQMIN( currentHeight, totalHeight ) ); show(); @@ -484,8 +484,8 @@ void TQRollEffect::scroll() int w = totalWidth; int h = totalHeight; - int x = widget->tqgeometry().x(); - int y = widget->tqgeometry().y(); + int x = widget->geometry().x(); + int y = widget->geometry().y(); if ( orientation & RightScroll || orientation & LeftScroll ) w = TQMIN( currentWidth, totalWidth ); @@ -494,15 +494,15 @@ void TQRollEffect::scroll() setUpdatesEnabled( FALSE ); if ( orientation & UpScroll ) - y = widget->tqgeometry().y() + TQMAX( 0, totalHeight - currentHeight ); + y = widget->geometry().y() + TQMAX( 0, totalHeight - currentHeight ); if ( orientation & LeftScroll ) - x = widget->tqgeometry().x() + TQMAX( 0, totalWidth - currentWidth ); + x = widget->geometry().x() + TQMAX( 0, totalWidth - currentWidth ); if ( orientation & UpScroll || orientation & LeftScroll ) move( x, y ); resize( w, h ); setUpdatesEnabled( TRUE ); - tqrepaint( FALSE ); + repaint( FALSE ); } if ( done ) { anim.stop(); diff --git a/src/regiongrabber.cpp b/src/regiongrabber.cpp index 8f723a4..4c4d9ca 100644 --- a/src/regiongrabber.cpp +++ b/src/regiongrabber.cpp @@ -43,8 +43,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name ) void SizeTip::setTip( const TQRect &rect ) { - TQString tip = TQString( "%1x%2" ).tqarg( rect.width() ) - .tqarg( rect.height() ); + TQString tip = TQString( "%1x%2" ).arg( rect.width() ) + .arg( rect.height() ); setText( tip ); adjustSize(); @@ -54,7 +54,7 @@ void SizeTip::setTip( const TQRect &rect ) void SizeTip::positionTip( const TQRect &rect ) { - TQRect tipRect = tqgeometry(); + TQRect tipRect = geometry(); tipRect.moveTopLeft( TQPoint( 0, 0 ) ); if ( rect.intersects( tipRect ) ) @@ -63,7 +63,7 @@ void SizeTip::positionTip( const TQRect &rect ) tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) ); if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) ) - tipRect.moveBottomRight( tqgeometry().bottomRight() ); + tipRect.moveBottomRight( geometry().bottomRight() ); } move( tipRect.topLeft() ); @@ -94,7 +94,7 @@ void RegionGrabber::initGrabber() TQDesktopWidget desktopWidget; TQRect desktopSize; if ( desktopWidget.isVirtualDesktop() ) - desktopSize = desktopWidget.tqgeometry(); + desktopSize = desktopWidget.geometry(); else desktopSize = desktopWidget.screenGeometry( qt_xrootwin() ); diff --git a/src/settings.cpp b/src/settings.cpp index ce25ef0..9195324 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -394,7 +394,7 @@ GeneralPage::GeneralPage(TQWidget * parent, const char * name) "on that icon to paste the current selection.") + "

" + "

" + i18n("When doing so, %1 pops up a little balloon message to inform you the action has been successfully done. You can disable that balloon.") + "

" + "

" + i18n("Note that those messages are smart enough to not appear if the main window is visible. This is because you already see the result of your actions in the main window.") + "

") - .tqarg(kapp->aboutData()->programName()), + .arg(kapp->aboutData()->programName()), this); hLay->addWidget(m_usePassivePopup); hLay->addWidget(hLabel); @@ -798,7 +798,7 @@ NotesAppearancePage::NotesAppearancePage(TQWidget * parent, const char * name) m_fileLook = new LinkLookEditWidget(this, i18n("Annual report"), "document", tabs); m_localLinkLook = new LinkLookEditWidget(this, i18n("Home folder"), "folder_home", tabs); m_networkLinkLook = new LinkLookEditWidget(this, "www.kde.org", KMimeType::iconForURL("http://www.kde.org"), tabs); - m_launcherLook = new LinkLookEditWidget(this, i18n("Launch %1").tqarg(kapp->aboutData()->programName()), "basket", tabs); + m_launcherLook = new LinkLookEditWidget(this, i18n("Launch %1").arg(kapp->aboutData()->programName()), "basket", tabs); tabs->addTab(m_soundLook, i18n("&Sounds") ); tabs->addTab(m_fileLook, i18n("&Files") ); tabs->addTab(m_localLinkLook, i18n("&Local Links") ); diff --git a/src/softwareimporters.cpp b/src/softwareimporters.cpp index 24a20ed..84dd628 100644 --- a/src/softwareimporters.cpp +++ b/src/softwareimporters.cpp @@ -491,7 +491,7 @@ void SoftwareImporters::importTextFile() ); // First create a basket for it: - TQString title = i18n("From TextFile.txt", "From %1").tqarg(KURL(fileName).fileName()); + TQString title = i18n("From TextFile.txt", "From %1").arg(KURL(fileName).fileName()); BasketFactory::newBasket(/*icon=*/"txt", title, /*backgroundImage=*/"", /*backgroundColor=*/TQColor(), /*textColor=*/TQColor(), /*templateName=*/"1column", /*createIn=*/0); Basket *basket = Global::bnpView->currentBasket(); basket->load(); diff --git a/src/systemtray.cpp b/src/systemtray.cpp index 4fd6ceb..c6e2714 100644 --- a/src/systemtray.cpp +++ b/src/systemtray.cpp @@ -139,7 +139,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu) TQString message = i18n( "

Closing the main window will keep %1 running in the system tray. " "Use Quit from the Basket menu to quit the application.

" - ).tqarg(KGlobal::instance()->aboutData()->programName()); + ).arg(KGlobal::instance()->aboutData()->programName()); // We are sure the systray icon is visible: ouf! if (useSystray) { // Compute size and position of the pixmap to be grabbed: @@ -433,7 +433,7 @@ void SystemTray::updateToolTipDelayed() TQString tip = "

" + ( basket->isLocked() ? kapp->makeStdCaption(i18n("%1 (Locked)")) : kapp->makeStdCaption( "%1") ) - .tqarg(Tools::textToHTMLWithoutP(basket->basketName())); + .arg(Tools::textToHTMLWithoutP(basket->basketName())); TQToolTip::add(this, tip); } diff --git a/src/tag.cpp b/src/tag.cpp index 7af9db1..700b88e 100644 --- a/src/tag.cpp +++ b/src/tag.cpp @@ -77,7 +77,7 @@ TQString State::fullName() { if (!parentTag() || parentTag()->states().count() == 1) return (name().isEmpty() && parentTag() ? parentTag()->name() : name()); - return TQString(i18n("%1: %2")).tqarg(parentTag()->name(), name()); + return TQString(i18n("%1: %2")).arg(parentTag()->name(), name()); } TQFont State::font(TQFont base) @@ -541,9 +541,9 @@ void Tag::createDefaultTagsSet(const TQString &fullPath) " \n" " \n" "\n") - .tqarg( i18n("To Do"), i18n("Unchecked"), i18n("Done") ) // %1 %2 %3 - .tqarg( i18n("Progress"), i18n("0 %"), i18n("25 %") ) // %4 %5 %6 - .tqarg( i18n("50 %"), i18n("75 %"), i18n("100 %") ) // %7 %8 %9 + .arg( i18n("To Do"), i18n("Unchecked"), i18n("Done") ) // %1 %2 %3 + .arg( i18n("Progress"), i18n("0 %"), i18n("25 %") ) // %4 %5 %6 + .arg( i18n("50 %"), i18n("75 %"), i18n("100 %") ) // %7 %8 %9 + TQString( " \n" " %1\n" // "Priority" @@ -596,9 +596,9 @@ void Tag::createDefaultTagsSet(const TQString &fullPath) " \n" " \n" "\n") - .tqarg( i18n("Priority"), i18n("Low"), i18n("Medium") ) // %1 %2 %3 - .tqarg( i18n("High"), i18n("Preference"), i18n("Bad") ) // %4 %5 %6 - .tqarg( i18n("Good"), i18n("Excellent"), i18n("Highlight") ) // %7 %8 %9 + .arg( i18n("Priority"), i18n("Low"), i18n("Medium") ) // %1 %2 %3 + .arg( i18n("High"), i18n("Preference"), i18n("Bad") ) // %4 %5 %6 + .arg( i18n("Good"), i18n("Excellent"), i18n("Highlight") ) // %7 %8 %9 + TQString( " \n" " %1\n" // "Important" @@ -664,9 +664,9 @@ void Tag::createDefaultTagsSet(const TQString &fullPath) " \n" " ""\n" "\n") - .tqarg( i18n("Important"), i18n("Very Important"), i18n("Information") ) // %1 %2 %3 - .tqarg( i18n("Idea"), i18n("The initial of 'Idea'", "I."), i18n("Title") ) // %4 %5 %6 - .tqarg( i18n("Code"), i18n("Work"), i18n("The initial of 'Work'", "W.") ) // %7 %8 %9 + .arg( i18n("Important"), i18n("Very Important"), i18n("Information") ) // %1 %2 %3 + .arg( i18n("Idea"), i18n("The initial of 'Idea'", "I."), i18n("Title") ) // %4 %5 %6 + .arg( i18n("Code"), i18n("Work"), i18n("The initial of 'Work'", "W.") ) // %7 %8 %9 + TQString( " \n" " \n" @@ -684,7 +684,7 @@ void Tag::createDefaultTagsSet(const TQString &fullPath) " \n" "\n" "") - .tqarg( i18n("Personal"), i18n("The initial of 'Personal'", "P."), i18n("Funny") ); // %1 %2 %3 + .arg( i18n("Personal"), i18n("The initial of 'Personal'", "P."), i18n("Funny") ); // %1 %2 %3 // Write to Disk: TQFile file(fullPath); diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp index 21ec672..ff6a6eb 100644 --- a/src/tagsedit.cpp +++ b/src/tagsedit.cpp @@ -204,7 +204,7 @@ void TagListViewItem::setup() State *state = (m_tagCopy ? m_tagCopy->stateCopies[0]->newState : m_stateCopy->newState); if (m_tagCopy && !m_tagCopy->newTag->shortcut().isNull()) - text = i18n("Tag name (shortcut)", "%1 (%2)").tqarg(text, m_tagCopy->newTag->shortcut().toString()); + text = i18n("Tag name (shortcut)", "%1 (%2)").arg(text, m_tagCopy->newTag->shortcut().toString()); TQFont font = state->font(listView()->font()); @@ -214,7 +214,7 @@ void TagListViewItem::setup() int height = TAG_MARGIN + TQMAX(TAG_ICON_SIZE, textRect.height()) + TAG_MARGIN; setHeight(height); - tqrepaint(); + repaint(); } void TagListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*colorGroup*/, int /*column*/, int width, int /*align*/) @@ -224,7 +224,7 @@ void TagListViewItem::paintCell(TQPainter *painter, const TQColorGroup &/*colorG State *state = (m_tagCopy ? m_tagCopy->stateCopies[0]->newState : m_stateCopy->newState); if (m_tagCopy && !m_tagCopy->newTag->shortcut().isNull()) - text = i18n("Tag name (shortcut)", "%1 (%2)").tqarg(text, m_tagCopy->newTag->shortcut().toString()); + text = i18n("Tag name (shortcut)", "%1 (%2)").arg(text, m_tagCopy->newTag->shortcut().toString()); TQFont font = (withIcon ? state->font(listView()->font()) : listView()->font()); diff --git a/src/variouswidgets.cpp b/src/variouswidgets.cpp index f212721..529a961 100644 --- a/src/variouswidgets.cpp +++ b/src/variouswidgets.cpp @@ -144,7 +144,7 @@ ViewSizeDialog::~ViewSizeDialog() void ViewSizeDialog::resizeEvent(TQResizeEvent *) { - setCaption( i18n("%1 by %2 pixels").tqarg(TQString::number(width())).tqarg(TQString::number(height())) ); + setCaption( i18n("%1 by %2 pixels").arg(TQString::number(width())).arg(TQString::number(height())) ); m_sizeGrip->move( width() - m_sizeGrip->width(), height() - m_sizeGrip->height() ); }