Browse Source

Rename a number of old tq methods that are no longer tq specific

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
3ca10fd9a2
100 changed files with 777 additions and 777 deletions
  1. 8
    8
      NewsLog.txt
  2. 2
    2
      akregator/src/addfeeddialog.cpp
  3. 6
    6
      akregator/src/addfeedwidgetbase.ui
  4. 18
    18
      akregator/src/akregator_part.cpp
  5. 17
    17
      akregator/src/akregator_view.cpp
  6. 12
    12
      akregator/src/article.cpp
  7. 2
    2
      akregator/src/article.h
  8. 73
    73
      akregator/src/articlefilter.cpp
  9. 2
    2
      akregator/src/articlefilter.h
  10. 2
    2
      akregator/src/articlelistview.cpp
  11. 63
    63
      akregator/src/articleviewer.cpp
  12. 3
    3
      akregator/src/dragobjects.cpp
  13. 1
    1
      akregator/src/dragobjects.h
  14. 17
    17
      akregator/src/feed.cpp
  15. 4
    4
      akregator/src/feed.h
  16. 6
    6
      akregator/src/feedlist.cpp
  17. 8
    8
      akregator/src/feedlistview.cpp
  18. 1
    1
      akregator/src/feedlistview.h
  19. 1
    1
      akregator/src/feedstorage.h
  20. 2
    2
      akregator/src/feedstoragedummyimpl.cpp
  21. 1
    1
      akregator/src/feedstoragedummyimpl.h
  22. 36
    36
      akregator/src/folder.cpp
  23. 9
    9
      akregator/src/folder.h
  24. 4
    4
      akregator/src/frame.cpp
  25. 3
    3
      akregator/src/kcursorsaver.h
  26. 22
    22
      akregator/src/librss/article.cpp
  27. 2
    2
      akregator/src/librss/category.cpp
  28. 152
    152
      akregator/src/librss/document.cpp
  29. 10
    10
      akregator/src/librss/enclosure.cpp
  30. 1
    1
      akregator/src/librss/global.h
  31. 6
    6
      akregator/src/librss/image.cpp
  32. 2
    2
      akregator/src/librss/loader.cpp
  33. 5
    5
      akregator/src/librss/loader.h
  34. 3
    3
      akregator/src/librss/testlibrss.cpp
  35. 2
    2
      akregator/src/librss/testlibrss.h
  36. 4
    4
      akregator/src/librss/textinput.cpp
  37. 6
    6
      akregator/src/librss/tools_p.cpp
  38. 7
    7
      akregator/src/listtabwidget.cpp
  39. 1
    1
      akregator/src/mainwindow.cpp
  40. 2
    2
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  41. 1
    1
      akregator/src/mk4storage/feedstoragemk4impl.h
  42. 10
    10
      akregator/src/mk4storage/metakit/CHANGES
  43. 1
    1
      akregator/src/mk4storage/metakit/README
  44. 1
    1
      akregator/src/mk4storage/metakit/src/column.h
  45. 1
    1
      akregator/src/mk4storage/metakit/tests/regress.cpp
  46. 4
    4
      akregator/src/mk4storage/mk4confwidgetbase.ui
  47. 2
    2
      akregator/src/nodelist.cpp
  48. 3
    3
      akregator/src/notificationmanager.cpp
  49. 4
    4
      akregator/src/pageviewer.cpp
  50. 8
    8
      akregator/src/pluginmanager.cpp
  51. 4
    4
      akregator/src/progressmanager.cpp
  52. 1
    1
      akregator/src/propertiesdialog.cpp
  53. 7
    7
      akregator/src/propertieswidgetbase.ui
  54. 5
    5
      akregator/src/searchbar.cpp
  55. 1
    1
      akregator/src/searchbar.h
  56. 2
    2
      akregator/src/settings_advancedbase.ui
  57. 1
    1
      akregator/src/settings_appearance.ui
  58. 2
    2
      akregator/src/settings_archive.ui
  59. 2
    2
      akregator/src/settings_browser.ui
  60. 1
    1
      akregator/src/settings_general.ui
  61. 5
    5
      akregator/src/simplenodeselector.cpp
  62. 6
    6
      akregator/src/tabwidget.cpp
  63. 1
    1
      akregator/src/tag.h
  64. 1
    1
      akregator/src/tagaction.cpp
  65. 1
    1
      akregator/src/tagnode.cpp
  66. 5
    5
      akregator/src/tagpropertieswidgetbase.ui
  67. 8
    8
      akregator/src/tagset.cpp
  68. 1
    1
      akregator/src/trayicon.cpp
  69. 6
    6
      akregator/src/treenode.cpp
  70. 1
    1
      akregator/src/treenodeitem.cpp
  71. 3
    3
      akregator/src/viewer.cpp
  72. 2
    2
      certmanager/certificateinfowidget.ui
  73. 9
    9
      certmanager/certificateinfowidgetimpl.cpp
  74. 14
    14
      certmanager/certificatewizard.ui
  75. 9
    9
      certmanager/certificatewizardimpl.cpp
  76. 31
    31
      certmanager/certmanager.cpp
  77. 1
    1
      certmanager/certmanager.h
  78. 1
    1
      certmanager/conf/appearanceconfigpage.cpp
  79. 12
    12
      certmanager/conf/appearanceconfigwidget.cpp
  80. 2
    2
      certmanager/conf/appearanceconfigwidgetbase.ui
  81. 6
    6
      certmanager/conf/configuredialog.cpp
  82. 3
    3
      certmanager/conf/dirservconfigpage.cpp
  83. 1
    1
      certmanager/conf/dnorderconfigpage.cpp
  84. 2
    2
      certmanager/crlview.cpp
  85. 1
    1
      certmanager/hierarchyanalyser.cpp
  86. 3
    3
      certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
  87. 8
    8
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  88. 10
    10
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  89. 2
    2
      certmanager/lib/backends/chiasmus/chiasmusjob.cpp
  90. 2
    2
      certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
  91. 1
    1
      certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
  92. 7
    7
      certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
  93. 3
    3
      certmanager/lib/backends/qgpgme/gnupgprocessbase.h
  94. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
  95. 6
    6
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  96. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmejob.cpp
  97. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
  98. 3
    3
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  99. 2
    2
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
  100. 0
    0
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h

