diff options
Diffstat (limited to 'kjots')
-rw-r--r-- | kjots/KJotsMain.cpp | 8 | ||||
-rw-r--r-- | kjots/kjotsedit.cpp | 2 | ||||
-rw-r--r-- | kjots/kjotsentry.cpp | 28 |
3 files changed, 19 insertions, 19 deletions
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index 90d4de3..f2dfa97 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -316,7 +316,7 @@ void KJotsMain::deleteBook() return; TQString msg = i18n("<qt>Are you sure you want to delete the <strong>%1</strong> book?</qt>"); - int result = KMessageBox::warningContinueCancel(topLevelWidget(), msg.tqarg(b->subject()), i18n("Delete Book"),KStdGuiItem::del()); + int result = KMessageBox::warningContinueCancel(topLevelWidget(), msg.arg(b->subject()), i18n("Delete Book"),KStdGuiItem::del()); if (result!=KMessageBox::Continue) return; @@ -360,7 +360,7 @@ void KJotsMain::deleteEntry() if (!cur || KMessageBox::warningContinueCancel(topLevelWidget(), i18n("<qt>Are you sure you want to delete the <strong>%1</strong> page?</qt>") - .tqarg(cur->subject()), + .arg(cur->subject()), i18n("Delete Page"),KStdGuiItem::del()) != KMessageBox::Continue) { return; @@ -493,7 +493,7 @@ void KJotsMain::saveBookToFile(bool plainText) } if (!KIO::NetAccess::exists(res.URLs[0], true, this) || - KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").tqarg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) + KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) { tryAgain = false; } @@ -534,7 +534,7 @@ void KJotsMain::savePageToFile(bool plainText) } if (!KIO::NetAccess::exists(res.URLs[0], true, this) || - KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").tqarg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) + KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) { tryAgain = false; } diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp index eff6cba..643fd92 100644 --- a/kjots/kjotsedit.cpp +++ b/kjots/kjotsedit.cpp @@ -135,7 +135,7 @@ void KJotsEdit::setEntry (KJotsPage *entry) m_entry = entry; setText(entry->body()); removeSelection(); - tqrepaint(); + repaint(); setEnabled(true); setFocus(); entry->setEditor(this); diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index 53613c3..a13fc2f 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -532,9 +532,9 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding) //revisions will likely use it. I don't want to make the translators add, remove, //and re-add translations, so I'm just keeping this here for now. m_saveProgressDialog = new KProgressDialog(listView(), "bookSaveInProgress", - i18n("Saving %1").tqarg(subject()), + i18n("Saving %1").arg(subject()), i18n("Saving the contents of %1 to %2") - .tqarg(subject(), url.prettyURL()), + .arg(subject(), url.prettyURL()), true); m_saveProgressDialog->progressBar()->setTotalSteps(1); @@ -613,7 +613,7 @@ void KJotsBook::print(TQFont& defaultFont) printer.setFullPage(false); printer.setCreator("KJots"); - if (!printer.setup(listView(), i18n("Print: %1").tqarg(subject()))) + if (!printer.setup(listView(), i18n("Print: %1").arg(subject()))) { return; } @@ -657,7 +657,7 @@ bool KJotsBook::isDirty() //Am I dirty? if ( KJotsEntryBase::isDirty() ) return true; - //Check all tqchildren to see if any of them are dirty + //Check all children to see if any of them are dirty KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(firstChild()); while ( entry ) { @@ -763,7 +763,7 @@ TQString KJotsBook::getToc() KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(firstChild()); while ( entry ) { TQString htmlSubject = prepForHTML(entry->subject()); - toc += TQString("<li><a href=\"#%1\">").tqarg(entry->id()) + htmlSubject + "</a></li>"; + toc += TQString("<li><a href=\"#%1\">").arg(entry->id()) + htmlSubject + "</a></li>"; KJotsBook *book = dynamic_cast<KJotsBook*>(entry); if ( book ) toc += book->getToc(); @@ -787,13 +787,13 @@ TQString KJotsBook::generateHtml( KJotsEntryBase* top, bool diskMode ) if ( top == this ) { - toc = TQString("<h1><a name=\"%1\">%2</a></h1>").tqarg(id()).tqarg(htmlTitle); + toc = TQString("<h1><a name=\"%1\">%2</a></h1>").arg(id()).arg(htmlTitle); } else { if ( diskMode ) { - toc = TQString("<h2><a name=\"%1\">%2</a></h2>").tqarg(id()).tqarg(htmlTitle); + toc = TQString("<h2><a name=\"%1\">%2</a></h2>").arg(id()).arg(htmlTitle); } else { - toc = TQString("<h2><a name=\"%1\" href=\"%2\">%3</a></h2>").tqarg(id()).tqarg(id()).tqarg(htmlTitle); + toc = TQString("<h2><a name=\"%1\" href=\"%2\">%3</a></h2>").arg(id()).arg(id()).arg(htmlTitle); } } @@ -995,7 +995,7 @@ void KJotsPage::print(TQFont& defaultFont) printer.setFullPage(false); printer.setCreator("KJots"); - if (printer.setup(listView(), i18n("Print: %1").tqarg(docName))) + if (printer.setup(listView(), i18n("Print: %1").arg(docName))) { TQPainter painter( &printer ); painter.setFont(defaultFont); @@ -1066,7 +1066,7 @@ TQString KJotsPage::defaultSubject() page = 1; } - return i18n("Page %1").tqarg(page); + return i18n("Page %1").arg(page); } /*! @@ -1181,21 +1181,21 @@ TQString KJotsPage::generateHtml( KJotsEntryBase *top, bool diskMode ) TQString htmlSubject = prepForHTML(subject()); if ( top == this || diskMode ) { - html += TQString("<h3><a name=\"%1\">%2</a></h3>").tqarg(id()).tqarg(htmlSubject); + html += TQString("<h3><a name=\"%1\">%2</a></h3>").arg(id()).arg(htmlSubject); } else { - html += TQString("<h3><a name=\"%1\" href=\"%2\">%3</a></h3>").tqarg(id()).tqarg(id()).tqarg(htmlSubject); + html += TQString("<h3><a name=\"%1\" href=\"%2\">%3</a></h3>").arg(id()).arg(id()).arg(htmlSubject); } html += prepForHTML(body()); html += "<br><table border=1><tr>"; - html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(id()).tqarg(subject()); + html += TQString("<td><a href=\"#%1\">%2</a></td>").arg(id()).arg(subject()); if ( top != this ) { KJotsBook *parent = parentBook(); while ( parent ) { - html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(parent->id()).tqarg(parent->subject()); + html += TQString("<td><a href=\"#%1\">%2</a></td>").arg(parent->id()).arg(parent->subject()); if ( parent == top ) break; parent = parent->parentBook(); } |