Browse Source

Remove additional unneeded tq method conversions

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
716a5de887
100 changed files with 429 additions and 429 deletions
  1. 1
    1
      NewsLog.txt
  2. 2
    2
      akregator/src/addfeeddialog.cpp
  3. 16
    16
      akregator/src/akregator_part.cpp
  4. 16
    16
      akregator/src/akregator_view.cpp
  5. 1
    1
      akregator/src/akregator_view.h
  6. 7
    7
      akregator/src/article.cpp
  7. 1
    1
      akregator/src/article.h
  8. 2
    2
      akregator/src/articlefilter.cpp
  9. 1
    1
      akregator/src/articlefilter.h
  10. 61
    61
      akregator/src/articleviewer.cpp
  11. 6
    6
      akregator/src/feed.cpp
  12. 6
    6
      akregator/src/feedlist.cpp
  13. 8
    8
      akregator/src/feedlistview.cpp
  14. 1
    1
      akregator/src/feedlistview.h
  15. 1
    1
      akregator/src/feedstorage.h
  16. 2
    2
      akregator/src/feedstoragedummyimpl.cpp
  17. 1
    1
      akregator/src/feedstoragedummyimpl.h
  18. 33
    33
      akregator/src/folder.cpp
  19. 9
    9
      akregator/src/folder.h
  20. 5
    5
      akregator/src/frame.cpp
  21. 1
    1
      akregator/src/frame.h
  22. 3
    3
      akregator/src/kcursorsaver.h
  23. 1
    1
      akregator/src/librss/tools_p.cpp
  24. 1
    1
      akregator/src/listtabwidget.cpp
  25. 2
    2
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  26. 1
    1
      akregator/src/mk4storage/feedstoragemk4impl.h
  27. 3
    3
      akregator/src/mk4storage/metakit/CHANGES
  28. 1
    1
      akregator/src/mk4storage/metakit/README
  29. 1
    1
      akregator/src/mk4storage/metakit/src/column.h
  30. 2
    2
      akregator/src/nodelist.cpp
  31. 3
    3
      akregator/src/notificationmanager.cpp
  32. 8
    8
      akregator/src/pluginmanager.cpp
  33. 3
    3
      akregator/src/progressmanager.cpp
  34. 1
    1
      akregator/src/propertiesdialog.cpp
  35. 2
    2
      akregator/src/simplenodeselector.cpp
  36. 1
    1
      akregator/src/tagnode.cpp
  37. 6
    6
      akregator/src/treenode.cpp
  38. 6
    6
      certmanager/certificateinfowidgetimpl.cpp
  39. 4
    4
      certmanager/certificatewizard.ui
  40. 7
    7
      certmanager/certificatewizardimpl.cpp
  41. 29
    29
      certmanager/certmanager.cpp
  42. 1
    1
      certmanager/certmanager.h
  43. 11
    11
      certmanager/conf/appearanceconfigwidget.cpp
  44. 6
    6
      certmanager/conf/configuredialog.cpp
  45. 2
    2
      certmanager/conf/dirservconfigpage.cpp
  46. 1
    1
      certmanager/hierarchyanalyser.cpp
  47. 5
    5
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  48. 4
    4
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  49. 2
    2
      certmanager/lib/backends/chiasmus/chiasmusjob.cpp
  50. 2
    2
      certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
  51. 1
    1
      certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
  52. 14
    14
      certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
  53. 3
    3
      certmanager/lib/backends/qgpgme/gnupgprocessbase.h
  54. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
  55. 4
    4
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  56. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmejob.cpp
  57. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
  58. 2
    2
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  59. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
  60. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
  61. 1
    1
      certmanager/lib/cryptplugwrapper.cpp
  62. 1
    1
      certmanager/lib/kleo/cryptobackendfactory.cpp
  63. 1
    1
      certmanager/lib/kleo/hierarchicalkeylistjob.cpp
  64. 1
    1
      certmanager/lib/kleo/multideletejob.cpp
  65. 2
    2
      certmanager/lib/tests/test_gnupgprocessbase.cpp
  66. 1
    1
      certmanager/lib/tests/test_keygen.cpp
  67. 1
    1
      certmanager/lib/tests/test_keylister.cpp
  68. 1
    1
      certmanager/lib/ui/backendconfigwidget.cpp
  69. 2
    2
      certmanager/lib/ui/cryptoconfigmodule.cpp
  70. 3
    3
      certmanager/lib/ui/kdhorizontalline.cpp
  71. 1
    1
      certmanager/lib/ui/kdhorizontalline.h
  72. 15
    15
      certmanager/lib/ui/keylistview.cpp
  73. 4
    4
      certmanager/lib/ui/keylistview.h
  74. 1
    1
      certmanager/lib/ui/keyrequester.cpp
  75. 6
    6
      certmanager/lib/ui/keyselectiondialog.cpp
  76. 4
    4
      certmanager/lib/ui/messagebox.cpp
  77. 1
    1
      certmanager/lib/ui/progressdialog.cpp
  78. 1
    1
      certmanager/storedtransferjob.cpp
  79. 1
    1
      indexlib/boost-compat/config/abi/borland_prefix.hpp
  80. 2
    2
      indexlib/boost-compat/config/user.hpp
  81. 6
    6
      kaddressbook/addresseditwidget.cpp
  82. 1
    1
      kaddressbook/addresseeeditordialog.cpp
  83. 4
    4
      kaddressbook/addresseeeditorwidget.cpp
  84. 4
    4
      kaddressbook/common/filter.cpp
  85. 1
    1
      kaddressbook/common/locationmap.cpp
  86. 1
    1
      kaddressbook/contacteditorwidgetmanager.cpp
  87. 1
    1
      kaddressbook/distributionlisteditor.cpp
  88. 3
    3
      kaddressbook/distributionlistentryview.cpp
  89. 1
    1
      kaddressbook/distributionlistpicker.cpp
  90. 3
    3
      kaddressbook/editors/imeditorwidget.cpp
  91. 1
    1
      kaddressbook/editors/imeditorwidget.h
  92. 1
    1
      kaddressbook/emaileditwidget.cpp
  93. 1
    1
      kaddressbook/extensionmanager.cpp
  94. 1
    1
      kaddressbook/features/distributionlistwidget.cpp
  95. 2
    2
      kaddressbook/features/resourceselection.cpp
  96. 1
    1
      kaddressbook/geowidget.cpp
  97. 1
    1
      kaddressbook/interfaces/xxport.h
  98. 1
    1
      kaddressbook/jumpbuttonbar.cpp
  99. 8
    8
      kaddressbook/kabcore.cpp
  100. 0
    0
      kaddressbook/kabcore.h