+ 8
- 8
NewsLog.txt View File

@@ -66,7 +66,7 @@ Problems addressed
------------------

* kolab/issue4335 (partly): D'n'D a mail attachment with the icon is not working (rt#6126)
* kolab/issue3908 (partly): Mail view and print tqlayout problem if description of attachment is to long (#5872)
* kolab/issue3908 (partly): Mail view and print layout problem if description of attachment is to long (#5872)
* kolab/issue4455: calendar activate/deactivate handling broken
* kolab/issue4282: Adding a new event from an invitation update mail shows unnecssary message
dialog 'store/throw away' (rt#6094)
@@ -269,7 +269,7 @@ Problems addressed
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue4250: Edit "Out of office" replies: Resend notification only after: days is missing (rt#6076)
* kolab/issue4249: Crash while printing a mail without preview pane (rt#6075)
* kolab/issue4142: Composer: view all fields tqlayout and small problems (rt#6032)
* kolab/issue4142: Composer: view all fields layout and small problems (rt#6032)
* kolab/issue4012: Calender view update problem, if the same appointment is moved on the server in other folders (rt#5930)


@@ -551,7 +551,7 @@ Problems addressed

* kolab/issue3923(partial): Save as of an attachment of an invitation crashes kontact
* kolab/issue3930: time on the Marcus Bains line doesn't change
* kolab/issue3908(partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3908(partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3926: Start khelpcenter instead of webbrowser help: from the introduction/welcome screen (rt#5881)
* kolab/issue3481: Keep current email in front after saving an attachment (rt#5746)
* kolab/issue3098: OnlineIMAP, sometimes Mail body no longer shown -> Crash
@@ -565,7 +565,7 @@ Problems addressed
* kolab/issue3065: Crash in KOAgendaItem::paintEvent
* kolab/issue3902: Delete a folder while syncing leads to crash
* kolab/issue3903: Kontact hangs when switching to calendar view (rt#5870)
* kolab/issue3908 (partial): Mail view and print tqlayout problem if description of attachment is to long (rt#5872)
* kolab/issue3908 (partial): Mail view and print layout problem if description of attachment is to long (rt#5872)
* kolab/issue3807: Reminder: None of the buttons should be the default (rt#5845)
* kolab/issue3809: Reminder: sorting in look&feel of kontact (rt#5846)
* kolab/issue3813: reccuring events show wrong dates (rt#5855)
@@ -1108,7 +1108,7 @@ Friday, November 21st 2008
Problems addressed
------------------

* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
* kolab/issue2617 Kleopatra: After importing a p7c or p12 file the user is informed, that he has imported 0 certifictes.
* kolab/issue2620 Kleopatra throws an error message, if no .gnupg exists and no agent is running.

@@ -1125,7 +1125,7 @@ Sunday, November 9th 2008
Problems addressed
------------------

* kolab/issue2627 tqStatus line for audit log shown, even when it is not implemented.
* kolab/issue2627 Status line for audit log shown, even when it is not implemented.
*Support the /vendor/cmu/cyrus-imapd/sharedseen annotation available in Cyrus IMAP server 2.3.9 or higher which allows to share the seen flags between all users that have access to a folder.
* Detect if the server supports shared seen flags. Also preserve the IMAP server capabilities in kmailrc so that detection also works without a prior sync.
@@ -1474,7 +1474,7 @@ Friday, February 29th 2008
Problems addressed
-------------------

* Prevent crash after changing the tqlayout and replying then. (778728)
* Prevent crash after changing the layout and replying then. (778728)
* kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
* "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
* kolab/issue1700 kleopatra crashes after ldap search. (780211)
@@ -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();
}


+ 6
- 6
akregator/src/addfeedwidgetbase.ui View File

@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -65,7 +65,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@@ -75,7 +75,7 @@
<property name="name">
<cstring>urlEdit</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -115,7 +115,7 @@
<cstring>statusLabel</cstring>
</property>
<property name="text">
<string>tqStatus</string>
<string>Status</string>
</property>
</widget>
<spacer>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>

+ 18
- 18
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;
@@ -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()
@@ -428,11 +428,11 @@ bool Part::openFile()

if (file.size() > 0) // don't backup empty files
{
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
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 (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))
@@ -444,10 +444,10 @@ bool Part::openFile()
{
if (file.size() > 0) // don't backup empty files
{
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
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;
}

@@ -538,7 +538,7 @@ TQWidget* Part::getMainWindow()
{
// this is a dirty fix to get the main window used for the tray icon
TQWidgetList *l = kapp->tqtopLevelWidgets();
TQWidgetList *l = kapp->topLevelWidgets();
TQWidgetListIt it( *l );
TQWidget *wid;

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

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

@@ -90,18 +90,18 @@
#include <tqfile.h>
#include <tqhbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqmultilineedit.h>
#include <tqpopupmenu.h>
#include <tqptrlist.h>
#include <tqstylesheet.h>
#include <tqtextstream.h>
#include <stylesheet.h>
#include <textstream.h>
#include <tqtimer.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
#include <tqvaluevector.h>
#include <tqwhatsthis.h>
#include <tqclipboard.h>
#include <clipboard.h>

namespace Akregator {

@@ -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)
{
@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons

if (!Settings::resetQuickFilterOnNodeChange())
{
m_searchBar->slotSetqStatus(Settings::statusFilter());
m_searchBar->slotSeStatus(Settings::statusFilter());
m_searchBar->slotSetText(Settings::textFilter());
}

@@ -884,7 +884,7 @@ void View::slotFeedAdd()

}

TreeNode* lastChild = group->tqchildren().last();
TreeNode* lastChild = group->children().last();

addFeed(TQString(), lastChild, group, false);
}
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
if (delay > 0)
m_markReadTimer->start( delay*1000, true );
else
a.setqStatus(Article::Read);
a.seStatus(Article::Read);
}
}

@@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
link = article.link().url();
else
link = article.guid();
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
cb->setText(link, TQClipboard::Clipboard);
cb->setText(link, TQClipboard::Selection);
}
@@ -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).setqStatus(Article::Read);
(*it).seStatus(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).setqStatus(Article::Unread);
(*it).seStatus(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).setqStatus(Article::New);
(*it).seStatus(Article::New);
}

void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
if (article.isNull())
return;

article.setqStatus(Article::Read);
article.seStatus(Article::Read);
}

void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -1453,7 +1453,7 @@ void View::readProperties(KConfig* config)
m_searchBar->slotSetText(config->readEntry("searchLine"));
int statusfilter = config->readNumEntry("searchCombo", -1);
if (statusfilter != -1)
m_searchBar->slotSetqStatus(statusfilter);
m_searchBar->slotSeStatus(statusfilter);
}

int selectedID = config->readNumEntry("selectedNodeID", -1);

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

@@ -55,7 +55,7 @@ struct Article::Private : public Shared
0001 0000 Keep
*/

enum tqStatus {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};
enum Status {Deleted=0x01, Trash=0x02, New=0x04, Read=0x08, Keep=0x10};

TQString guid;
Backend::FeedStorage* archive;
@@ -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->setqStatus(d->guid, d->status);
d->archive->seStatus(d->guid, d->status);
}
else
{ // article is not deleted, let's add it to the archive
@@ -123,7 +123,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
d->archive->setCommentsLink(d->guid, article.commentsLink().url());
d->archive->setGuidIsPermaLink(d->guid, article.guidIsPermaLink());
d->archive->setGuidIsHash(d->guid, article.meta("guidIsHash") == "true");
d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime();
d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::currentDateTime();
d->archive->setPubDate(d->guid, d->pubDate.toTime_t());
d->archive->setAuthor(d->guid, article.author());
@@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
int statusInt = status.toInt();
if (statusInt == New)
statusInt = Unread;
setqStatus(statusInt);
seStatus(statusInt);
}
setKeep(article.meta("keep") == "true");
}
@@ -210,9 +210,9 @@ void Article::setDeleted()
if (isDeleted())
return;
setqStatus(Read);
seStatus(Read);
d->status = Private::Deleted | Private::Read;
d->archive->setqStatus(d->guid, d->status);
d->archive->seStatus(d->guid, d->status);
d->archive->setDeleted(d->guid);

if (d->feed)
@@ -299,13 +299,13 @@ int Article::status() const
return Unread;
}

void Article::setqStatus(int stat)
void Article::seStatus(int stat)
{
// use status() rather than statusBits() here to filter out status flags that we are not
// interested in
int oldtqStatus = status();
int oldStatus = status();

if (oldtqStatus != stat)
if (oldStatus != stat)
{
switch (stat)
{
@@ -319,9 +319,9 @@ void Article::setqStatus(int stat)
d->status = ( d->status | Private::New) & ~Private::Read;
break;
}
d->archive->setqStatus(d->guid, d->status);
d->archive->seStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this, oldtqStatus);
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->setqStatus(d->guid, d->status);
d->archive->seStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this);
}

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

@@ -57,7 +57,7 @@ namespace Akregator
class Article
{
public:
enum tqStatus { Unread=0, Read, New };
enum Status { Unread=0, Read, New };
typedef TQValueList<Article> List;

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

void offsetPubDate(int secs);


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

@@ -43,35 +43,35 @@ TQString Criterion::subjectToString(Subject subj)
switch (subj)
{
case Title:
return TQString::tqfromLatin1("Title");
return TQString::fromLatin1("Title");
case Link:
return TQString::tqfromLatin1("Link");
return TQString::fromLatin1("Link");
case Author:
return TQString::tqfromLatin1("Author");
return TQString::fromLatin1("Author");
case Description:
return TQString::tqfromLatin1("Description");
case tqStatus:
return TQString::tqfromLatin1("Status");
return TQString::fromLatin1("Description");
case Status:
return TQString::fromLatin1("Status");
case KeepFlag:
return TQString::tqfromLatin1("KeepFlag");
return TQString::fromLatin1("KeepFlag");
default: // should never happen (TM)
return TQString::tqfromLatin1("Description");
return TQString::fromLatin1("Description");
}
}

Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
{
if (subjStr == TQString::tqfromLatin1("Title"))
if (subjStr == TQString::fromLatin1("Title"))
return Title;
else if (subjStr == TQString::tqfromLatin1("Link"))
else if (subjStr == TQString::fromLatin1("Link"))
return Link;
else if (subjStr == TQString::tqfromLatin1("Description"))
else if (subjStr == TQString::fromLatin1("Description"))
return Description;
else if (subjStr == TQString::tqfromLatin1("Author"))
else if (subjStr == TQString::fromLatin1("Author"))
return Author;
else if (subjStr == TQString::tqfromLatin1("Status"))
return tqStatus;
else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
else if (subjStr == TQString::fromLatin1("Status"))
return Status;
else if (subjStr == TQString::fromLatin1("KeepFlag"))
return KeepFlag;

// hopefully never reached
@@ -83,27 +83,27 @@ TQString Criterion::predicateToString(Predicate pred)
switch (pred)
{
case Contains:
return TQString::tqfromLatin1("Contains");
return TQString::fromLatin1("Contains");
case Equals:
return TQString::tqfromLatin1("Equals");
return TQString::fromLatin1("Equals");
case Matches:
return TQString::tqfromLatin1("Matches");
return TQString::fromLatin1("Matches");
case Negation:
return TQString::tqfromLatin1("Negation");
return TQString::fromLatin1("Negation");
default:// hopefully never reached
return TQString::tqfromLatin1("Contains");
return TQString::fromLatin1("Contains");
}
}

Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr)
{
if (predStr == TQString::tqfromLatin1("Contains"))
if (predStr == TQString::fromLatin1("Contains"))
return Contains;
else if (predStr == TQString::tqfromLatin1("Equals"))
else if (predStr == TQString::fromLatin1("Equals"))
return Equals;
else if (predStr == TQString::tqfromLatin1("Matches"))
else if (predStr == TQString::fromLatin1("Matches"))
return Matches;
else if (predStr == TQString::tqfromLatin1("Negation"))
else if (predStr == TQString::fromLatin1("Negation"))
return Negation;
// hopefully never reached
@@ -124,24 +124,24 @@ Criterion::Criterion( Subject subject, Predicate predicate, const TQVariant &obj

void Criterion::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("subject"), subjectToString(m_subject));
config->writeEntry(TQString::fromLatin1("subject"), subjectToString(m_subject));

config->writeEntry(TQString::tqfromLatin1("predicate"), predicateToString(m_predicate));
config->writeEntry(TQString::fromLatin1("predicate"), predicateToString(m_predicate));

config->writeEntry(TQString::tqfromLatin1("objectType"), TQString(m_object.typeName()));
config->writeEntry(TQString::fromLatin1("objectType"), TQString(m_object.typeName()));

config->writeEntry(TQString::tqfromLatin1("objectValue"), m_object);
config->writeEntry(TQString::fromLatin1("objectValue"), m_object);
}

void Criterion::readConfig(KConfig* config)
{
m_subject = stringToSubject(config->readEntry(TQString::tqfromLatin1("subject")));
m_predicate = stringToPredicate(config->readEntry(TQString::tqfromLatin1("predicate")));
TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::tqfromLatin1("objType")).ascii());
m_subject = stringToSubject(config->readEntry(TQString::fromLatin1("subject")));
m_predicate = stringToPredicate(config->readEntry(TQString::fromLatin1("predicate")));
TQVariant::Type type = TQVariant::nameToType(config->readEntry(TQString::fromLatin1("objType")).ascii());

if (type != TQVariant::Invalid)
{
m_object = config->readPropertyEntry(TQString::tqfromLatin1("objectValue"), type);
m_object = config->readPropertyEntry(TQString::fromLatin1("objectValue"), type);
}
}

@@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
// ### Maybe use prettyURL here?
concreteSubject = TQVariant(article.link().url());
break;
case tqStatus:
case Status:
concreteSubject = TQVariant(article.status());
break;
case KeepFlag:
@@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const

void ArticleMatcher::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("matcherAssociation"), associationToString(m_association));
config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
config->writeEntry(TQString::tqfromLatin1("matcherCriteriaCount"), m_criteria.count());
config->writeEntry(TQString::fromLatin1("matcherCriteriaCount"), m_criteria.count());

int index = 0;

for (TQValueList<Criterion>::ConstIterator it = m_criteria.begin(); it != m_criteria.end(); ++it)
{
config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(index));
config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(index));
(*it).writeConfig(config);
++index;
}
@@ -286,14 +286,14 @@ void ArticleMatcher::writeConfig(KConfig* config) const
void ArticleMatcher::readConfig(KConfig* config)
{
m_criteria.clear();
m_association = stringToAssociation(config->readEntry(TQString::tqfromLatin1("matcherAssociation")));
m_association = stringToAssociation(config->readEntry(TQString::fromLatin1("matcherAssociation")));

int count = config->readNumEntry(TQString::tqfromLatin1("matcherCriteriaCount"), 0);
int count = config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0);
for (int i = 0; i < count; ++i)
{
Criterion c;
config->setGroup(config->group()+TQString::tqfromLatin1("_Criterion")+TQString::number(i));
config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(i));
c.readConfig(config);
m_criteria.append(c);
}
@@ -343,9 +343,9 @@ bool ArticleMatcher::allCriteriaMatch( const Article &a ) const

ArticleMatcher::Association ArticleMatcher::stringToAssociation(const TQString& assocStr)
{
if (assocStr == TQString::tqfromLatin1("LogicalAnd"))
if (assocStr == TQString::fromLatin1("LogicalAnd"))
return LogicalAnd;
else if (assocStr == TQString::tqfromLatin1("LogicalOr"))
else if (assocStr == TQString::fromLatin1("LogicalOr"))
return LogicalOr;
else
return None;
@@ -356,11 +356,11 @@ TQString ArticleMatcher::associationToString(Association association)
switch (association)
{
case LogicalAnd:
return TQString::tqfromLatin1("LogicalAnd");
return TQString::fromLatin1("LogicalAnd");
case LogicalOr:
return TQString::tqfromLatin1("LogicalOr");
return TQString::fromLatin1("LogicalOr");
default:
return TQString::tqfromLatin1("None");
return TQString::fromLatin1("None");
}
}

@@ -408,13 +408,13 @@ TagMatcher::TagMatcher(const TagMatcher& other) : AbstractMatcher(other), d(0)

void TagMatcher::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("matcherType"), TQString::tqfromLatin1("TagMatcher"));
config->writeEntry(TQString::tqfromLatin1("matcherParams"), d->tagID);
config->writeEntry(TQString::fromLatin1("matcherType"), TQString::fromLatin1("TagMatcher"));
config->writeEntry(TQString::fromLatin1("matcherParams"), d->tagID);
}

