diff options
Diffstat (limited to 'akregator/src')
36 files changed, 219 insertions, 219 deletions
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 1cca9d903..bb37d26e0 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -83,7 +83,7 @@ void AddFeedDialog::slotOk( ) feedURL.prepend("http://"); f->setXmlUrl(feedURL); - widget->statusLabel->setText( i18n("Downloading %1").tqarg(feedURL) ); + widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) ); connect( feed, TQT_SIGNAL(fetched(Feed* )), this, TQT_SLOT(fetchCompleted(Feed *)) ); @@ -102,7 +102,7 @@ void AddFeedDialog::fetchCompleted(Feed */*f*/) void AddFeedDialog::fetchError(Feed *) { - KMessageBox::error(this, i18n("Feed not found from %1.").tqarg(feedURL)); + KMessageBox::error(this, i18n("Feed not found from %1.").arg(feedURL)); KDialogBase::slotCancel(); } diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index c62526904..7fece27ae 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -146,7 +146,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, TQStringList storageParams; - storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false")); + storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false")); if (factory != 0) { @@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, { m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams); - KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") ); + KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") ); } Filters::ArticleFilterList list; @@ -194,7 +194,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, m_extension = new BrowserExtension(this, "ak_extension"); connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&))); - connect(m_view, TQT_SIGNAL(seStatusBarText(const TQString&)), this, TQT_SIGNAL(seStatusBarText(const TQString&))); + connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&))); connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int))); connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&))); connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*))); @@ -232,7 +232,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, initFonts(); - RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION)); + RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION)); } void Part::loadPlugins() @@ -432,7 +432,7 @@ bool Part::openFile() copyFile(backup); - KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("XML Parsing Error") ); + KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") ); } if (!doc.setContent(listBackup)) @@ -447,7 +447,7 @@ bool Part::openFile() TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t()); copyFile(backup); - KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("OPML Parsing Error") ); + KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") ); } m_view->loadFeeds(createDefaultFeedList()); } @@ -486,7 +486,7 @@ void Part::slotSaveFeedList() if (file.open(IO_WriteOnly) == false) { //FIXME: allow to save the feedlist into different location -tpr 20041118 - KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") ); + KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") ); return; } @@ -639,10 +639,10 @@ void Part::importFile(const KURL& url) if (doc.setContent(TQByteArray(file.readAll()))) m_view->importFeeds(doc); else - KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(filename), i18n("OPML Parsing Error") ); + KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(filename), i18n("OPML Parsing Error") ); } else - KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").tqarg(filename), i18n("Read Error")); + KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error")); if (isRemote) KIO::NetAccess::removeTempFile(filename); @@ -656,7 +656,7 @@ void Part::exportFile(const KURL& url) if ( file.exists() && KMessageBox::questionYesNo(m_view, - i18n("The file %1 already exists; do you want to overwrite it?").tqarg(file.name()), + i18n("The file %1 already exists; do you want to overwrite it?").arg(file.name()), i18n("Export"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::No ) @@ -664,7 +664,7 @@ void Part::exportFile(const KURL& url) if ( !file.open(IO_WriteOnly) ) { - KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(file.name()), i18n("Write Error") ); + KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(file.name()), i18n("Write Error") ); return; } @@ -978,11 +978,11 @@ bool Part::tryToLock(const TQString& backendName) "can cause the loss of archived articles and crashes at startup.</b> " "You should disable the archive for now " "unless you are sure that %2 is not already running.</qt>") - .tqarg( programName, programName, backendName ); + .arg( programName, programName, backendName ); // TQString::arg( st ) only replaces the first occurrence of %1 // with st while TQString::arg( s1, s2 ) replacess all occurrences // of %1 with s1 and all occurrences of %2 with s2. So don't - // even think about changing the above to .tqarg( programName ). + // even think about changing the above to .arg( programName ). else msg = i18n("<qt>%1 seems to be running on another display on this " "machine. <b>Running %1 and %2 at the same " @@ -990,7 +990,7 @@ bool Part::tryToLock(const TQString& backendName) "the loss of archived articles and crashes at startup.</b> " "You should disable the archive for now " "unless you are sure that %2 is not already running.</qt>") - .tqarg( oldProgramName, programName, backendName ); + .arg( oldProgramName, programName, backendName ); } else { @@ -1001,7 +1001,7 @@ bool Part::tryToLock(const TQString& backendName) "You should disable the archive for now " "unless you are sure that it is " "not already running on %2.</qt>") - .tqarg( programName, oldHostName, backendName ); + .arg( programName, oldHostName, backendName ); else msg = i18n("<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the " "same time is not supported by the %4 backend and can cause " @@ -1009,7 +1009,7 @@ bool Part::tryToLock(const TQString& backendName) "You should disable the archive for now " "unless you are sure that %1 is " "not running on %3.</qt>") - .tqarg( oldProgramName, programName, oldHostName, backendName ); + .arg( oldProgramName, programName, oldHostName, backendName ); } KCursorSaver idle( KBusyPtr::idle() ); diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index e0ff06eba..4a20008d1 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* node) { - TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").tqarg(node->title()); + TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue) { Tag tag = node->tag(); @@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor if (node->title().isEmpty()) msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>"); else - msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(node->title()); + msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue) { @@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor if (node->title().isEmpty()) msg = i18n("<qt>Are you sure you want to delete this feed?</qt>"); else - msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title()); + msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title()); if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue) { @@ -468,7 +468,7 @@ void View::connectFrame(Frame *f) void View::sloStatusText(const TQString &c) { if (sender() == m_currentFrame) - emit seStatusBarText(c); + emit setStatusBarText(c); } void View::slotCaptionChanged(const TQString &c) @@ -690,7 +690,7 @@ void View::slotFrameChanged(Frame *f) emit setWindowCaption(f->caption()); emit setProgress(f->progress()); - emit seStatusBarText(f->statusText()); + emit setStatusBarText(f->statusText()); if (f->part() == m_part) m_part->mergePart(m_articleViewer); @@ -884,7 +884,7 @@ void View::slotFeedAdd() } - TreeNode* lastChild = group->tqchildren().last(); + TreeNode* lastChild = group->children().last(); addFeed(TQString(), lastChild, group, false); } @@ -1070,14 +1070,14 @@ void View::slotFetchingStarted() { m_mainFrame->setState(Frame::Started); m_actionManager->action("feed_stop")->setEnabled(true); - m_mainFrame->seStatusText(i18n("Fetching Feeds...")); + m_mainFrame->setStatusText(i18n("Fetching Feeds...")); } void View::slotFetchingStopped() { m_mainFrame->setState(Frame::Completed); m_actionManager->action("feed_stop")->setEnabled(false); - m_mainFrame->seStatusText(TQString()); + m_mainFrame->setStatusText(TQString()); } void View::slotFeedFetched(Feed *feed) @@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article) if (delay > 0) m_markReadTimer->start( delay*1000, true ); else - a.seStatus(Article::Read); + a.setStatus(Article::Read); } } @@ -1312,7 +1312,7 @@ void View::slotArticleDelete() case 0: return; case 1: - msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape(articles.first().title())); + msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title())); break; default: msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>", @@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).seStatus(Article::Read); + (*it).setStatus(Article::Read); } void View::slotTextToSpeechRequest() @@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).seStatus(Article::Unread); + (*it).setStatus(Article::Unread); } void View::slotSetSelectedArticleNew() @@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew() return; for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it) - (*it).seStatus(Article::New); + (*it).setStatus(Article::New); } void View::slotSetCurrentArticleReadDelayed() @@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed() if (article.isNull()) return; - article.seStatus(Article::Read); + article.setStatus(Article::Read); } void View::slotMouseOverInfo(const KFileItem *kifi) @@ -1437,11 +1437,11 @@ void View::slotMouseOverInfo(const KFileItem *kifi) if (kifi) { KFileItem *k=(KFileItem*)kifi; - m_mainFrame->seStatusText(k->url().prettyURL());//geStatusBarInfo()); + m_mainFrame->setStatusText(k->url().prettyURL());//geStatusBarInfo()); } else { - m_mainFrame->seStatusText(TQString()); + m_mainFrame->setStatusText(TQString()); } } diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index c6e94eb09..6dd52f215 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -134,7 +134,7 @@ namespace Akregator { void signalUnreadCountChanged(int); void setWindowCaption(const TQString&); - void seStatusBarText(const TQString&); + void setStatusBarText(const TQString&); void setProgress(int); void signalStarted(KIO::Job*); void signalCompleted(); diff --git a/akregator/src/article.cpp b/akregator/src/article.cpp index 36ba87d63..8b62509f4 100644 --- a/akregator/src/article.cpp +++ b/akregator/src/article.cpp @@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) if (article.meta("deleted") == "true") { // if article is in deleted state, we just add the status and omit the rest d->status = Private::Read | Private::Deleted; - d->archive->seStatus(d->guid, d->status); + d->archive->setStatus(d->guid, d->status); } else { // article is not deleted, let's add it to the archive @@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive) int statusInt = status.toInt(); if (statusInt == New) statusInt = Unread; - seStatus(statusInt); + setStatus(statusInt); } setKeep(article.meta("keep") == "true"); } @@ -210,9 +210,9 @@ void Article::setDeleted() if (isDeleted()) return; - seStatus(Read); + setStatus(Read); d->status = Private::Deleted | Private::Read; - d->archive->seStatus(d->guid, d->status); + d->archive->setStatus(d->guid, d->status); d->archive->setDeleted(d->guid); if (d->feed) @@ -299,7 +299,7 @@ int Article::status() const return Unread; } -void Article::seStatus(int stat) +void Article::setStatus(int stat) { // use status() rather than statusBits() here to filter out status flags that we are not // interested in @@ -319,7 +319,7 @@ void Article::seStatus(int stat) d->status = ( d->status | Private::New) & ~Private::Read; break; } - d->archive->seStatus(d->guid, d->status); + d->archive->setStatus(d->guid, d->status); if (d->feed) d->feed->setArticleChanged(*this, oldStatus); } @@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const void Article::setKeep(bool keep) { d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep); - d->archive->seStatus(d->guid, d->status); + d->archive->setStatus(d->guid, d->status); if (d->feed) d->feed->setArticleChanged(*this); } diff --git a/akregator/src/article.h b/akregator/src/article.h index 902aa47c6..ef70b839b 100644 --- a/akregator/src/article.h +++ b/akregator/src/article.h @@ -80,7 +80,7 @@ namespace Akregator bool isNull() const; int status() const; - void seStatus(int s); + void setStatus(int s); void offsetPubDate(int secs); diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index fc1ff29af..20ebc5afc 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status) void SeStatusAction::exec(Article& article) { if (!article.isNull()) - article.seStatus(m_status); + article.setStatus(m_status); } int SeStatusAction::status() const @@ -457,7 +457,7 @@ int SeStatusAction::status() const return m_status; } -void SeStatusAction::seStatus(int status) +void SeStatusAction::setStatus(int status) { m_status = status; } diff --git a/akregator/src/articlefilter.h b/akregator/src/articlefilter.h index ddf05490e..4979c76ec 100644 --- a/akregator/src/articlefilter.h +++ b/akregator/src/articlefilter.h @@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction virtual void exec(Article& article); int status() const; - void seStatus(int status); + void setStatus(int status); virtual void writeConfig(KConfig* config) const; virtual void readConfig(KConfig* config); diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index f8ad74bc8..5f1870f97 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -72,9 +72,9 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor m_view->m_link = TQString(); TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += TQString("<div class=\"headertitle\" dir=\"%1\">").tqarg(directionOf(Utils::stripTags(node->title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title()))); text += node->title(); if(node->unread() == 0) text += i18n(" (no unread articles)"); @@ -90,26 +90,26 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor TQString file = url.replace("/", "_").replace(":", "_"); KURL u(m_view->m_imageDir); u.setFileName(file); - text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url()); } else text += "<div class=\"body\">"; if( !node->description().isEmpty() ) { - text += TQString("<div dir=\"%1\">").tqarg(Utils::stripTags(directionOf(node->description()))); - text += i18n("<b>Description:</b> %1<br><br>").tqarg(node->description()); + text += TQString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description()))); + text += i18n("<b>Description:</b> %1<br><br>").arg(node->description()); text += "</div>\n"; // /description } if ( !node->htmlUrl().isEmpty() ) { - text += TQString("<div dir=\"%1\">").tqarg(directionOf(node->htmlUrl())); - text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").tqarg(node->htmlUrl()).tqarg(node->htmlUrl()); + text += TQString("<div dir=\"%1\">").arg(directionOf(node->htmlUrl())); + text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").arg(node->htmlUrl()).arg(node->htmlUrl()); text += "</div>\n"; // / link } - //text += i18n("<b>Unread articles:</b> %1").tqarg(node->unread()); + //text += i18n("<b>Unread articles:</b> %1").arg(node->unread()); text += "</div>"; // /body m_view->renderContent(text); @@ -121,8 +121,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor m_view->m_link = TQString(); TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title()); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); if(node->unread() == 0) text += i18n(" (no unread articles)"); else @@ -139,8 +139,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor m_view->m_link = TQString(); TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); - text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title()); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title()); if(node->unread() == 0) text += i18n(" (no unread articles)"); else @@ -198,10 +198,10 @@ void ArticleViewer::generateNormalModeCSS() " font-size: %2 ! important;\n" " color: %3 ! important;\n" " background: %4 ! important;\n" - "}\n\n").tqarg(Settings::standardFont()) - .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") - .tqarg(cg.text().name()) - .tqarg(cg.base().name()); + "}\n\n").arg(Settings::standardFont()) + .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") + .arg(cg.text().name()) + .arg(cg.base().name()); m_normalModeCSS += TQString( "a {\n" + TQString(" color: %1 ! important;\n") @@ -214,18 +214,18 @@ void ArticleViewer::generateNormalModeCSS() +" margin-bottom: 10pt;\n" // +" width: 99%;\n" + "}\n\n") - .tqarg(cg.link().name()) - .tqarg(cg.background().name()) - .tqarg(cg.text().name()); + .arg(cg.link().name()) + .arg(cg.background().name()) + .arg(cg.text().name()); m_normalModeCSS += TQString(".headertitle a:link { color: %1 ! important; }\n" ".headertitle a:visited { color: %2 ! important; }\n" ".headertitle a:hover{ color: %3 ! important; }\n" ".headertitle a:active { color: %4 ! important; }\n") - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()); + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()); m_normalModeCSS += TQString( ".headertitle {\n" @@ -244,8 +244,8 @@ void ArticleViewer::generateNormalModeCSS() ".headimage {\n" " float: right;\n" " margin-left: 5px;\n" - "}\n\n").tqarg(cg.highlight().name()) - .tqarg(cg.highlightedText().name()); + "}\n\n").arg(cg.highlight().name()) + .arg(cg.highlightedText().name()); m_normalModeCSS += TQString( "body { clear: none; }\n\n" @@ -278,10 +278,10 @@ void ArticleViewer::generateCombinedModeCSS() " font-size: %2 ! important;\n" " color: %3 ! important;\n" " background: %4 ! important;\n" - "}\n\n").tqarg(Settings::standardFont()) - .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") - .tqarg(cg.text().name()) - .tqarg(cg.base().name()); + "}\n\n").arg(Settings::standardFont()) + .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px") + .arg(cg.text().name()) + .arg(cg.base().name()); m_combinedModeCSS += ( "a {\n" + TQString(" color: %1 ! important;\n") @@ -294,18 +294,18 @@ void ArticleViewer::generateCombinedModeCSS() +" margin-bottom: 10pt;\n" // +" width: 99%;\n" + "}\n\n") - .tqarg(cg.link().name()) - .tqarg(cg.background().name()) - .tqarg(cg.text().name()); + .arg(cg.link().name()) + .arg(cg.background().name()) + .arg(cg.text().name()); m_combinedModeCSS += TQString(".headertitle a:link { color: %1 ! important; }\n" ".headertitle a:visited { color: %2 ! important; }\n" ".headertitle a:hover{ color: %3 ! important; }\n" ".headertitle a:active { color: %4 ! important; }\n") - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()) - .tqarg(cg.highlightedText().name()); + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()) + .arg(cg.highlightedText().name()); m_combinedModeCSS += TQString( ".headertitle {\n" " background: %1 ! important;\n" @@ -323,8 +323,8 @@ void ArticleViewer::generateCombinedModeCSS() ".headimage {\n" " float: right;\n" " margin-left: 5px;\n" - "}\n\n").tqarg(cg.highlight().name()) - .tqarg(cg.highlightedText().name()); + "}\n\n").arg(cg.highlight().name()) + .arg(cg.highlightedText().name()); m_combinedModeCSS += TQString( "body { clear: none; }\n\n" @@ -368,11 +368,11 @@ void ArticleViewer::displayAboutPage() { TQString location = locate("data", "akregator/about/main.html"); TQString content = KPIM::kFileToString(location); - content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); + content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); + content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else - content = content.tqarg( "" ); + content = content.arg( "" ); begin(KURL( location )); TQString info = @@ -389,25 +389,25 @@ void ArticleViewer::displayAboutPage() "<p>We hope that you will enjoy Akregator.</p>\n" "<p>Thank you,</p>\n" "<p style='margin-bottom: 0px'> The Akregator Team</p>\n") - .tqarg(AKREGATOR_VERSION) // Akregator version - .tqarg("http://akregator.kde.org/"); // Akregator homepage URL + .arg(AKREGATOR_VERSION) // Akregator version + .arg("http://akregator.kde.org/"); // Akregator homepage URL TQString fontSize = TQString::number( pointsToPixel( Settings::mediumFontSize() )); TQString appTitle = i18n("Akregator"); TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite"); TQString quickDescription = i18n("An RSS feed reader for the K Desktop Environment."); - write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info)); + write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info)); end(); } TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article) { TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); if (!article.title().isEmpty()) { - text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title()))); if (article.link().isValid()) text += "<a href=\""+article.link().url()+"\">"; text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser @@ -417,16 +417,16 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic } if (article.pubDate().isValid()) { - text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date"))); - text += TQString ("%1:").tqarg(i18n("Date")); + text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date"))); + text += TQString ("%1:").arg(i18n("Date")); text += "</span><span class=\"headertext\">"; text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL? } TQString author = article.author(); if (!author.isEmpty()) { - text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author"))); - text += TQString ("%1:").tqarg(i18n("Author")); + text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author"))); + text += TQString ("%1:").arg(i18n("Author")); text += "</span><span class=\"headertext\">"; text += author+"</span>\n"; // TODO: might need RTL? } @@ -437,14 +437,14 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic TQString file = Utils::fileNameForUrl(feed->xmlUrl()); KURL u(m_imageDir); u.setFileName(file); - text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); } if (!article.description().isEmpty()) { - text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) ); + text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) ); text += "<span class=\"content\">"+article.description()+"</span>"; text += "</div>"; } @@ -486,7 +486,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic //int length = article.enclosure().length(); //TQString lengthStr = KIO::convertSize(length); - //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").tqarg(url).tqarg(url).tqarg(lengthStr).tqarg(type); + //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type); } //kdDebug() << text << endl; return text; @@ -496,13 +496,13 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& article) { TQString text; - text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr"); + text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr"); KURL link = article.link(); if (!article.title().isEmpty()) { - text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title()))); + text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title()))); if (link.isValid()) text += "<a href=\""+link.url()+"\">"; text += article.title().replace("<", "<").replace(">", ">"); // TODO: better leave things escaped in the parser @@ -512,8 +512,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art } if (article.pubDate().isValid()) { - text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date"))); - text += TQString ("%1:").tqarg(i18n("Date")); + text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date"))); + text += TQString ("%1:").arg(i18n("Date")); text += "</span><span class=\"headertext\">"; text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL? } @@ -521,8 +521,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art TQString author = article.author(); if (!author.isEmpty()) { - text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author"))); - text += TQString ("%1:").tqarg(i18n("Author")); + text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author"))); + text += TQString ("%1:").arg(i18n("Author")); text += "</span><span class=\"headertext\">"; text += author+"</span>\n"; // TODO: might need RTL? } @@ -534,14 +534,14 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art TQString file = Utils::fileNameForUrl(feed->xmlUrl()); KURL u(m_imageDir); u.setFileName(file); - text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url()); + text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url()); } if (!article.description().isEmpty()) { - text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) ); + text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) ); text += "<span class=\"content\">"+article.description()+"</span>"; text += "</div>"; } diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index f24c48095..cb62b53a1 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead() TQValueList<Article>::Iterator en = tarticles.end(); for (it = tarticles.begin(); it != en; ++it) - (*it).seStatus(Article::Read); + (*it).setStatus(Article::Read); setNotificationMode(true, true); } } @@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc) d->addedArticlesNotify.append(mya); if (!mya.isDeleted() && !markImmediatelyAsRead()) - mya.seStatus(Article::New); + mya.setStatus(Article::New); else - mya.seStatus(Article::Read); + mya.setStatus(Article::Read); changed = true; } @@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc) { mya.setKeep(old.keep()); int oldstatus = old.status(); - old.seStatus(Article::Read); + old.setStatus(Article::Read); d->articles.remove(old.guid()); appendArticle(mya); - mya.seStatus(oldstatus); + mya.setStatus(oldstatus); d->updatedArticlesNotify.append(mya); changed = true; @@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery) { if ((*it).status() == Article::New) { - (*it).seStatus(Article::Unread); + (*it).setStatus(Article::Unread); } } diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp index 1daf1aa63..e05aded8a 100644 --- a/akregator/src/feedlist.cpp +++ b/akregator/src/feedlist.cpp @@ -222,10 +222,10 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after) if ( !flatList()->contains(parent) ) parent = rootNode(); - TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren(); + TQValueList<TreeNode*> children = list->rootNode()->children(); - TQValueList<TreeNode*>::ConstIterator end( tqchildren.end() ); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it) + TQValueList<TreeNode*>::ConstIterator end( children.end() ); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) { list->rootNode()->removeChild(*it); parent->insertChild(*it, after); @@ -254,11 +254,11 @@ TQDomDocument FeedList::toXML() const TQDomElement body = doc.createElement( "body" ); root.appendChild( body ); - TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren(); + TQValueList<TreeNode*> children = rootNode()->children(); - TQValueList<TreeNode*>::ConstIterator end( tqchildren.end() ); + TQValueList<TreeNode*>::ConstIterator end( children.end() ); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it) body.appendChild( (*it)->toOPML(body, doc) ); return doc; diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index aa6101ded..8998882ff 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -180,8 +180,8 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { // delete child items recursively before deleting parent - TQValueList<TreeNode*> tqchildren = node->tqchildren(); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) + TQValueList<TreeNode*> children = node->children(); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); visitTreeNode(node); @@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor } m_view->d->itemDict.insert(node, item); - TQValueList<TreeNode*> tqchildren = node->tqchildren(); + TQValueList<TreeNode*> children = node->children(); - // add tqchildren recursively - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) + // add children recursively + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); m_view->connectToNode(node); @@ -305,9 +305,9 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor } m_view->d->itemDict.insert(node, item); - // add tqchildren recursively - TQValueList<TreeNode*> tqchildren = node->tqchildren(); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it ) + // add children recursively + TQValueList<TreeNode*> children = node->children(); + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it ) visit(*it); m_view->connectToNode(node); diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h index 52952089d..8d4394e10 100644 --- a/akregator/src/feedlistview.h +++ b/akregator/src/feedlistview.h @@ -157,7 +157,7 @@ protected slots: /** Called when a node in the tree is taken out of the tree (parent->removeChild()) - Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */ + Removes a node and its children from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */ virtual void slotNodeRemoved(Folder* parent, TreeNode* node); /** deletes the item belonging to the deleted node */ diff --git a/akregator/src/feedstorage.h b/akregator/src/feedstorage.h index 98176756a..23a8b9751 100644 --- a/akregator/src/feedstorage.h +++ b/akregator/src/feedstorage.h @@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public TQObject virtual uint pubDate(const TQString& guid) = 0; virtual void setPubDate(const TQString& guid, uint pubdate) = 0; virtual int status(const TQString& guid) = 0; - virtual void seStatus(const TQString& guid, int status) = 0; + virtual void setStatus(const TQString& guid, int status) = 0; virtual TQString title(const TQString& guid) = 0; virtual void setTitle(const TQString& guid, const TQString& title) = 0; virtual TQString description(const TQString& guid) = 0; diff --git a/akregator/src/feedstoragedummyimpl.cpp b/akregator/src/feedstoragedummyimpl.cpp index 6fe973954..1dd23b060 100644 --- a/akregator/src/feedstoragedummyimpl.cpp +++ b/akregator/src/feedstoragedummyimpl.cpp @@ -246,7 +246,7 @@ int FeedStorageDummyImpl::status(const TQString& guid) return contains(guid) ? d->entries[guid].status : 0; } -void FeedStorageDummyImpl::seStatus(const TQString& guid, int status) +void FeedStorageDummyImpl::setStatus(const TQString& guid, int status) { if (contains(guid)) d->entries[guid].status = status; @@ -407,7 +407,7 @@ void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source setHash(guid, source->hash(guid)); setLink(guid, source->link(guid)); setPubDate(guid, source->pubDate(guid)); - seStatus(guid, source->status(guid)); + setStatus(guid, source->status(guid)); setTitle(guid, source->title(guid)); TQStringList tags = source->tags(guid); diff --git a/akregator/src/feedstoragedummyimpl.h b/akregator/src/feedstoragedummyimpl.h index fc9ab31f2..78378959d 100644 --- a/akregator/src/feedstoragedummyimpl.h +++ b/akregator/src/feedstoragedummyimpl.h @@ -69,7 +69,7 @@ class FeedStorageDummyImpl : public FeedStorage virtual uint pubDate(const TQString& guid); virtual void setPubDate(const TQString& guid, uint pubdate); virtual int status(const TQString& guid); - virtual void seStatus(const TQString& guid, int status); + virtual void setStatus(const TQString& guid, int status); virtual TQString title(const TQString& guid); virtual void setTitle(const TQString& guid, const TQString& title); virtual TQString description(const TQString& guid); diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp index 824fc4db7..739b0cf19 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -39,9 +39,9 @@ namespace Akregator { class Folder::FolderPrivate { public: - /** List of tqchildren */ - TQValueList<TreeNode*> tqchildren; - /** caching unread count of tqchildren */ + /** List of children */ + TQValueList<TreeNode*> children; + /** caching unread count of children */ int unread; /** whether or not the folder is expanded */ bool open; @@ -77,7 +77,7 @@ Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate) Folder::~Folder() { TreeNode* tmp = 0; - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != d->tqchildren.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it) { delete tmp; tmp = *it; @@ -93,8 +93,8 @@ Folder::~Folder() TQStringList Folder::tags() const { TQStringList t; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) { // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now. TQStringList t2 = (*it)->tags(); @@ -108,8 +108,8 @@ TQStringList Folder::tags() const TQValueList<Article> Folder::articles(const TQString& tag) { TQValueList<Article> seq; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) seq += (*it)->articles(tag); return seq; @@ -123,21 +123,21 @@ TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const el.setAttribute("isOpen", d->open ? "true" : "false"); el.setAttribute( "id", TQString::number(id()) ); - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) el.appendChild( (*it)->toOPML(el, document) ); return el; } -TQValueList<TreeNode*> Folder::tqchildren() const +TQValueList<TreeNode*> Folder::children() const { - return d->tqchildren; + return d->children; } void Folder::insertChild(TreeNode* node, TreeNode* after) { - int pos = d->tqchildren.findIndex(after); + int pos = d->children.findIndex(after); if (pos < 0) prependChild(node); @@ -150,10 +150,10 @@ void Folder::insertChild(uint index, TreeNode* node) // kdDebug() << "enter Folder::insertChild(int, node) " << node->title() << endl; if (node) { - if (index >= d->tqchildren.size()) - d->tqchildren.append(node); + if (index >= d->children.size()) + d->children.append(node); else - d->tqchildren.insert(d->tqchildren.at(index), node); + d->children.insert(d->children.at(index), node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -170,7 +170,7 @@ void Folder::appendChild(TreeNode* node) // kdDebug() << "enter Folder::appendChild() " << node->title() << endl; if (node) { - d->tqchildren.append(node); + d->children.append(node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -187,7 +187,7 @@ void Folder::prependChild(TreeNode* node) // kdDebug() << "enter Folder::prependChild() " << node->title() << endl; if (node) { - d->tqchildren.prepend(node); + d->children.prepend(node); node->setParent(this); connectToNode(node); updateUnreadCount(); @@ -202,10 +202,10 @@ void Folder::prependChild(TreeNode* node) void Folder::removeChild(TreeNode* node) { // kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl; - if (node && d->tqchildren.contains(node)) + if (node && d->children.contains(node)) { node->setParent(0); - d->tqchildren.remove(node); + d->children.remove(node); disconnectFromNode(node); updateUnreadCount(); emit signalChildRemoved(this, node); @@ -219,12 +219,12 @@ void Folder::removeChild(TreeNode* node) TreeNode* Folder::firstChild() { - return d->tqchildren.isEmpty() ? 0 : d->tqchildren.first(); + return d->children.isEmpty() ? 0 : d->children.first(); } TreeNode* Folder::lastChild() { - return d->tqchildren.isEmpty() ? 0 : d->tqchildren.last(); + return d->children.isEmpty() ? 0 : d->children.last(); } bool Folder::isOpen() const @@ -246,8 +246,8 @@ int Folder::totalCount() const { int totalCount = 0; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) totalCount += (*it)->totalCount(); return totalCount; @@ -257,8 +257,8 @@ void Folder::updateUnreadCount() { int unread = 0; - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) unread += (*it)->unread(); d->unread = unread; @@ -267,8 +267,8 @@ void Folder::updateUnreadCount() void Folder::slotMarkAllArticlesAsRead() { setNotificationMode(false); - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotMarkAllArticlesAsRead(); setNotificationMode(true, true); } @@ -281,7 +281,7 @@ void Folder::slotChildChanged(TreeNode* /*node*/) void Folder::slotChildDestroyed(TreeNode* node) { - d->tqchildren.remove(node); + d->children.remove(node); updateUnreadCount(); nodeModified(); } @@ -289,16 +289,16 @@ void Folder::slotChildDestroyed(TreeNode* node) void Folder::slotDeleteExpiredArticles() { setNotificationMode(false); - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotDeleteExpiredArticles(); setNotificationMode(true, true); } void Folder::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly) { - TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end(); - for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it) + TQValueList<TreeNode*>::ConstIterator en = d->children.end(); + for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it) (*it)->slotAddToFetchQueue(queue, intervalFetchOnly); } diff --git a/akregator/src/folder.h b/akregator/src/folder.h index 6743dd573..f2a024dd6 100644 --- a/akregator/src/folder.h +++ b/akregator/src/folder.h @@ -61,18 +61,18 @@ namespace Akregator virtual bool accept(TreeNodeVisitor* visitor); - /** returns recursively concatenated articles of tqchildren - @return an article sequence containing articles of tqchildren */ + /** returns recursively concatenated articles of children + @return an article sequence containing articles of children */ virtual TQValueList<Article> articles(const TQString& tag=TQString()); /** returns a list of all tags occurring in the subtree of this folder */ virtual TQStringList tags() const; - /** returns the number of unread articles in all tqchildren + /** returns the number of unread articles in all children @return number of unread articles */ virtual int unread() const; - /** returns the number of articles in all tqchildren + /** returns the number of articles in all children @return number of articles */ virtual int totalCount() const; @@ -86,10 +86,10 @@ namespace Akregator @return The newly created element representing this feed group */ virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const; - /** returns the (direct) tqchildren of this node. + /** returns the (direct) children of this node. @return a list of pointers to the child nodes */ - virtual TQValueList<TreeNode*> tqchildren() const; + virtual TQValueList<TreeNode*> children() const; /** inserts @c node as child after child node @c after. if @c after is not a child of this group, @c node will be inserted as first child @@ -105,7 +105,7 @@ namespace Akregator @param node the tree node to insert */ virtual void appendChild(TreeNode* node); - /** remove @c node from tqchildren. Note that @c node will not be deleted + /** remove @c node from children. Note that @c node will not be deleted @param node the child node to remove */ virtual void removeChild(TreeNode* node); @@ -134,7 +134,7 @@ namespace Akregator /** Delete expired articles recursively. */ virtual void slotDeleteExpiredArticles(); - /** Mark articles of tqchildren recursively as read. */ + /** Mark articles of children recursively as read. */ virtual void slotMarkAllArticlesAsRead(); /** Called when a child was modified. @@ -147,7 +147,7 @@ namespace Akregator */ virtual void slotChildDestroyed(TreeNode* node); - /** enqueues tqchildren recursively for fetching + /** enqueues children recursively for fetching @param queue a fetch queue @param internvalFetchesOnly */ virtual void slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchesOnly=false); diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 5cc95b8bd..baa472fd2 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -51,7 +51,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co if (watchSignals) // e.g, articles tab has no part { connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &))); - connect(m_part, TQT_SIGNAL(seStatusBarText (const TQString &)), this, TQT_SLOT(seStatusText (const TQString &))); + connect(m_part, TQT_SIGNAL(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &))); KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p ); if (ext) @@ -120,7 +120,7 @@ void Frame::setCaption(const TQString &s) emit captionChanged(s); } -void Frame::seStatusText(const TQString &s) +void Frame::setStatusText(const TQString &s) { m_statusText=s; m_statusText.replace(TQRegExp("<[^>]*>"), ""); @@ -175,7 +175,7 @@ void Frame::setStarted() { if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID(); m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString(), false); - m_progressItem->seStatus(i18n("Loading...")); + m_progressItem->setStatus(i18n("Loading...")); //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch())); m_state=Started; emit started(); @@ -184,7 +184,7 @@ void Frame::setStarted() void Frame::setCanceled(const TQString &s) { if(m_progressItem) { - m_progressItem->seStatus(i18n("Loading canceled")); + m_progressItem->setStatus(i18n("Loading canceled")); m_progressItem->setComplete(); m_progressItem = 0; } @@ -195,7 +195,7 @@ void Frame::setCanceled(const TQString &s) void Frame::setCompleted() { if(m_progressItem) { - m_progressItem->seStatus(i18n("Loading completed")); + m_progressItem->setStatus(i18n("Loading completed")); m_progressItem->setComplete(); m_progressItem = 0; } diff --git a/akregator/src/frame.h b/akregator/src/frame.h index 24a879546..981a46611 100644 --- a/akregator/src/frame.h +++ b/akregator/src/frame.h @@ -70,7 +70,7 @@ namespace Akregator void setProgress(int); void setCaption(const TQString &); void setTitle(const TQString &); - void seStatusText(const TQString &); + void setStatusText(const TQString &); signals: void captionChanged(const TQString &); diff --git a/akregator/src/kcursorsaver.h b/akregator/src/kcursorsaver.h index 96c100e4c..95dca1f6e 100644 --- a/akregator/src/kcursorsaver.h +++ b/akregator/src/kcursorsaver.h @@ -17,9 +17,9 @@ namespace Akregator { class KCursorSaver : public TQt { public: - /// constructor taking TQCursor tqshapes - KCursorSaver(TQt::CursorShape tqshape) { - TQApplication::setOverrideCursor( TQCursor(tqshape) ); + /// constructor taking TQCursor shapes + KCursorSaver(TQt::CursorShape shape) { + TQApplication::setOverrideCursor( TQCursor(shape) ); inited = true; } diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index 909d95805..bd8ce39b3 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -239,7 +239,7 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver name = email; if (!email.isNull()) - return TQString("<a href=\"mailto:%1\">%2</a>").tqarg(email).tqarg(name); + return TQString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name); else return name; } diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index a137f1fe7..77957ac69 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -125,7 +125,7 @@ void ListTabWidget::slotRootNodeChanged(NodeListView* view, TreeNode* node) if (unread > 0) { //uncomment this to append unread count - //d->tabWidget->changeTab(view, TQString("<qt>%1 (%2)").tqarg(d->captions[view]).tqarg(node->unread())); + //d->tabWidget->changeTab(view, TQString("<qt>%1 (%2)").arg(d->captions[view]).arg(node->unread())); d->tabWidget->changeTab(view, d->captions[view]); } else diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 32af90966..3b567933b 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid) return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0; } -void FeedStorageMK4Impl::seStatus(const TQString& guid, int status) +void FeedStorageMK4Impl::setStatus(const TQString& guid, int status) { int findidx = findArticle(guid); if (findidx == -1) @@ -799,7 +799,7 @@ void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source) setHash(guid, source->hash(guid)); setLink(guid, source->link(guid)); setPubDate(guid, source->pubDate(guid)); - seStatus(guid, source->status(guid)); + setStatus(guid, source->status(guid)); setTitle(guid, source->title(guid)); setAuthor(guid, source->author(guid)); diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h index 6dff8283b..ec2e8658e 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.h +++ b/akregator/src/mk4storage/feedstoragemk4impl.h @@ -69,7 +69,7 @@ class FeedStorageMK4Impl : public FeedStorage virtual uint pubDate(const TQString& guid); virtual void setPubDate(const TQString& guid, uint pubdate); virtual int status(const TQString& guid); - virtual void seStatus(const TQString& guid, int status); + virtual void setStatus(const TQString& guid, int status); virtual TQString title(const TQString& guid); virtual void setTitle(const TQString& guid, const TQString& title); virtual TQString description(const TQString& guid); diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES index 4f167afbc..20cd91d39 100644 --- a/akregator/src/mk4storage/metakit/CHANGES +++ b/akregator/src/mk4storage/metakit/CHANGES @@ -996,9 +996,9 @@ M-solaris.sh and M-dyn.sh scripts need to be manually edited when choosing between CC and gcc. -2001-03-27 Double-tqalignment bug on Solaris +2001-03-27 Double-alignment bug on Solaris - Two changes (c4_Bytes in mk4.h and src/column.h) to fix an tqalignment + Two changes (c4_Bytes in mk4.h and src/column.h) to fix an alignment problem for 8-byte doubles on Solaris. This caused tests b17, b23, b24, s22, and s28 to fail. @@ -1084,7 +1084,7 @@ 2000-10-03 Fixes for Alpha Unix - Moved _item in column.h up to fix tqalignment sensitivity. Config.h + Moved _item in column.h up to fix alignment sensitivity. Config.h did not get SIZE_LONG right on Alpha Unix (0?). 2000-09-27 Contributed fixes and Python 2.0b2 diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README index 314c956b9..21edd0fc2 100644 --- a/akregator/src/mk4storage/metakit/README +++ b/akregator/src/mk4storage/metakit/README @@ -40,7 +40,7 @@ WEBSITE URLS - The main pages on the world wide web, for news and downloads: License info: http://www.equi4.com/mklicense.html Contact info: http://www.equi4.com/contact.html -ACKNOWLEDGEMENTS - Thanks to everyone who has helped tqshape and extend Metakit, +ACKNOWLEDGEMENTS - Thanks to everyone who has helped shape and extend Metakit, including Kyrill Denisenko, Mark Roseman, Gordon McMillan, Matt Newman, Christian Tismer, John Bushakra, Steve Landers, Jacob Levy, John Barnard, Nicholas Riley, Brian Kelley, and many more people who have reported bugs diff --git a/akregator/src/mk4storage/metakit/src/column.h b/akregator/src/mk4storage/metakit/src/column.h index 96d1622ef..3f6e4f157 100644 --- a/akregator/src/mk4storage/metakit/src/column.h +++ b/akregator/src/mk4storage/metakit/src/column.h @@ -169,7 +169,7 @@ private: tSetter _setter; union { - t4_byte _item[8]; // holds temp result (careful with tqalignment!) + t4_byte _item[8]; // holds temp result (careful with alignment!) double _aligner; // needed for SPARC }; diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp index 6bcee5f6d..e79acb20d 100644 --- a/akregator/src/nodelist.cpp +++ b/akregator/src/nodelist.cpp @@ -165,9 +165,9 @@ void NodeList::clear() { Q_ASSERT(rootNode()); - TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren(); + TQValueList<TreeNode*> children = rootNode()->children(); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) delete *it; // emits signal "emitSignalDestroyed" } diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index ce4251b87..6220e97c0 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -76,7 +76,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds) if (feeds.count() == 1) { KNotifyClient::Instance inst(m_instance); - KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").tqarg(feeds[0])); + KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").arg(feeds[0])); } else if (feeds.count() > 1) { @@ -84,7 +84,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds) for (TQStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it) message += *it + "\n"; KNotifyClient::Instance inst(m_instance); - KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").tqarg(message)); + KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message)); } } @@ -99,7 +99,7 @@ void NotificationManager::doNotify() if (feedTitle != (*it).feed()->title()) { feedTitle = (*it).feed()->title(); - message += TQString("<p><b>%1:</b></p>").tqarg(feedTitle); + message += TQString("<p><b>%1:</b></p>").arg(feedTitle); } message += (*it).title() + "<br>"; } diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp index 108fcf9b1..d12016d45 100644 --- a/akregator/src/pluginmanager.cpp +++ b/akregator/src/pluginmanager.cpp @@ -92,8 +92,8 @@ PluginManager::createFromService( const KService::Ptr service ) if ( !lib ) { KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>" "<p>Error message:<br/><i>%2</i></p>" ) - .tqarg( service->library() ) - .tqarg( loader->lastErrorMessage() ) ); + .arg( service->library() ) + .arg( loader->lastErrorMessage() ) ); return 0; } //look up address of init function and cast it to pointer-to-function @@ -167,12 +167,12 @@ PluginManager::showAbout( const TQString &constraint ) TQString str = "<html><body><table width=\"100%\" border=\"1\">"; - str += body.tqarg( i18n( "Name" ), s->name() ); - str += body.tqarg( i18n( "Library" ), s->library() ); - str += body.tqarg( i18n( "Authors" ), s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) ); - str += body.tqarg( i18n( "Email" ), s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) ); - str += body.tqarg( i18n( "Version" ), s->property( "X-KDE-akregator-version" ).toString() ); - str += body.tqarg( i18n( "Framework Version" ), s->property( "X-KDE-akregator-framework-version" ).toString() ); + str += body.arg( i18n( "Name" ), s->name() ); + str += body.arg( i18n( "Library" ), s->library() ); + str += body.arg( i18n( "Authors" ), s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) ); + str += body.arg( i18n( "Email" ), s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) ); + str += body.arg( i18n( "Version" ), s->property( "X-KDE-akregator-version" ).toString() ); + str += body.arg( i18n( "Framework Version" ), s->property( "X-KDE-akregator-framework-version" ).toString() ); str += "</table></body></html>"; diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index 6b6ae4e6c..07290a13f 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted() { if (d->progressItem) { - d->progressItem->seStatus(i18n("Fetch completed")); + d->progressItem->setStatus(i18n("Fetch completed")); d->progressItem->setComplete(); d->progressItem = 0; } @@ -188,7 +188,7 @@ void ProgressItemHandler::slotFetchError() { if (d->progressItem) { - d->progressItem->seStatus(i18n("Fetch error")); + d->progressItem->setStatus(i18n("Fetch error")); d->progressItem->setComplete(); d->progressItem = 0; } @@ -198,7 +198,7 @@ void ProgressItemHandler::slotFetchAborted() { if (d->progressItem) { - d->progressItem->seStatus(i18n("Fetch aborted")); + d->progressItem->setStatus(i18n("Fetch aborted")); d->progressItem->setComplete(); d->progressItem = 0; } diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index b5b732bae..a0f13c479 100644 --- a/akregator/src/propertiesdialog.cpp +++ b/akregator/src/propertiesdialog.cpp @@ -102,7 +102,7 @@ void FeedPropertiesDialog::slotSetCaption(const TQString& c) if(c.isEmpty()) setCaption(i18n("Feed Properties")); else - setCaption(i18n("Properties of %1").tqarg(c)); + setCaption(i18n("Properties of %1").arg(c)); } diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index 5370bebef..bb55e24c0 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -102,9 +102,9 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { visitTreeNode(node); - TQValueList<TreeNode*> tqchildren = node->tqchildren(); + TQValueList<TreeNode*> children = node->children(); m_view->d->nodeToItem[node]->setExpandable(true); - for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it) + for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it) createItems(*it); return true; } diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp index 4c4789dfe..1f5743fd8 100644 --- a/akregator/src/tagnode.cpp +++ b/akregator/src/tagnode.cpp @@ -162,7 +162,7 @@ void TagNode::slotMarkAllArticlesAsRead() setNotificationMode(false); TQValueList<Article>::Iterator en = d->articles.end(); for (TQValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it) - (*it).seStatus(Article::Read); + (*it).setStatus(Article::Read); setNotificationMode(true); } diff --git a/akregator/src/treenode.cpp b/akregator/src/treenode.cpp index 9cc716b45..a4ae0936e 100644 --- a/akregator/src/treenode.cpp +++ b/akregator/src/treenode.cpp @@ -93,23 +93,23 @@ TreeNode* TreeNode::nextSibling() const { if (!d->parent) return 0; - TQValueList<TreeNode*> tqchildren = d->parent->tqchildren(); + TQValueList<TreeNode*> children = d->parent->children(); TreeNode* me = (TreeNode*)this; - int idx = tqchildren.findIndex(me); + int idx = children.findIndex(me); - return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L; + return idx+1 < children.size() ? *(children.at(idx+1)) : 0L; } TreeNode* TreeNode::prevSibling() const { if (!d->parent) return 0; - TQValueList<TreeNode*> tqchildren = d->parent->tqchildren(); + TQValueList<TreeNode*> children = d->parent->children(); TreeNode* me = (TreeNode*)this; - int idx = tqchildren.findIndex(me); - return idx > 0 ? *(d->parent->tqchildren().at(idx-1)) : 0L; + int idx = children.findIndex(me); + return idx > 0 ? *(d->parent->children().at(idx-1)) : 0L; } Folder* TreeNode::parent() const |