+ 1
- 1
NewsLog.txt View File

@@ -2063,7 +2063,7 @@ Bugfixes

Korganizer
-----------
- proko35 W1-9 icon tqalignment was improved.
- proko35 W1-9 icon alignment was improved.

Additional Fixes
================

+ 2
- 2
akregator/src/addfeeddialog.cpp View File

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


+ 16
- 16
akregator/src/akregator_part.cpp View File

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

+ 16
- 16
akregator/src/akregator_view.cpp View File

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


+ 1
- 1
akregator/src/akregator_view.h View File

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

+ 7
- 7
akregator/src/article.cpp View File

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

+ 1
- 1
akregator/src/article.h View File

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

void offsetPubDate(int secs);


+ 2
- 2
akregator/src/articlefilter.cpp View File

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

+ 1
- 1
akregator/src/articlefilter.h View File

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

+ 61
- 61
akregator/src/articleviewer.cpp View File

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

+ 6
- 6
akregator/src/feed.cpp View File

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


+ 6
- 6
akregator/src/feedlist.cpp View File

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

+ 8
- 8
akregator/src/feedlistview.cpp View File

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

+ 1
- 1
akregator/src/feedlistview.h View File

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

+ 1
- 1
akregator/src/feedstorage.h View File

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

+ 2
- 2
akregator/src/feedstoragedummyimpl.cpp View File

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

+ 1
- 1
akregator/src/feedstoragedummyimpl.h View File

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

+ 33
- 33
akregator/src/folder.cpp View File

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


+ 9
- 9
akregator/src/folder.h View File

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

+ 5
- 5
akregator/src/frame.cpp View File

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

+ 1
- 1
akregator/src/frame.h View File

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

+ 3
- 3
akregator/src/kcursorsaver.h View File

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


+ 1
- 1
akregator/src/librss/tools_p.cpp View File

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

+ 1
- 1
akregator/src/listtabwidget.cpp View File

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

+ 2
- 2
akregator/src/mk4storage/feedstoragemk4impl.cpp View File

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


+ 1
- 1
akregator/src/mk4storage/feedstoragemk4impl.h View File

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