void TagMatcher::readConfig(KConfig* config)
{
d->tagID = config->readEntry(TQString::tqfromLatin1("matcherParams"));
d->tagID = config->readEntry(TQString::fromLatin1("matcherParams"));
}

bool TagMatcher::operator==(const AbstractMatcher& other) const
@@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status)
void SeStatusAction::exec(Article& article)
{
if (!article.isNull())
article.setqStatus(m_status);
article.seStatus(m_status);
}

int SeStatusAction::status() const
@@ -457,20 +457,20 @@ int SeStatusAction::status() const
return m_status;
}

void SeStatusAction::setqStatus(int status)
void SeStatusAction::seStatus(int status)
{
m_status = status;
}

void SeStatusAction::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("SeStatusAction"));
config->writeEntry(TQString::tqfromLatin1("actionParams"), m_status);
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("SeStatusAction"));
config->writeEntry(TQString::fromLatin1("actionParams"), m_status);
}

void SeStatusAction::readConfig(KConfig* config)
{
m_status = config->readNumEntry(TQString::tqfromLatin1("actionParams"), Article::Read);
m_status = config->readNumEntry(TQString::fromLatin1("actionParams"), Article::Read);
}

bool SeStatusAction::operator==(const AbstractAction& other)
@@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const

void ArticleFilterList::writeConfig(KConfig* config) const
{
config->setGroup(TQString::tqfromLatin1("Filters"));
config->writeEntry(TQString::tqfromLatin1("count"), count());
config->setGroup(TQString::fromLatin1("Filters"));
config->writeEntry(TQString::fromLatin1("count"), count());
int index = 0;
for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it)
{
config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(index));
config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(index));
(*it).writeConfig(config);
++index;
}
@@ -595,11 +595,11 @@ void ArticleFilterList::writeConfig(KConfig* config) const
void ArticleFilterList::readConfig(KConfig* config)
{
clear();
config->setGroup(TQString::tqfromLatin1("Filters"));
int count = config->readNumEntry(TQString::tqfromLatin1("count"), 0);
config->setGroup(TQString::fromLatin1("Filters"));
int count = config->readNumEntry(TQString::fromLatin1("count"), 0);
for (int i = 0; i < count; ++i)
{
config->setGroup(TQString::tqfromLatin1("Filters_")+TQString::number(i));
config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(i));
ArticleFilter filter;
filter.readConfig(config);
append(filter);
@@ -609,13 +609,13 @@ void ArticleFilterList::readConfig(KConfig* config)

void AssignTagAction::readConfig(KConfig* config)
{
m_tagID = config->readEntry(TQString::tqfromLatin1("actionParams"));
m_tagID = config->readEntry(TQString::fromLatin1("actionParams"));
}

void AssignTagAction::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("AssignTagAction"));
config->writeEntry(TQString::tqfromLatin1("actionParams"), m_tagID);
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
}

