From 882bcd26b3d60be72ea2b35921969a9850c52db9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:29:20 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/bnpview.cpp | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/bnpview.cpp') diff --git a/src/bnpview.cpp b/src/bnpview.cpp index 1d7488c..c20369d 100644 --- a/src/bnpview.cpp +++ b/src/bnpview.cpp @@ -1342,19 +1342,19 @@ void BNPView::notesStateChanged() // Update statusbar message : if (currentBasket()->isLocked()) - setSelectiontqStatus(i18n("Locked")); + setSelectionStatus(i18n("Locked")); else if (!basket->isLoaded()) - setSelectiontqStatus(i18n("Loading...")); + setSelectionStatus(i18n("Loading...")); else if (basket->count() == 0) - setSelectiontqStatus(i18n("No notes")); + setSelectionStatus(i18n("No notes")); else { TQString count = i18n("%n note", "%n notes", basket->count() ); TQString selecteds = i18n("%n selected", "%n selected", basket->countSelecteds()); TQString showns = (currentDecoratedBasket()->filterData().isFiltering ? i18n("all matches") : i18n("no filter")); if (basket->countFounds() != basket->count()) showns = i18n("%n match", "%n matches", basket->countFounds()); - setSelectiontqStatus( - i18n("e.g. '18 notes, 10 matches, 5 selected'", "%1, %2, %3").tqarg(count, showns, selecteds) ); + setSelectionStatus( + 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") ); @@ -1870,7 +1870,7 @@ void BNPView::isLockedChanged() { bool isLocked = currentBasket()->isLocked(); - setLocktqStatus(isLocked); + setLockStatus(isLocked); // m_actLockBasket->setChecked(isLocked); m_actPropBasket->setEnabled(!isLocked); @@ -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)); @@ -2044,14 +2044,14 @@ void BNPView::updateStatusBarHint() m_statusbar->updateStatusBarHint(); } -void BNPView::setSelectiontqStatus(TQString s) +void BNPView::setSelectionStatus(TQString s) { - m_statusbar->setSelectiontqStatus(s); + m_statusbar->setSelectionStatus(s); } -void BNPView::setLocktqStatus(bool isLocked) +void BNPView::setLockStatus(bool isLocked) { - m_statusbar->setLocktqStatus(isLocked); + m_statusbar->setLockStatus(isLocked); } void BNPView::postStatusbarMessage(const TQString& msg) @@ -2064,9 +2064,9 @@ void BNPView::setStatusBarHint(const TQString &hint) m_statusbar->setStatusBarHint(hint); } -void BNPView::setUnsavedtqStatus(bool isUnsaved) +void BNPView::setUnsavedStatus(bool isUnsaved) { - m_statusbar->setUnsavedtqStatus(isUnsaved); + m_statusbar->setUnsavedStatus(isUnsaved); } void BNPView::setActive(bool active) @@ -2299,7 +2299,7 @@ void BNPView::populateTagsMenu(KPopupMenu &menu, Note *referenceNote) sequence = currentTag->shortcut().operator TQKeySequence(); menu.insertItem(StateMenuItem::checkBoxIconSet( (referenceNote ? referenceNote->hasTag(currentTag) : false), - menu.tqcolorGroup()), + menu.colorGroup()), new StateMenuItem(currentState, sequence, true), i ); -- cgit v1.2.3