+ 3
- 3
akregator/src/mk4storage/metakit/CHANGES View File

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

+ 1
- 1
akregator/src/mk4storage/metakit/README View File

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

+ 1
- 1
akregator/src/mk4storage/metakit/src/column.h View File

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


+ 2
- 2
akregator/src/nodelist.cpp View File

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


+ 3
- 3
akregator/src/notificationmanager.cpp View File

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

+ 8
- 8
akregator/src/pluginmanager.cpp View File

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


+ 3
- 3
akregator/src/progressmanager.cpp View File

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

+ 1
- 1
akregator/src/propertiesdialog.cpp View File

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

}


+ 2
- 2
akregator/src/simplenodeselector.cpp View File

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

+ 1
- 1
akregator/src/tagnode.cpp View File

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

+ 6
- 6
akregator/src/treenode.cpp View File

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

+ 6
- 6
certmanager/certificateinfowidgetimpl.cpp View File

@@ -126,7 +126,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key ) {

TQListViewItem * item = 0;
item = new TQListViewItem( listView, item, i18n("Valid"), TQString("From %1 to %2")
.tqarg( time_t2string( key.subkey(0).creationTime() ),
.arg( time_t2string( key.subkey(0).creationTime() ),
time_t2string( key.subkey(0).expirationTime() ) ) );
item = new TQListViewItem( listView, item, i18n("Can be used for signing"),
key.canSign() ? i18n("Yes") : i18n("No") );
@@ -187,7 +187,7 @@ static void showChainListError( TQWidget * parent, const GpgME::Error & err, con
const TQString msg = i18n("<qt><p>An error occurred while fetching "
"the certificate <b>%1</b> from the backend:</p>"
"<p><b>%2</b></p></qt>")
.tqarg( subject ? TQString::fromUtf8( subject ) : TQString(),
.arg( subject ? TQString::fromUtf8( subject ) : TQString(),
TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n("Certificate Listing Failed" ) );
}
@@ -266,7 +266,7 @@ void CertificateInfoWidgetImpl::startCertificateDump() {
this, TQT_SLOT( slotDumpProcessExited(KProcess*) ) );

if ( !proc->start( KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdout | KProcess::Stderr) ) ) {
TQString wmsg = i18n("Failed to execute gpgsm:\n%1").tqarg( i18n( "program not found" ) );
TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) );
dumpView->setText( TQStyleSheet::escape( wmsg ) );
delete proc;
}
@@ -294,9 +294,9 @@ void CertificateInfoWidgetImpl::slotDumpProcessExited(KProcess* proc) {
{
TQString wmsg = i18n("Failed to execute gpgsm:\n%1");
if ( rc == -1 )
wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
else
wmsg = wmsg.tqarg( strerror(rc) );
wmsg = wmsg.arg( strerror(rc) );
dumpView->setText( TQStyleSheet::escape( wmsg ) );
}
}
@@ -328,7 +328,7 @@ void CertificateInfoWidgetImpl::updateChainView() {
item = new TQListViewItem( pathView, Kleo::DN( (*it++).userID(0).id() ).prettyDN() );
else {
item = new TQListViewItem( pathView, i18n("Issuer certificate not found ( %1)")
.tqarg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
.arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
item->setOpen( true ); // TQt bug: doesn't open after setEnabled( false ) :/
item->setEnabled( false );
}

+ 4
- 4
certmanager/certificatewizard.ui View File

@@ -82,7 +82,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
<property name="text">
<string>On this page, you will configure the cryptographic key length and the type of certificate to create.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -226,7 +226,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
<property name="text">
<string>On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -322,7 +322,7 @@ Once you are done with your settings, click
a kmail composer will be opened; you can add detailed information for the CA
there.&lt;/p&gt;&lt;qt&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -485,7 +485,7 @@ Your key pair has now been created and stored locally. The corresponding certifi
If you want to change anything, press Back and make your changes; otherwise, press Finish to send the certificate request to the CA.
&lt;/qt&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>

+ 7
- 7
certmanager/certificatewizardimpl.cpp View File

@@ -88,10 +88,10 @@ static TQString attributeLabel( const TQString & attr, bool required ) {
if ( !label.isEmpty() )
if ( required )
return i18n("Format string for the labels in the \"Your Personal Data\" page - required field",
"*%1 (%2):").tqarg( label, attr );
"*%1 (%2):").arg( label, attr );
else
return i18n("Format string for the labels in the \"Your Personal Data\" page",
"%1 (%2):").tqarg( label, attr );
"%1 (%2):").arg( label, attr );

else if ( required )
return '*' + attr + ':';
@@ -196,7 +196,7 @@ void CertificateWizardImpl::slotGenerateCertificate()
TQString certParms;
certParms += "<GnupgKeyParms format=\"internal\">\n";
certParms += "Key-Type: RSA\n";
certParms += TQString( "Key-Length: %1\n" ).tqarg( keyLengths[keyLengthCB->currentItem()] );
certParms += TQString( "Key-Length: %1\n" ).arg( keyLengths[keyLengthCB->currentItem()] );
certParms += "Key-Usage: ";
if ( signOnlyCB->isChecked() )
certParms += "Sign";
@@ -255,7 +255,7 @@ void CertificateWizardImpl::slotGenerateCertificate()
if ( err )
KMessageBox::error( this,
i18n( "Could not start certificate generation: %1" )
.tqarg( TQString::fromLocal8Bit( err.asString() ) ),
.arg( TQString::fromLocal8Bit( err.asString() ) ),
i18n( "Certificate Manager Error" ) );
else {
generatePB->setEnabled( false );
@@ -278,7 +278,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res,
if ( !res.error().isCanceled() )
KMessageBox::error( this,
i18n( "Could not generate certificate: %1" )
.tqarg( TQString::fromLatin1( res.error().asString() ) ),
.arg( TQString::fromLatin1( res.error().asString() ) ),
i18n( "Certificate Manager Error" ) );
} else {
// next will stay enabled until the user clicks Generate
@@ -434,7 +434,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
if ( result != 0 ) {
kdDebug() << "Couldn't connect to KMail\n";
KMessageBox::error( this,
i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).tqarg( error ) );
i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).arg( error ) );
return;
}