bool AssignTagAction::operator==(const AbstractAction& other)
@@ -644,7 +644,7 @@ void DeleteAction::readConfig(KConfig* /*config*/)

void DeleteAction::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("DeleteAction"));
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
}

bool DeleteAction::operator==(const AbstractAction& other)
@@ -661,27 +661,27 @@ void ArticleFilter::readConfig(KConfig* config)
delete d->action;
d->action = 0;

d->name = config->readEntry(TQString::tqfromLatin1("name"));
d->id = config->readNumEntry(TQString::tqfromLatin1("id"), 0);
d->name = config->readEntry(TQString::fromLatin1("name"));
d->id = config->readNumEntry(TQString::fromLatin1("id"), 0);

TQString matcherType = config->readEntry(TQString::tqfromLatin1("matcherType"));
TQString matcherType = config->readEntry(TQString::fromLatin1("matcherType"));

if (matcherType == TQString::tqfromLatin1("TagMatcher"))
if (matcherType == TQString::fromLatin1("TagMatcher"))
d->matcher = new TagMatcher();
else if (matcherType == TQString::tqfromLatin1("ArticleMatcher"))
else if (matcherType == TQString::fromLatin1("ArticleMatcher"))
d->matcher = new ArticleMatcher();

if (d->matcher)
d->matcher->readConfig(config);


