Remove additional unneeded tq method conversions

pull/21/head
Timothy Pearson 11 years ago
parent 0e00c0a86a
commit 716a5de887

@ -2063,7 +2063,7 @@ Bugfixes
Korganizer
-----------
- proko35 W1-9 icon tqalignment was improved.
- proko35 W1-9 icon alignment was improved.
Additional Fixes
================

@ -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();
}

@ -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() );

@ -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());
}
}

@ -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();

@ -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);
}

@ -80,7 +80,7 @@ namespace Akregator
bool isNull() const;
int status() const;
void seStatus(int s);
void setStatus(int s);
void offsetPubDate(int secs);

@ -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;
}

@ -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);

@ -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'>&nbsp; &nbsp; 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("<", "&lt;").replace(">", "&gt;"); // 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("<", "&lt;").replace(">", "&gt;"); // 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>";
}

@ -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);
}
}

@ -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;

@ -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);

@ -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 */

@ -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;

@ -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);

@ -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);

@ -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