@@ -481,7 +481,7 @@ void CertificateWizardImpl::accept()
if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(
this,
i18n( "A file named \"%1\" already exists. "
"Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
"Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) ) )
return;

+ 29
- 29
certmanager/certmanager.cpp View File

@@ -523,7 +523,7 @@ void CertManager::slotRefreshKeysResult( const GpgME::Error & err ) {
return;
if ( err )
KMessageBox::error( this, i18n("An error occurred while trying to refresh "
"keys:\n%1").tqarg( TQString::fromLocal8Bit( err.asString() ) ),
"keys:\n%1").arg( TQString::fromLocal8Bit( err.asString() ) ),
i18n("Refreshing Keys Failed") );
}

@@ -532,7 +532,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
const TQString msg = i18n( "<qt><p>An error occurred while fetching "
"the certificates from the backend:</p>"
"<p><b>%1</b></p></qt>" )
.tqarg( TQString::fromLocal8Bit( err.asString() ) );
.arg( TQString::fromLocal8Bit( err.asString() ) );

KMessageBox::error( parent, msg, i18n( "Certificate Listing Failed" ) );
}
@@ -705,8 +705,8 @@ static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error
const TQString msg = i18n( "<qt><p>An error occurred while trying "
"to download the certificate %1:</p>"
"<p><b>%2</b></p></qt>" )
.tqarg( certDisplayName )
.tqarg( TQString::fromLocal8Bit( err.asString() ) );
.arg( certDisplayName )
.arg( TQString::fromLocal8Bit( err.asString() ) );

KMessageBox::error( parent, msg, i18n( "Certificate Download Failed" ) );
}
@@ -773,8 +773,8 @@ static void showCertificateImportError( TQWidget * parent, const GpgME::Error &
const TQString msg = i18n( "<qt><p>An error occurred while trying "
"to import the certificate %1:</p>"
"<p><b>%2</b></p></qt>" )
.tqarg( certDisplayName )
.tqarg( TQString::fromLocal8Bit( err.asString() ) );
.arg( certDisplayName )
.arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n( "Certificate Import Failed" ) );
}

@@ -810,50 +810,50 @@ void CertManager::slotCertificateImportResult( const GpgME::ImportResult & res )
const TQString boldLine = i18n("<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>");