TQString actionType = config->readEntry(TQString::tqfromLatin1("actionType"));
TQString actionType = config->readEntry(TQString::fromLatin1("actionType"));

if (actionType == TQString::tqfromLatin1("AssignTagAction"))
if (actionType == TQString::fromLatin1("AssignTagAction"))
d->action = new AssignTagAction();
else if (actionType == TQString::tqfromLatin1("DeleteAction"))
else if (actionType == TQString::fromLatin1("DeleteAction"))
d->action = new DeleteAction();
else if (actionType == TQString::tqfromLatin1("SeStatusAction"))
else if (actionType == TQString::fromLatin1("SeStatusAction"))
d->action = new SeStatusAction();

if (d->action)
@@ -690,8 +690,8 @@ void ArticleFilter::readConfig(KConfig* config)

void ArticleFilter::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::tqfromLatin1("name"), d->name);
config->writeEntry(TQString::tqfromLatin1("id"), d->id);
config->writeEntry(TQString::fromLatin1("name"), d->name);
config->writeEntry(TQString::fromLatin1("id"), d->id);
d->matcher->writeConfig(config);
d->action->writeConfig(config);
}

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

@@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction
virtual void exec(Article& article);
int status() const;
void setqStatus(int status);
void seStatus(int status);

virtual void writeConfig(KConfig* config) const;
virtual void readConfig(KConfig* config);
@@ -259,7 +259,7 @@ class Criterion
public:

