diff options
Diffstat (limited to 'src/basket.cpp')
| -rw-r--r-- | src/basket.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/basket.cpp b/src/basket.cpp index 9f3cedd..078a6c4 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 += "<br>" + i18n("of the form 'key: value'", "<b>%1</b>: %2").tqarg(*key, *value); + message += "<br>" + i18n("of the form 'key: value'", "<b>%1</b>: %2").arg(*key, *value); message += "</nobr></qt>"; } 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<br/>this version of %1.").tqarg(kapp->aboutData()->programName()) ); + label->setText( text + i18n("Encryption is not supported by<br/>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("<center>%1</center>").tqarg(i18n("Loading...")), TQScrollView::font()); + TQSimpleRichText rt(TQString("<center>%1</center>").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 <b>%1</b>:").tqarg(basketName()), false); // Used when decrypting + m_gpg->setText(i18n("Please enter the password for the basket <b>%1</b>:").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 <b>%1</b>:").tqarg(basketName()), true); // Used when defining a new password + m_gpg->setText(i18n("Please assign a password to the basket <b>%1</b>:").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 <b>%1</b> to let the application safely save your changes.") - .tqarg(KIO::findPathMountPoint(fullPath)) + .arg(KIO::findPathMountPoint(fullPath)) : i18n("File permissions are bad for <b>%1</b>. Please check that you have write access to it and the parent folders.") - .tqarg(fullPath) + .arg(fullPath) ), TQT_TQWIDGET(kapp->activeWindow()) ); |