TQStringList lines;
lines.push_back( normalLine.tqarg( i18n("Total number processed:"),
lines.push_back( normalLine.arg( i18n("Total number processed:"),
TQString::number( res.numConsidered() ) ) );
lines.push_back( normalLine.tqarg( i18n("Imported:"),
lines.push_back( normalLine.arg( i18n("Imported:"),
TQString::number( res.numImported() ) ) );
if ( res.newSignatures() )
lines.push_back( normalLine.tqarg( i18n("New signatures:"),
lines.push_back( normalLine.arg( i18n("New signatures:"),
TQString::number( res.newSignatures() ) ) );
if ( res.newUserIDs() )
lines.push_back( normalLine.tqarg( i18n("New user IDs:"),
lines.push_back( normalLine.arg( i18n("New user IDs:"),
TQString::number( res.newUserIDs() ) ) );
if ( res.numKeysWithoutUserID() )
lines.push_back( normalLine.tqarg( i18n("Keys without user IDs:"),
lines.push_back( normalLine.arg( i18n("Keys without user IDs:"),
TQString::number( res.numKeysWithoutUserID() ) ) );
if ( res.newSubkeys() )
lines.push_back( normalLine.tqarg( i18n("New subkeys:"),
lines.push_back( normalLine.arg( i18n("New subkeys:"),
TQString::number( res.newSubkeys() ) ) );
if ( res.newRevocations() )
lines.push_back( boldLine.tqarg( i18n("Newly revoked:"),
lines.push_back( boldLine.arg( i18n("Newly revoked:"),
TQString::number( res.newRevocations() ) ) );
if ( res.notImported() )
lines.push_back( boldLine.tqarg( i18n("Not imported:"),
lines.push_back( boldLine.arg( i18n("Not imported:"),
TQString::number( res.notImported() ) ) );
if ( res.numUnchanged() )
lines.push_back( normalLine.tqarg( i18n("Unchanged:"),
lines.push_back( normalLine.arg( i18n("Unchanged:"),
TQString::number( res.numUnchanged() ) ) );
if ( res.numSecretKeysConsidered() )
lines.push_back( normalLine.tqarg( i18n("Secret keys processed:"),
lines.push_back( normalLine.arg( i18n("Secret keys processed:"),
TQString::number( res.numSecretKeysConsidered() ) ) );
if ( res.numSecretKeysImported() )
lines.push_back( normalLine.tqarg( i18n("Secret keys imported:"),
lines.push_back( normalLine.arg( i18n("Secret keys imported:"),
TQString::number( res.numSecretKeysImported() ) ) );
if ( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() > 0 )
lines.push_back( boldLine.tqarg( i18n("Secret keys <em>not</em> imported:"),
lines.push_back( boldLine.arg( i18n("Secret keys <em>not</em> imported:"),
TQString::number( res.numSecretKeysConsidered()
- res.numSecretKeysImported()
- res.numSecretKeysUnchanged() ) ) );
if ( res.numSecretKeysUnchanged() )
lines.push_back( normalLine.tqarg( i18n("Secret keys unchanged:"),
lines.push_back( normalLine.arg( i18n("Secret keys unchanged:"),
TQString::number( res.numSecretKeysUnchanged() ) ) );

KMessageBox::information( this,
i18n( "<qt><p>Detailed results of importing %1:</p>"
"<table>%2</table></qt>" )
.tqarg( displayName ).tqarg( lines.join( TQString() ) ),
.arg( displayName ).arg( lines.join( TQString() ) ),
i18n( "Certificate Import Result" ) );

disconnectJobFromStatusBarProgress( res.error() );
@@ -875,7 +875,7 @@ void CertManager::slotDirmngrExited() {
if ( !mDirmngrProc->normalExit() )
KMessageBox::error( this, i18n( "The GpgSM process that tried to import the CRL file ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) );
else if ( mDirmngrProc->exitStatus() )
KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
else
KMessageBox::information( this, i18n( "CRL file imported successfully." ), i18n( "Certificate Manager Information" ) );

@@ -935,7 +935,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces
this, TQT_SLOT(slotStderr(KProcess*,char*,int)) );
if( !mDirmngrProc->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
delete mDirmngrProc; mDirmngrProc = 0;
KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).tqarg( processname ), i18n( "Certificate Manager Error" ) );
KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) );
return false;
}
return true;
@@ -992,7 +992,7 @@ void CertManager::slotClearCRLsResult() {
if ( !mDirmngrProc->normalExit() )
KMessageBox::error( this, i18n( "The DirMngr process that tried to clear the CRL cache ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) );
else if ( mDirmngrProc->exitStatus() )
KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
else
KMessageBox::information( this, i18n( "CRL cache cleared successfully." ), i18n( "Certificate Manager Information" ) );
delete mDirmngrProc; mDirmngrProc = 0;
@@ -1003,7 +1003,7 @@ static void showDeleteError( TQWidget * parent, const GpgME::Error & err ) {
const TQString msg = i18n("<qt><p>An error occurred while trying to delete "
"the certificates:</p>"
"<p><b>%1</b></p></qt>")
.tqarg( TQString::fromLocal8Bit( err.asString() ) );
.arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n("Certificate Deletion Failed") );
}

@@ -1076,7 +1076,7 @@ void CertManager::slotDeleteCertificate() {
const TQString msg = keysToDelete.size() > keys.size()
? i18n("Do you really want to delete this certificate and the %1 certificates it certified?",
"Do you really want to delete these %n certificates and the %1 certificates they certified?",
keys.size() ).tqarg( keysToDelete.size() - keys.size() )
keys.size() ).arg( keysToDelete.size() - keys.size() )
: i18n("Do you really want to delete this certificate?",
"Do you really want to delete these %n certificates?", keys.size() ) ;

@@ -1098,7 +1098,7 @@ void CertManager::slotDeleteCertificate() {
"the certificates:</p>"
"<p><b>%1</b><p></qt>" );
KMessageBox::error( this,
str.tqarg( i18n("Operation not supported by the backend.") ),
str.arg( i18n("Operation not supported by the backend.") ),
i18n("Certificate Deletion Failed") );
}

@@ -1206,7 +1206,7 @@ static void showCertificateExportError( TQWidget * parent, const GpgME::Error &
const TQString msg = i18n("<qt><p>An error occurred while trying to export "
"the certificate:</p>"
"<p><b>%1</b></p></qt>")
.tqarg( TQString::fromLocal8Bit( err.asString() ) );
.arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n("Certificate Export Failed") );
}

@@ -1239,7 +1239,7 @@ static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w )
KMessageBox::warningContinueCancel(
w,
i18n( "A file named \"%1\" already exists. "
"Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
"Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) ) )
return false;
@@ -1301,7 +1301,7 @@ static void showSecretKeyExportError( TQWidget * parent, const GpgME::Error & er
const TQString msg = i18n("<qt><p>An error occurred while trying to export "
"the secret key:</p>"
"<p><b>%1</b></p></qt>")
.tqarg( TQString::fromLocal8Bit( err.asString() ) );
.arg( TQString::fromLocal8Bit( err.asString() ) );
KMessageBox::error( parent, msg, i18n("Secret-Key Export Failed") );
}


+ 1
- 1
certmanager/certmanager.h View File

@@ -137,7 +137,7 @@ private slots:
void slotConfigureGpgME();
void slotContextMenu(Kleo::KeyListViewItem*, const TQPoint& point);
void slotDropped(const KURL::List&);
/** Schedule a tqrepaint for the listview items. E.g. when the
/** Schedule a repaint for the listview items. E.g. when the
colour config has changed */
void slotRepaint();
/** Schedule a validating keylisting for the selected items (or

+ 11
- 11
certmanager/conf/appearanceconfigwidget.cpp View File

@@ -139,7 +139,7 @@ private:
setText( 0, name );
}

void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );

private:
TQColor mForegroundColor, mBackgroundColor;
@@ -152,7 +152,7 @@ private:
bool mDirty;
};

void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
TQColorGroup _cg = cg;
TQFont font = p->font();
if ( mHasFont )
@@ -172,7 +172,7 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in
if ( mBackgroundColor.isValid() )
_cg.setColor( TQColorGroup::Base, mBackgroundColor );

TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
TQListViewItem::paintCell( p, _cg, column, width, alignment );
}

////
@@ -227,7 +227,7 @@ void AppearanceConfigWidget::slotDefaultClicked()
if ( !item )
return;
item->setDefaultAppearance();
item->tqrepaint();
item->repaint();
slotSelectionChanged( item );
emit changed();
}
@@ -280,7 +280,7 @@ void AppearanceConfigWidget::slotForegroundClicked() {
int result = KColorDialog::getColor( fg );
if ( result == KColorDialog::Accepted ) {
item->setForegroundColor( fg );
item->tqrepaint();
item->repaint();
emit changed();
}
}
@@ -294,7 +294,7 @@ void AppearanceConfigWidget::slotBackgroundClicked() {
int result = KColorDialog::getColor( bg );
if ( result == KColorDialog::Accepted ) {
item->setBackgroundColor( bg );
item->tqrepaint();
item->repaint();
emit changed();