enum Subject {
Title, Description, Author, Link, tqStatus, KeepFlag
Title, Description, Author, Link, Status, KeepFlag
};

static TQString subjectToString(Subject subj);

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

@@ -564,9 +564,9 @@ void ArticleListView::paintInfoBox(const TQString &message)
const uint x = (viewport()->width() - w - 30) / 2 ;
const uint y = (viewport()->height() - h - 30) / 2 ;

p.setBrush( tqcolorGroup().background() );
p.setBrush( colorGroup().background() );
p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
}

void ArticleListView::viewportPaintEvent(TQPaintEvent *e)

+ 63
- 63
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
@@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer()

void ArticleViewer::generateNormalModeCSS()
{
const TQColorGroup & cg = TQApplication::tqpalette().active();
const TQColorGroup & cg = TQApplication::palette().active();
// from kmail::headerstyle.cpp
m_normalModeCSS = TQString(
@@ -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"
@@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS()

void ArticleViewer::generateCombinedModeCSS()
{
const TQColorGroup & cg = TQApplication::tqpalette().active();
const TQColorGroup & cg = TQApplication::palette().active();
// from kmail::headerstyle.cpp
m_combinedModeCSS = TQString (
@@ -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>";
}

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

@@ -43,7 +43,7 @@ bool ArticleDrag::canDecode(const TQMimeSource* e)
bool ArticleDrag::decode(const TQMimeSource* e, TQValueList<ArticleDragItem>& articles)
{
articles.clear();
TQByteArray array = e->tqencodedData("akregator/articles");
TQByteArray array = e->encodedData("akregator/articles");
TQDataStream stream(array, IO_ReadOnly);

@@ -68,7 +68,7 @@ const char* ArticleDrag::format(int i) const
return 0;
}

TQByteArray ArticleDrag::tqencodedData(const char* mime) const
TQByteArray ArticleDrag::encodedData(const char* mime) const
{
TQCString mimetype(mime);
if (mimetype == "akregator/articles")
@@ -86,7 +86,7 @@ TQByteArray ArticleDrag::tqencodedData(const char* mime) const
}
else
{
return KURLDrag::tqencodedData(mime);
return KURLDrag::encodedData(mime);
}
}


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

@@ -57,7 +57,7 @@ public:

protected:

virtual TQByteArray tqencodedData(const char* mime) const;
virtual TQByteArray encodedData(const char* mime) const;
virtual const char* format(int i) const;

private:

+ 17
- 17
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).setqStatus(Article::Read);
(*it).seStatus(Article::Read);
setNotificationMode(true, true);
}
}
@@ -412,7 +412,7 @@ void Feed::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
queue->addFeed(this);
else
{
uint now = TQDateTime::tqcurrentDateTime().toTime_t();
uint now = TQDateTime::currentDateTime().toTime_t();

// workaround for 3.5.x: if the last fetch went wrong, try again after 30 minutes
// this fixes annoying behaviour of akregator, especially when the host is reachable
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
d->addedArticlesNotify.append(mya);
if (!mya.isDeleted() && !markImmediatelyAsRead())
mya.setqStatus(Article::New);
mya.seStatus(Article::New);
else
mya.setqStatus(Article::Read);
mya.seStatus(Article::Read);
changed = true;
}
@@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
{
mya.setKeep(old.keep());
int oldstatus = old.status();
old.setqStatus(Article::Read);
old.seStatus(Article::Read);

d->articles.remove(old.guid());
appendArticle(mya);

mya.setqStatus(oldstatus);
mya.seStatus(oldstatus);

d->updatedArticlesNotify.append(mya);
changed = true;
@@ -519,7 +519,7 @@ bool Feed::usesExpiryByAge() const

bool Feed::isExpired(const Article& a) const
{
TQDateTime now = TQDateTime::tqcurrentDateTime();
TQDateTime now = TQDateTime::currentDateTime();
int expiryAge = -1;
// check whether the feed uses the global default and the default is limitArticleAge
if ( d->archiveMode == globalDefault && Settings::archiveMode() == Settings::EnumArchiveMode::limitArticleAge)
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
{
if ((*it).status() == Article::New)
{
(*it).setqStatus(Article::Unread);
(*it).seStatus(Article::Unread);
}
}

@@ -579,7 +579,7 @@ void Feed::tryFetch()
{
d->fetchError = false;

d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, tqStatus)) );
d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) );
//connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long)));
d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever );
}
@@ -595,7 +595,7 @@ void Feed::slotImageFetched(const TQPixmap& image)
nodeModified();
}

void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus status)
void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
{
// Note that loader instances delete themselves
d->loader = 0;
@@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu
else
{
d->fetchError = true;
d->lastErrorFetch = TQDateTime::tqcurrentDateTime().toTime_t();
d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t();
emit fetchError(this);
}
return;
@@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::tqStatus statu

appendArticles(doc);

d->archive->setLastFetch( TQDateTime::tqcurrentDateTime().toTime_t());
d->archive->setLastFetch( TQDateTime::currentDateTime().toTime_t());
emit fetched(this);
}

@@ -735,14 +735,14 @@ void Feed::setArticleDeleted(Article& a)
articlesModified();
}

void Feed::setArticleChanged(Article& a, int oldtqStatus)
void Feed::setArticleChanged(Article& a, int oldStatus)
{
if (oldtqStatus != -1)
if (oldStatus != -1)
{
int newtqStatus = a.status();
if (oldtqStatus == Article::Read && newtqStatus != Article::Read)
int newStatus = a.status();
if (oldStatus == Article::Read && newStatus != Article::Read)
setUnread(unread()+1);
else if (oldtqStatus != Article::Read && newtqStatus == Article::Read)
else if (oldStatus != Article::Read && newStatus == Article::Read)
setUnread(unread()-1);
}
d->updatedArticlesNotify.append(a);

+ 4
- 4
akregator/src/feed.h View File

@@ -43,7 +43,7 @@ namespace KPIM {
// needed for slot fetchCompleted()
using RSS::Document;
using RSS::Loader;
using RSS::tqStatus;
using RSS::Status;

namespace Akregator
{
@@ -254,7 +254,7 @@ namespace Akregator
private slots:

void fetchCompleted(Loader *loader, Document doc, tqStatus status);
void fetchCompleted(Loader *loader, Document doc, Status status);
void slotImageFetched(const TQPixmap& image);

private:
@@ -265,10 +265,10 @@ namespace Akregator
void setArticleDeleted(Article& a);

/** notifies that article @c mya was changed
@param oldtqStatus if the status was changed, it contains the old status, -1 otherwise
@param oldStatus if the status was changed, it contains the old status, -1 otherwise
To be called by @ref Article
*/
void setArticleChanged(Article& a, int oldtqStatus=-1);
void setArticleChanged(Article& a, int oldStatus=-1);
void enforceLimitArticleNumber();


+ 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 setqStatus(const TQString& guid, int status) = 0;
virtual void seStatus(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::setqStatus(const TQString& guid, int status)
void FeedStorageDummyImpl::seStatus(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));
setqStatus(guid, source->status(guid));
seStatus(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 setqStatus(const TQString& guid, int status);
virtual void seStatus(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);

+ 36
- 36
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;
@@ -62,9 +62,9 @@ bool Folder::accept(TreeNodeVisitor* visitor)

Folder* Folder::fromOPML(TQDomElement e)
{
Folder* fg = new Folder(e.hasAttribute(TQString::tqfromLatin1("text")) ? e.attribute(TQString::tqfromLatin1("text")) : e.attribute(TQString::tqfromLatin1("title")));
fg->setOpen( e.attribute(TQString::tqfromLatin1("isOpen")) != TQString::tqfromLatin1(("false")));
fg->setId( e.attribute(TQString::tqfromLatin1("id")).toUInt() );
Folder* fg = new Folder(e.hasAttribute(TQString::fromLatin1("text")) ? e.attribute(TQString::fromLatin1("text")) : e.attribute(TQString::fromLatin1("title")));
fg->setOpen( e.attribute(TQString::fromLatin1("isOpen")) != TQString::fromLatin1(("false")));
fg->setId( e.attribute(TQString::fromLatin1("id")).toUInt() );
return fg;
}

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

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

@@ -23,7 +23,7 @@
*/

#include <tqregexp.h>
#include <tqstylesheet.h>
#include <stylesheet.h>

#include <kactioncollection.h>
#include <kdebug.h>
@@ -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->setqStatus(i18n("Loading..."));
m_progressItem->seStatus(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->setqStatus(i18n("Loading canceled"));
m_progressItem->seStatus(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->setqStatus(i18n("Loading completed"));
m_progressItem->seStatus(i18n("Loading completed"));
m_progressItem->setComplete();
m_progressItem = 0;
}

+ 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::tqCursorShape tqshape) {
TQApplication::setOverrideCursor( TQCursor(tqshape) );
/// constructor taking TQCursor shapes
KCursorSaver(TQt::CursorShape shape) {
TQApplication::setOverrideCursor( TQCursor(shape) );
inited = true;
}


+ 22
- 22
akregator/src/librss/article.cpp View File

@@ -78,35 +78,35 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
TQDomNode n;
for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement();
if ( (e.tagName()==TQString::tqfromLatin1("link")) &&
(e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
if ( (e.tagName()==TQString::fromLatin1("link")) &&
(e.attribute(TQString::fromLatin1("rel"), TQ