Browse Source

Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 8 years ago
parent
commit
f4fae92b67
100 changed files with 673 additions and 671 deletions
  1. +1
    -1
      Makefile.am.in
  2. +1
    -1
      akregator/src/Makefile.am
  3. +2
    -2
      akregator/src/actionmanagerimpl.cpp
  4. +7
    -7
      akregator/src/addfeedwidgetbase.ui
  5. +11
    -11
      akregator/src/akregator_part.cpp
  6. +1
    -1
      akregator/src/akregator_part.h
  7. +21
    -21
      akregator/src/akregator_view.cpp
  8. +4
    -4
      akregator/src/akregator_view.h
  9. +13
    -13
      akregator/src/article.cpp
  10. +1
    -1
      akregator/src/article.h
  11. +78
    -78
      akregator/src/articlefilter.cpp
  12. +4
    -4
      akregator/src/articlefilter.h
  13. +5
    -5
      akregator/src/articlelistview.cpp
  14. +3
    -3
      akregator/src/articleviewer.cpp
  15. +3
    -3
      akregator/src/dragobjects.cpp
  16. +1
    -1
      akregator/src/dragobjects.h
  17. +15
    -15
      akregator/src/feed.cpp
  18. +1
    -1
      akregator/src/feed.h
  19. +3
    -3
      akregator/src/feediconmanager.cpp
  20. +2
    -2
      akregator/src/feedlist.cpp
  21. +1
    -1
      akregator/src/feedlist.h
  22. +3
    -3
      akregator/src/feedstorage.h
  23. +40
    -40
      akregator/src/feedstoragedummyimpl.cpp
  24. +2
    -2
      akregator/src/feedstoragedummyimpl.h
  25. +1
    -1
      akregator/src/fetchqueue.cpp
  26. +5
    -5
      akregator/src/folder.cpp
  27. +6
    -6
      akregator/src/frame.cpp
  28. +1
    -1
      akregator/src/frame.h
  29. +3
    -3
      akregator/src/kcursorsaver.h
  30. +22
    -22
      akregator/src/librss/article.cpp
  31. +1
    -1
      akregator/src/librss/article.h
  32. +2
    -2
      akregator/src/librss/category.cpp
  33. +152
    -152
      akregator/src/librss/document.cpp
  34. +10
    -10
      akregator/src/librss/enclosure.cpp
  35. +6
    -6
      akregator/src/librss/image.cpp
  36. +4
    -4
      akregator/src/librss/textinput.cpp
  37. +13
    -13
      akregator/src/librss/tools_p.cpp
  38. +5
    -5
      akregator/src/listtabwidget.cpp
  39. +2
    -2
      akregator/src/mainwindow.cpp
  40. +1
    -1
      akregator/src/mainwindow.h
  41. +3
    -1
      akregator/src/mk4storage/Makefile.am
  42. +7
    -7
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  43. +2
    -2
      akregator/src/mk4storage/feedstoragemk4impl.h
  44. +1
    -1
      akregator/src/mk4storage/metakit/include/mk4str.h
  45. +9
    -9
      akregator/src/mk4storage/metakit/src/column.cpp
  46. +1
    -1
      akregator/src/mk4storage/metakit/src/column.h
  47. +1
    -1
      akregator/src/mk4storage/metakit/src/field.h
  48. +1
    -1
      akregator/src/mk4storage/metakit/src/format.cpp
  49. +1
    -1
      akregator/src/mk4storage/metakit/src/handler.h
  50. +2
    -2
      akregator/src/mk4storage/metakit/src/persist.cpp
  51. +10
    -10
      akregator/src/mk4storage/metakit/src/remap.cpp
  52. +3
    -3
      akregator/src/mk4storage/metakit/src/store.cpp
  53. +1
    -1
      akregator/src/mk4storage/metakit/src/view.cpp
  54. +3
    -3
      akregator/src/mk4storage/metakit/tests/regress.cpp
  55. +6
    -6
      akregator/src/mk4storage/mk4confwidgetbase.ui
  56. +1
    -1
      akregator/src/mk4storage/storagemk4impl.cpp
  57. +1
    -1
      akregator/src/mk4storage/storagemk4impl.h
  58. +3
    -3
      akregator/src/nodelist.cpp
  59. +2
    -2
      akregator/src/pageviewer.cpp
  60. +4
    -4
      akregator/src/progressmanager.cpp
  61. +9
    -9
      akregator/src/propertieswidgetbase.ui
  62. +2
    -2
      akregator/src/searchbar.cpp
  63. +1
    -1
      akregator/src/searchbar.h
  64. +4
    -4
      akregator/src/settings_advancedbase.ui
  65. +3
    -3
      akregator/src/settings_appearance.ui
  66. +4
    -4
      akregator/src/settings_archive.ui
  67. +4
    -4
      akregator/src/settings_browser.ui
  68. +3
    -3
      akregator/src/settings_general.ui
  69. +3
    -3
      akregator/src/simplenodeselector.cpp
  70. +1
    -1
      akregator/src/speechclient.cpp
  71. +1
    -1
      akregator/src/storage.h
  72. +7
    -7
      akregator/src/storagedummyimpl.cpp
  73. +1
    -1
      akregator/src/storagedummyimpl.h
  74. +3
    -3
      akregator/src/storagefactoryregistry.cpp
  75. +1
    -1
      akregator/src/storagefactoryregistry.h
  76. +5
    -5
      akregator/src/tabwidget.cpp
  77. +1
    -1
      akregator/src/tag.h
  78. +1
    -1
      akregator/src/tagaction.cpp
  79. +4
    -4
      akregator/src/tagnode.cpp
  80. +1
    -1
      akregator/src/tagnode.h
  81. +10
    -10
      akregator/src/tagnodelist.cpp
  82. +1
    -1
      akregator/src/tagnodelist.h
  83. +7
    -7
      akregator/src/tagpropertieswidgetbase.ui
  84. +15
    -15
      akregator/src/tagset.cpp
  85. +4
    -4
      akregator/src/tagset.h
  86. +1
    -1
      akregator/src/treenode.h
  87. +1
    -1
      akregator/src/treenodeitem.cpp
  88. +2
    -2
      akregator/src/utils.cpp
  89. +1
    -1
      akregator/src/utils.h
  90. +2
    -2
      akregator/src/viewer.cpp
  91. +4
    -4
      certmanager/certificateinfowidget.ui
  92. +1
    -1
      certmanager/certificateinfowidgetimpl.cpp
  93. +16
    -16
      certmanager/certificatewizard.ui
  94. +4
    -4
      certmanager/certificatewizardimpl.cpp
  95. +3
    -3
      certmanager/certmanager.cpp
  96. +1
    -1
      certmanager/certmanager.h
  97. +11
    -11
      certmanager/conf/appearanceconfigwidget.cpp
  98. +4
    -4
      certmanager/conf/appearanceconfigwidgetbase.ui
  99. +6
    -6
      certmanager/conf/configuredialog.cpp
  100. +1
    -1
      certmanager/hierarchyanalyser.cpp

+ 1
- 1
Makefile.am.in View File

@@ -11,7 +11,7 @@
COMPILE_AFTER_libkmime = libemailfunctions
COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
COMPILE_AFTER_libkholidays = korganizer kontact
COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange kpilot libkdepim karm knotes kresources kfile-plugins
COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libkdepim karm knotes kresources kfile-plugins
COMPILE_AFTER_mimelib = korn kmail
COMPILE_AFTER_libkdenetwork = kmail knode
COMPILE_AFTER_libksieve = kmail

+ 1
- 1
akregator/src/Makefile.am View File

@@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \
kspeech.stub

libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
libakregatorpart_la_LIBADD = libakregatorprivate.la
libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libkdepim -lkdepim

# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)

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

@@ -148,7 +148,7 @@ void ActionManagerImpl::slotUpdateTagActions(bool enabled, const TQStringList& t

for (TQValueList<TagAction*>::ConstIterator it = actions.begin(); it != actions.end(); ++it)
{
(*it)->setChecked(tagIds.contains((*it)->tag().id()));
(*it)->setChecked(tagIds.tqcontains((*it)->tag().id()));
}
}
}
@@ -197,7 +197,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag)
if (!Settings::showTaggingGUI())
return;

if (!d->tagActions.contains(tag.id()))
if (!d->tagActions.tqcontains(tag.id()))
{
d->tagActions[tag.id()] = new TagAction(tag, d->view, TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
d->tagMenu->insert(d->tagActions[tag.id()]);

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

@@ -4,7 +4,7 @@
<property name="name">
<cstring>AddFeedWidget</cstring>
</property>
<property name="geometry">
<property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -24,7 +24,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
<cstring>layout16</cstring>
<cstring>tqlayout16</cstring>
</property>
<hbox>
<property name="name">
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -65,7 +65,7 @@
</spacer>
<widget class="QLayoutWidget">
<property name="name">
<cstring>layout15</cstring>
<cstring>tqlayout15</cstring>
</property>
<grid>
<property name="name">
@@ -75,7 +75,7 @@
<property name="name">
<cstring>urlEdit</cstring>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -137,7 +137,7 @@
</spacer>
</vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>ksqueezedtextlabel.h</includehint>

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

@@ -116,7 +116,7 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
}
};

Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
TQObject *parent, const char *name, const TQStringList& )
: DCOPObject("AkregatorIface")
, MyBasePart(parent, name)
@@ -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.").arg(Settings::archiveBackend()), i18n("Plugin error") );
KMessageBox::error(tqparentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
}

Filters::ArticleFilterList list;
@@ -187,14 +187,14 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
m_actionManager = new ActionManagerImpl(this);
ActionManager::setInstance(m_actionManager);

m_view = new Akregator::View(this, parentWidget, m_actionManager, "akregator_view");
m_view = new Akregator::View(this, tqparentWidget, m_actionManager, "akregator_view");
m_actionManager->initView(m_view);
m_actionManager->setTagSet(Kernel::self()->tagSet());

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(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
connect(m_view, TQT_SIGNAL(seStatusBarText(const TQString&)), this, TQT_SIGNAL(seStatusBarText(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*)));
@@ -428,7 +428,7 @@ bool Part::openFile()

if (file.size() > 0) // don't backup empty files
{
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t());
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
copyFile(backup);
@@ -444,7 +444,7 @@ bool Part::openFile()
{
if (file.size() > 0) // don't backup empty files
{
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::currentDateTime().toTime_t());
TQString backup = m_file + "-backup." + TQString::number(TQDateTime::tqcurrentDateTime().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>").arg(backup), i18n("OPML Parsing Error") );
@@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part)
{
if (m_mergedPart) {
factory()->removeClient(m_mergedPart);
if (childClients()->containsRef(m_mergedPart))
if (childClients()->tqcontainsRef(m_mergedPart))
removeChildClient(m_mergedPart);
}
if (part)
@@ -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->topLevelWidgets();
TQWidgetList *l = kapp->tqtopLevelWidgets();
TQWidgetListIt it( *l );
TQWidget *wid;

@@ -823,7 +823,7 @@ KParts::Part* Part::hitTest(TQWidget *widget, const TQPoint &globalPos)
if (!widget) {
break;
}
widget = widget->parentWidget();
widget = widget->tqparentWidget();
}
if (m_view && m_view->currentFrame() && child) {
return m_view->currentFrame()->part();
@@ -979,8 +979,8 @@ bool Part::tryToLock(const TQString& backendName)
"You should disable the archive for now "
"unless you are sure that %2 is not already running.</qt>")
.arg( programName, programName, backendName );
// TQString::arg( st ) only replaces the first occurrence of %1
// with st while TQString::arg( s1, s2 ) replacess all occurrences
// TQString::arg( st ) only tqreplaces the first occurrence of %1
// with st while TQString::arg( s1, s2 ) tqreplacess all occurrences
// of %1 with s1 and all occurrences of %2 with s2. So don't
// even think about changing the above to .arg( programName ).
else

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

@@ -80,7 +80,7 @@ namespace Akregator
typedef MyBasePart inherited;

/** Default constructor.*/
Part(TQWidget *parentWidget, const char *widgetName,
Part(TQWidget *tqparentWidget, const char *widgetName,
TQObject *parent, const char *name, const TQStringList&);

/** Destructor. */

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

@@ -366,7 +366,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons

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

@@ -411,10 +411,10 @@ void View::slotOnShutdown()
void View::saveSettings()
{
const TQValueList<int> spl1 = m_horizontalSplitter->sizes();
if ( spl1.contains( 0 ) == 0 )
if ( spl1.tqcontains( 0 ) == 0 )
Settings::setSplitter1Sizes( spl1 );
const TQValueList<int> spl2 = m_articleSplitter->sizes();
if ( spl2.contains( 0 ) == 0 )
if ( spl2.tqcontains( 0 ) == 0 )
Settings::setSplitter2Sizes( spl2 );
Settings::setViewMode( m_viewMode );
Settings::writeConfig();
@@ -457,7 +457,7 @@ void View::setTabIcon(const TQPixmap& icon)

void View::connectFrame(Frame *f)
{
connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(slotStatusText(const TQString&)));
connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(sloStatusText(const TQString&)));
connect(f, TQT_SIGNAL(captionChanged (const TQString &)), this, TQT_SLOT(slotCaptionChanged (const TQString &)));
connect(f, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(slotLoadingProgress(int)) );
connect(f, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted()));
@@ -465,10 +465,10 @@ void View::connectFrame(Frame *f)
connect(f, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCanceled(const TQString&)));
}

void View::slotStatusText(const TQString &c)
void View::sloStatusText(const TQString &c)
{
if (sender() == m_currentFrame)
emit setStatusBarText(c);
emit seStatusBarText(c);
}

void View::slotCaptionChanged(const TQString &c)
@@ -570,7 +570,7 @@ bool View::loadFeeds(const TQDomDocument& doc, Folder* parent)
// create a tag for every tag ID in the archive that is not part of the tagset
// this is a fallback in case the tagset was corrupted,
// so the tagging information from archive does not get lost.
if (!tagSet->containsID(*it))
if (!tagSet->tqcontainsID(*it))
{
Tag tag(*it, *it);
tagSet->insert(tag);
@@ -690,7 +690,7 @@ void View::slotFrameChanged(Frame *f)

emit setWindowCaption(f->caption());
emit setProgress(f->progress());
emit setStatusBarText(f->statusText());
emit seStatusBarText(f->statusText());

if (f->part() == m_part)
m_part->mergePart(m_articleViewer);
@@ -1070,14 +1070,14 @@ void View::slotFetchingStarted()
{
m_mainFrame->setState(Frame::Started);
m_actionManager->action("feed_stop")->setEnabled(true);
m_mainFrame->setStatusText(i18n("Fetching Feeds..."));
m_mainFrame->seStatusText(i18n("Fetching Feeds..."));
}

void View::slotFetchingStopped()
{
m_mainFrame->setState(Frame::Completed);
m_actionManager->action("feed_stop")->setEnabled(false);
m_mainFrame->setStatusText(TQString::null);
m_mainFrame->seStatusText(TQString::null);
}

void View::slotFeedFetched(Feed *feed)
@@ -1152,7 +1152,7 @@ void View::slotNewTag()

void View::slotTagCreated(const Tag& tag)
{
if (m_tagNodeList && !m_tagNodeList->containsTagId(tag.id()))
if (m_tagNodeList && !m_tagNodeList->tqcontainsTagId(tag.id()))
{
TagNode* tagNode = new TagNode(tag, m_feedList->rootNode());
m_tagNodeList->rootNode()->appendChild(tagNode);
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
if (delay > 0)
m_markReadTimer->start( delay*1000, true );
else
a.setStatus(Article::Read);
a.seStatus(Article::Read);
}
}

@@ -1329,7 +1329,7 @@ void View::slotArticleDelete()
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
{
Feed* feed = (*it).feed();
if (!feeds.contains(feed))
if (!feeds.tqcontains(feed))
feeds.append(feed);
feed->setNotificationMode(false);
(*it).setDeleted();
@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
return;

for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
(*it).setStatus(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).setStatus(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).setStatus(Article::New);
(*it).seStatus(Article::New);
}

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

article.setStatus(Article::Read);
article.seStatus(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->setStatusText(k->url().prettyURL());//getStatusBarInfo());
m_mainFrame->seStatusText(k->url().prettyURL());//geStatusBarInfo());
}
else
{
m_mainFrame->setStatusText(TQString::null);
m_mainFrame->seStatusText(TQString::null);
}
}

@@ -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->slotSetStatus(statusfilter);
m_searchBar->slotSeStatus(statusfilter);
}

int selectedID = config->readNumEntry("selectedNodeID", -1);
@@ -1529,7 +1529,7 @@ void View::updateTagActions()
TQStringList atags = (*it).tags();
for (TQStringList::ConstIterator it2 = atags.begin(); it2 != atags.end(); ++it2)
{
if (!tags.contains(*it2))
if (!tags.tqcontains(*it2))
tags += *it2;
}
}

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

@@ -83,7 +83,7 @@ namespace Akregator {
public:

/** constructor
@param part the Akregator::Part which contains this widget
@param part the Akregator::Part which tqcontains this widget
@param parent parent widget
@param Actionmanager for this view
@param name the name of the widget (@ref TQWidget )
@@ -104,7 +104,7 @@ namespace Akregator {
bool importFeeds(const TQDomDocument& doc);

/** Parse OPML presentation of feeds and read in articles archive, if present. If @c parent is @c NULL, the current
feed list is replaced by the parsed one
feed list is tqreplaced by the parsed one
@param doc TQDomDocument generated from OPML
@param parent The parent group the new nodes */
bool loadFeeds(const TQDomDocument& doc, Folder* parent = 0);
@@ -133,7 +133,7 @@ namespace Akregator {
void signalUnreadCountChanged(int);

void setWindowCaption(const TQString&);
void setStatusBarText(const TQString&);
void seStatusBarText(const TQString&);
void setProgress(int);
void signalStarted(KIO::Job*);
void signalCompleted();
@@ -195,7 +195,7 @@ namespace Akregator {
void slotMouseOverInfo(const KFileItem *kifi);

/** sets the status bar text to a given string */
void slotStatusText(const TQString &);
void sloStatusText(const TQString &);

void slotStarted();
void slotCanceled(const TQString &);

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

@@ -102,14 +102,14 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)

d->guid = article.guid();
if (!d->archive->contains(d->guid))
if (!d->archive->tqcontains(d->guid))
{
d->archive->addEntry(d->guid);

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->setStatus(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::currentDateTime();
d->pubDate = article.pubDate().isValid() ? article.pubDate() : TQDateTime::tqcurrentDateTime();
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;
setStatus(statusInt);
seStatus(statusInt);
}
setKeep(article.meta("keep") == "true");
}
@@ -210,9 +210,9 @@ void Article::setDeleted()
if (isDeleted())
return;
setStatus(Read);
seStatus(Read);
d->status = Private::Deleted | Private::Read;
d->archive->setStatus(d->guid, d->status);
d->archive->seStatus(d->guid, d->status);
d->archive->setDeleted(d->guid);

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

void Article::setStatus(int stat)
void Article::seStatus(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::setStatus(int stat)
d->status = ( d->status | Private::New) & ~Private::Read;
break;
}
d->archive->setStatus(d->guid, d->status);
d->archive->seStatus(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->setStatus(d->guid, d->status);
d->archive->seStatus(d->guid, d->status);
if (d->feed)
d->feed->setArticleChanged(*this);
}
@@ -425,7 +425,7 @@ void Article::removeTag(const TQString& tag)

bool Article::hasTag(const TQString& tag) const
{
return d->archive->tags(d->guid).contains(tag);
return d->archive->tags(d->guid).tqcontains(tag);
}

TQStringList Article::tags() const
@@ -457,7 +457,7 @@ TQString Article::buildTitle(const TQString& description)
if (i != -1)
s = s.left(i+1);
TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false);
TQString tagName, toReplace, replaceWith;
TQString tagName, toReplace, tqreplaceWith;
while (rx.search(s) != -1 )
{
tagName=rx.cap(2);
@@ -466,11 +466,11 @@ TQString Article::buildTitle(const TQString& description)
else if (tagName.startsWith("br") || tagName.startsWith("BR"))
{
toReplace=rx.cap(1);
replaceWith=" ";
tqreplaceWith=" ";
}
else
toReplace=rx.cap(1); // strip just tag
s=s.replace(s.find(toReplace),toReplace.length(),replaceWith); // do the deed
s=s.tqreplace(s.find(toReplace),toReplace.length(),tqreplaceWith); // do the deed
}
if (s.length()> 90)
s=s.left(90)+"...";

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

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

void offsetPubDate(int secs);


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

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

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

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

Criterion::Predicate Criterion::stringToPredicate(const TQString& predStr)
{
if (predStr == TQString::fromLatin1("Contains"))
if (predStr == TQString::tqfromLatin1("Contains"))
return Contains;
else if (predStr == TQString::fromLatin1("Equals"))
else if (predStr == TQString::tqfromLatin1("Equals"))
return Equals;
else if (predStr == TQString::fromLatin1("Matches"))
else if (predStr == TQString::tqfromLatin1("Matches"))
return Matches;
else if (predStr == TQString::fromLatin1("Negation"))
else if (predStr == TQString::tqfromLatin1("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::fromLatin1("subject"), subjectToString(m_subject));
config->writeEntry(TQString::tqfromLatin1("subject"), subjectToString(m_subject));

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

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

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

void Criterion::readConfig(KConfig* config)
{
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());
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());

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

@@ -269,15 +269,15 @@ bool ArticleMatcher::matches( const Article &a ) const

void ArticleMatcher::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::fromLatin1("matcherAssociation"), associationToString(m_association));
config->writeEntry(TQString::tqfromLatin1("matcherAssociation"), associationToString(m_association));
config->writeEntry(TQString::fromLatin1("matcherCriteriaCount"), m_criteria.count());
config->writeEntry(TQString::tqfromLatin1("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::fromLatin1("_Criterion")+TQString::number(index));
config->setGroup(config->group()+TQString::tqfromLatin1("_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::fromLatin1("matcherAssociation")));
m_association = stringToAssociation(config->readEntry(TQString::tqfromLatin1("matcherAssociation")));

int count = config->readNumEntry(TQString::fromLatin1("matcherCriteriaCount"), 0);
int count = config->readNumEntry(TQString::tqfromLatin1("matcherCriteriaCount"), 0);
for (int i = 0; i < count; ++i)
{
Criterion c;
config->setGroup(config->group()+TQString::fromLatin1("_Criterion")+TQString::number(i));
config->setGroup(config->group()+TQString::tqfromLatin1("_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::fromLatin1("LogicalAnd"))
if (assocStr == TQString::tqfromLatin1("LogicalAnd"))
return LogicalAnd;
else if (assocStr == TQString::fromLatin1("LogicalOr"))
else if (assocStr == TQString::tqfromLatin1("LogicalOr"))
return LogicalOr;
else
return None;
@@ -356,11 +356,11 @@ TQString ArticleMatcher::associationToString(Association association)
switch (association)
{
case LogicalAnd:
return TQString::fromLatin1("LogicalAnd");
return TQString::tqfromLatin1("LogicalAnd");
case LogicalOr:
return TQString::fromLatin1("LogicalOr");
return TQString::tqfromLatin1("LogicalOr");
default:
return TQString::fromLatin1("None");
return TQString::tqfromLatin1("None");
}
}

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

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

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

bool TagMatcher::operator==(const AbstractMatcher& other) const
@@ -442,41 +442,41 @@ void DeleteAction::exec(Article& article)
article.setDeleted();
}

SetStatusAction::SetStatusAction(int status) : m_status(status)
SeStatusAction::SeStatusAction(int status) : m_status(status)
{
}
void SetStatusAction::exec(Article& article)
void SeStatusAction::exec(Article& article)
{
if (!article.isNull())
article.setStatus(m_status);
article.seStatus(m_status);
}

int SetStatusAction::status() const
int SeStatusAction::status() const
{
return m_status;
}

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

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

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

bool SetStatusAction::operator==(const AbstractAction& other)
bool SeStatusAction::operator==(const AbstractAction& other)
{
AbstractAction* ptr = const_cast<AbstractAction*>(&other);
SetStatusAction* o = dynamic_cast<SetStatusAction*>(ptr);
SeStatusAction* o = dynamic_cast<SeStatusAction*>(ptr);
if (!o)
return false;
else
@@ -581,12 +581,12 @@ bool ArticleFilter::operator==(const ArticleFilter& other) const

void ArticleFilterList::writeConfig(KConfig* config) const
{
config->setGroup(TQString::fromLatin1("Filters"));
config->writeEntry(TQString::fromLatin1("count"), count());
config->setGroup(TQString::tqfromLatin1("Filters"));
config->writeEntry(TQString::tqfromLatin1("count"), count());
int index = 0;
for (ArticleFilterList::ConstIterator it = begin(); it != end(); ++it)
{
config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(index));
config->setGroup(TQString::tqfromLatin1("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::fromLatin1("Filters"));
int count = config->readNumEntry(TQString::fromLatin1("count"), 0);
config->setGroup(TQString::tqfromLatin1("Filters"));
int count = config->readNumEntry(TQString::tqfromLatin1("count"), 0);
for (int i = 0; i < count; ++i)
{
config->setGroup(TQString::fromLatin1("Filters_")+TQString::number(i));
config->setGroup(TQString::tqfromLatin1("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::fromLatin1("actionParams"));
m_tagID = config->readEntry(TQString::tqfromLatin1("actionParams"));
}

void AssignTagAction::writeConfig(KConfig* config) const
{
config->writeEntry(TQString::fromLatin1("actionType"), TQString::fromLatin1("AssignTagAction"));
config->writeEntry(TQString::fromLatin1("actionParams"), m_tagID);
config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("AssignTagAction"));
config->writeEntry(TQString::tqfromLatin1("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::fromLatin1("actionType"), TQString::fromLatin1("DeleteAction"));
config->writeEntry(TQString::tqfromLatin1("actionType"), TQString::tqfromLatin1("DeleteAction"));
}

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

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

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

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

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


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

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

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

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

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

@@ -166,20 +166,20 @@ class DeleteAction : public AbstractAction
virtual bool operator==(const AbstractAction& other);
};

class SetStatusAction : public AbstractAction
class SeStatusAction : public AbstractAction
{
public:
SetStatusAction(int status=0);
SeStatusAction(int status=0);
virtual void exec(Article& article);
int status() const;
void setStatus(int status);
void seStatus(int status);

virtual void writeConfig(KConfig* config) const;
virtual void readConfig(KConfig* config);

virtual SetStatusAction* clone() const { return new SetStatusAction(*this); }
virtual SeStatusAction* clone() const { return new SeStatusAction(*this); }
virtual bool operator==(const AbstractAction& other);

private:

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

@@ -354,7 +354,7 @@ void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const TQValueList<Ar
for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if (!d->articleMap.contains(*it))
if (!d->articleMap.tqcontains(*it))
{
if (!(*it).isNull() && !(*it).isDeleted())
{
@@ -385,7 +385,7 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList<
for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if (!(*it).isNull() && d->articleMap.contains(*it))
if (!(*it).isNull() && d->articleMap.tqcontains(*it))
{
ArticleItem* ali = d->articleMap[*it];

@@ -447,7 +447,7 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList<
for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if (d->articleMap.contains(*it))
if (d->articleMap.tqcontains(*it))
{
ArticleItem* ali = d->articleMap[*it];
d->articleMap.remove(*it);
@@ -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( colorGroup().background() );
p.setBrush( tqcolorGroup().background() );
p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
}

void ArticleListView::viewportPaintEvent(TQPaintEvent *e)

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

@@ -87,7 +87,7 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
{
text += TQString("<div class=\"body\">");
TQString url=node->xmlUrl();
TQString file = url.replace("/", "_").replace(":", "_");
TQString file = url.tqreplace("/", "_").tqreplace(":", "_");
KURL u(m_view->m_imageDir);
u.setFileName(file);
text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url());
@@ -410,7 +410,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
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
text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
if (article.link().isValid())
text += "</a>";
text += "</div>\n";
@@ -505,7 +505,7 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
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
text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
if (link.isValid())
text += "</a>";
text += "</div>\n";

+ 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->encodedData("akregator/articles");
TQByteArray array = e->tqencodedData("akregator/articles");
TQDataStream stream(array, IO_ReadOnly);

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

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


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

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

protected:

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

private:

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

@@ -87,7 +87,7 @@ class Feed::FeedPrivate
/** caches guids of tagged articles. key: tag, value: list of guids */
TQMap<TQString, TQStringList> taggedArticles;

/** list of deleted articles. This contains **/
/** list of deleted articles. This tqcontains **/
TQValueList<Article> deletedArticles;
/** caches guids of deleted articles for notification */
@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
TQValueList<Article>::Iterator en = tarticles.end();

for (it = tarticles.begin(); it != en; ++it)
(*it).setStatus(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::currentDateTime().toTime_t();
uint now = TQDateTime::tqcurrentDateTime().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
@@ -450,7 +450,7 @@ void Feed::appendArticles(const RSS::Document &doc)

for (it = d_articles.begin(); it != en; ++it)
{
if ( !d->articles.contains((*it).guid()) ) // article not in list
if ( !d->articles.tqcontains((*it).guid()) ) // article not in list
{
Article mya(*it, this);
mya.offsetPubDate(nudge);
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
d->addedArticlesNotify.append(mya);
if (!mya.isDeleted() && !markImmediatelyAsRead())
mya.setStatus(Article::New);
mya.seStatus(Article::New);
else
mya.setStatus(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.setStatus(Article::Read);
old.seStatus(Article::Read);

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

mya.setStatus(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::currentDateTime();
TQDateTime now = TQDateTime::tqcurrentDateTime();
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)
@@ -535,7 +535,7 @@ void Feed::appendArticle(const Article& a)
{
if ( (a.keep() && Settings::doNotExpireImportantArticles()) || ( !usesExpiryByAge() || !isExpired(a) ) ) // if not expired
{
if (!d->articles.contains(a.guid()))
if (!d->articles.tqcontains(a.guid()))
{
d->articles[a.guid()] = a;
if (!a.isDeleted() && a.status() != Article::Read)
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
{
if ((*it).status() == Article::New)
{
(*it).setStatus(Article::Unread);
(*it).seStatus(Article::Unread);
}
}

@@ -618,7 +618,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)
else
{
d->fetchError = true;
d->lastErrorFetch = TQDateTime::currentDateTime().toTime_t();
d->lastErrorFetch = TQDateTime::tqcurrentDateTime().toTime_t();
emit fetchError(this);
}
return;
@@ -647,7 +647,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status)

appendArticles(doc);

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

@@ -726,10 +726,10 @@ void Feed::setUnread(int unread)

void Feed::setArticleDeleted(Article& a)
{
if (!d->deletedArticles.contains(a))
if (!d->deletedArticles.tqcontains(a))
d->deletedArticles.append(a);

if (!d->removedArticlesNotify.contains(a))
if (!d->removedArticlesNotify.tqcontains(a))
d->removedArticlesNotify.append(a);

articlesModified();

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

@@ -264,7 +264,7 @@ namespace Akregator
void setArticleDeleted(Article& a);

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

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

@@ -59,7 +59,7 @@ FeedIconManager* FeedIconManager::self()

void FeedIconManager::fetchIcon(Feed* feed)
{
if (!d->registeredFeeds.contains(feed))
if (!d->registeredFeeds.tqcontains(feed))
{
d->registeredFeeds.append(feed);
connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*)));
@@ -133,7 +133,7 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node)
{
Feed* feed = dynamic_cast<Feed*>(node);
if (feed)
while (d->registeredFeeds.contains(feed))
while (d->registeredFeeds.tqcontains(feed))
d->registeredFeeds.remove(d->registeredFeeds.find(feed));
}

@@ -147,7 +147,7 @@ void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL
if (!p.isNull()) // we don't set null pixmaps, as feed checks pixmap.isNull() to find out whether the icon was already loaded or not. It would request the icon another time, resulting an infinite loop (until stack overflow that is
{
while (( f = d->urlDict.take(hostOrURL) ))
if (d->registeredFeeds.contains(f))
if (d->registeredFeeds.tqcontains(f))
f->setFavicon(p);
}
emit signalIconChanged(hostOrURL, iconFile);

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

@@ -117,7 +117,7 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* parent)
Feed* feed = Feed::fromOPML(e);
if (feed)
{
if (!d->urlMap[feed->xmlUrl()].contains(feed))
if (!d->urlMap[feed->xmlUrl()].tqcontains(feed))
d->urlMap[feed->xmlUrl()].append(feed);
parent->appendChild(feed);
}
@@ -219,7 +219,7 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after)
if ( list == this )
return;

if ( !flatList()->contains(parent) )
if ( !flatList()->tqcontains(parent) )
parent = rootNode();

TQValueList<TreeNode*> children = list->rootNode()->children();

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

@@ -64,7 +64,7 @@ public:
/** exports the feed list as OPML. The root node ("All Feeds") is ignored! */
virtual TQDomDocument toXML() const;

/** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it contains the same feed multiple times, any of the Feed objects is returned. */
/** returns a feed object for a given feed URL. If the feed list does not contain a feed with @c url, NULL is returned. If it tqcontains the same feed multiple times, any of the Feed objects is returned. */
Feed* findByURL(const TQString& feedURL) const;

Article findArticle(const TQString& feedURL, const TQString& guid) const;

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

@@ -80,7 +80,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
/** returns the guid of the articles in a given category */
virtual TQStringList articles(const Category& cat) = 0;

/** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is replaced by the article from the source
/** Appends all articles from another storage. If there is already an article in this feed with the same guid, it is tqreplaced by the article from the source
@param source the archive which articles should be appended
*/
virtual void add(FeedStorage* source) = 0;
@@ -92,7 +92,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
virtual void clear() = 0;

virtual bool contains(const TQString& guid) = 0;
virtual bool tqcontains(const TQString& guid) = 0;
virtual void addEntry(const TQString& guid) = 0;
virtual void deleteArticle(const TQString& guid) = 0;
virtual int comments(const TQString& guid) = 0;
@@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public QObject
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 setStatus(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;

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

@@ -147,21 +147,21 @@ TQStringList FeedStorageDummyImpl::articles(const Category& cat)

void FeedStorageDummyImpl::addEntry(const TQString& guid)
{
if (!d->entries.contains(guid))
if (!d->entries.tqcontains(guid))
{
d->entries[guid] = FeedStorageDummyImplPrivate::Entry();
setTotalCount(totalCount()+1);
}
}

bool FeedStorageDummyImpl::contains(const TQString& guid)
bool FeedStorageDummyImpl::tqcontains(const TQString& guid)
{
return d->entries.contains(guid);
return d->entries.tqcontains(guid);
}

void FeedStorageDummyImpl::deleteArticle(const TQString& guid)
{
if (!d->entries.contains(guid))
if (!d->entries.tqcontains(guid))
return;

setDeleted(guid);
@@ -172,33 +172,33 @@ void FeedStorageDummyImpl::deleteArticle(const TQString& guid)
int FeedStorageDummyImpl::comments(const TQString& guid)
{
return contains(guid) ? d->entries[guid].comments : 0;
return tqcontains(guid) ? d->entries[guid].comments : 0;
}

TQString FeedStorageDummyImpl::commentsLink(const TQString& guid)
{
return contains(guid) ? d->entries[guid].commentsLink : "";
return tqcontains(guid) ? d->entries[guid].commentsLink : "";
}

bool FeedStorageDummyImpl::guidIsHash(const TQString& guid)
{
return contains(guid) ? d->entries[guid].guidIsHash : false;
return tqcontains(guid) ? d->entries[guid].guidIsHash : false;
}

bool FeedStorageDummyImpl::guidIsPermaLink(const TQString& guid)
{
return contains(guid) ? d->entries[guid].guidIsPermaLink : false;
return tqcontains(guid) ? d->entries[guid].guidIsPermaLink : false;
}

uint FeedStorageDummyImpl::hash(const TQString& guid)
{
return contains(guid) ? d->entries[guid].hash : 0;
return tqcontains(guid) ? d->entries[guid].hash : 0;
}


void FeedStorageDummyImpl::setDeleted(const TQString& guid)
{
if (!contains(guid))
if (!tqcontains(guid))
return;

FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
@@ -233,99 +233,99 @@ void FeedStorageDummyImpl::setDeleted(const TQString& guid)

TQString FeedStorageDummyImpl::link(const TQString& guid)
{
return contains(guid) ? d->entries[guid].link : "";
return tqcontains(guid) ? d->entries[guid].link : "";
}

uint FeedStorageDummyImpl::pubDate(const TQString& guid)
{
return contains(guid) ? d->entries[guid].pubDate : 0;
return tqcontains(guid) ? d->entries[guid].pubDate : 0;
}

int FeedStorageDummyImpl::status(const TQString& guid)
{
return contains(guid) ? d->entries[guid].status : 0;
return tqcontains(guid) ? d->entries[guid].status : 0;
}

void FeedStorageDummyImpl::setStatus(const TQString& guid, int status)
void FeedStorageDummyImpl::seStatus(const TQString& guid, int status)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].status = status;
}

TQString FeedStorageDummyImpl::title(const TQString& guid)
{
return contains(guid) ? d->entries[guid].title : "";
return tqcontains(guid) ? d->entries[guid].title : "";
}

TQString FeedStorageDummyImpl::description(const TQString& guid)
{
return contains(guid) ? d->entries[guid].description : "";
return tqcontains(guid) ? d->entries[guid].description : "";
}


void FeedStorageDummyImpl::setPubDate(const TQString& guid, uint pubdate)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].pubDate = pubdate;
}

void FeedStorageDummyImpl::setGuidIsHash(const TQString& guid, bool isHash)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].guidIsHash = isHash;
}

void FeedStorageDummyImpl::setLink(const TQString& guid, const TQString& link)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].link = link;
}

void FeedStorageDummyImpl::setHash(const TQString& guid, uint hash)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].hash = hash;
}

void FeedStorageDummyImpl::setTitle(const TQString& guid, const TQString& title)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].title = title;
}

void FeedStorageDummyImpl::setDescription(const TQString& guid, const TQString& description)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].description = description;
}

void FeedStorageDummyImpl::setCommentsLink(const TQString& guid, const TQString& commentsLink)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].commentsLink = commentsLink;
}

void FeedStorageDummyImpl::setComments(const TQString& guid, int comments)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].comments = comments;
}


void FeedStorageDummyImpl::setGuidIsPermaLink(const TQString& guid, bool isPermaLink)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].guidIsPermaLink = isPermaLink;
}

void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag)
{
if (contains(guid))
if (tqcontains(guid))
{
d->entries[guid].tags.append(tag);
if (!d->taggedArticles[tag].contains(guid))
if (!d->taggedArticles[tag].tqcontains(guid))
d->taggedArticles[tag].append(guid);
if (!d->tags.contains(tag))
if (!d->tags.tqcontains(tag))
d->tags.append(tag);
}

@@ -333,7 +333,7 @@ void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag)

void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat)
{
if (!contains(guid))
if (!tqcontains(guid))
return;

d->entries[guid].categories.append(cat);
@@ -345,19 +345,19 @@ void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat

void FeedStorageDummyImpl::setAuthor(const TQString& guid, const TQString& author)
{
if (contains(guid))
if (tqcontains(guid))
d->entries[guid].author = author;
}

TQString FeedStorageDummyImpl::author(const TQString& guid)
{
return contains(guid) ? d->entries[guid].author : TQString();
return tqcontains(guid) ? d->entries[guid].author : TQString();
}

TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid)
{
if (!guid.isNull())
return contains(guid) ? d->entries[guid].categories : TQValueList<Category>();
return tqcontains(guid) ? d->entries[guid].categories : TQValueList<Category>();
else
return d->categories;
}
@@ -365,7 +365,7 @@ TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid)

void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag)
{
if (contains(guid))
if (tqcontains(guid))
{
d->entries[guid].tags.remove(tag);
d->taggedArticles[tag].remove(guid);
@@ -377,7 +377,7 @@ void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag)
TQStringList FeedStorageDummyImpl::tags(const TQString& guid)
{
if (!guid.isNull())
return contains(guid) ? d->entries[guid].tags : TQStringList();
return tqcontains(guid) ? d->entries[guid].tags : TQStringList();
else
{
return d->tags;
@@ -396,7 +396,7 @@ void FeedStorageDummyImpl::add(FeedStorage* source)

void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source)
{
if (!contains(guid))
if (!tqcontains(guid))
addEntry(guid);

setComments(guid, source->comments(guid));
@@ -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));
setStatus(guid, source->status(guid));
seStatus(guid, source->status(guid));
setTitle(guid, source->title(guid));
TQStringList tags = source->tags(guid);
@@ -424,7 +424,7 @@ void FeedStorageDummyImpl::clear()

void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length)
{
if (contains(guid))
if (tqcontains(guid))
{
FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
entry.hasEnclosure = true;
@@ -436,7 +436,7 @@ void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& ur

void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)
{
if (contains(guid))
if (tqcontains(guid))
{
FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
entry.hasEnclosure = false;
@@ -448,7 +448,7 @@ void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)

void FeedStorageDummyImpl::enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length)
{
if (contains(guid))
if (tqcontains(guid))
{
FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
hasEnclosure = entry.hasEnclosure;

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

@@ -50,7 +50,7 @@ class FeedStorageDummyImpl : public FeedStorage
virtual TQStringList articles(const Category& cat);


virtual bool contains(const TQString& guid);
virtual bool tqcontains(const TQString& guid);
virtual void addEntry(const TQString& guid);
virtual void deleteArticle(const TQString& guid);
virtual int comments(const TQString& guid);
@@ -69,7 +69,7 @@ class FeedStorageDummyImpl : public FeedStorage
virtual uint pubDate(const TQString& guid);
virtual void setPubDate(const TQString& guid, uint pubdate);
virtual int status(const TQString& guid);
virtual void setStatus(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);

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

@@ -72,7 +72,7 @@ void FetchQueue::slotAbort()

void FetchQueue::addFeed(Feed *f)
{
if (!d->queuedFeeds.contains(f) && !d->fetchingFeeds.contains(f))
if (!d->queuedFeeds.tqcontains(f) && !d->fetchingFeeds.tqcontains(f))
{
connectToFeed(f);
d->queuedFeeds.append(f);

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

@@ -62,9 +62,9 @@ bool Folder::accept(TreeNodeVisitor* visitor)

Folder* Folder::fromOPML(TQDomElement e)
{
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() );
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() );
return fg;
}

@@ -99,7 +99,7 @@ TQStringList Folder::tags() const
// intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want QSet. Now.
TQStringList t2 = (*it)->tags();
for (TQStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2)
if (!t.contains(*it2))
if (!t.tqcontains(*it2))
t.append(*it2);
}
return t;
@@ -202,7 +202,7 @@ void Folder::prependChild(TreeNode* node)
void Folder::removeChild(TreeNode* node)
{
// kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl;
if (node && d->children.contains(node))
if (node && d->children.tqcontains(node))
{
node->setParent(0);
d->children.remove(node);

+ 6
- 6
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(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &)));
connect(m_part, TQT_SIGNAL(seStatusBarText (const TQString &)), this, TQT_SLOT(seStatusText (const TQString &)));

KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p );
if (ext)
@@ -120,10 +120,10 @@ void Frame::setCaption(const TQString &s)
emit captionChanged(s);
}

void Frame::setStatusText(const TQString &s)
void Frame::seStatusText(const TQString &s)
{
m_statusText=s;
m_statusText.replace(TQRegExp("<[^>]*>"), "");
m_statusText.tqreplace(TQRegExp("<[^>]*>"), "");
emit statusText(m_statusText);
}

@@ -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::null, false);
m_progressItem->setStatus(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->setStatus(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->setStatus(i18n("Loading completed"));
m_progressItem->seStatus(i18n("Loading completed"));
m_progressItem->setComplete();
m_progressItem = 0;
}

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

@@ -69,7 +69,7 @@ namespace Akregator
void setProgress(int);
void setCaption(const TQString &);
void setTitle(const TQString &);
void setStatusText(const TQString &);
void seStatusText(const TQString &);

signals:
void captionChanged(const TQString &);

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

@@ -17,9 +17,9 @@ namespace Akregator {
class KCursorSaver : public Qt
{
public:
/// constructor taking TQCursor shapes
KCursorSaver(Qt::CursorShape shape) {
TQApplication::setOverrideCursor( TQCursor(shape) );
/// constructor taking TQCursor tqshapes
KCursorSaver(Qt::tqCursorShape tqshape) {
TQApplication::setOverrideCursor( TQCursor(tqshape) );
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::fromLatin1("link")) &&
(e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
if ( (e.tagName()==TQString::tqfromLatin1("link")) &&
(e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
{
d->link=n.toElement().attribute(TQString::fromLatin1("href"));
d->link=n.toElement().attribute(TQString::tqfromLatin1("href"));
break;
}
}
}
else
{
if (!(elemText = extractNode(node, TQString::fromLatin1("link"))).isNull())
if (!(elemText = extractNode(node, TQString::tqfromLatin1("link"))).isNull())
d->link = elemText;
}


// prefer content/content:encoded over summary/description for feeds that provide it
TQString tagName=(format==AtomFeed)? TQString::fromLatin1("content"): TQString::fromLatin1("content:encoded");
TQString tagName=(format==AtomFeed)? TQString::tqfromLatin1("content"): TQString::tqfromLatin1("content:encoded");
if (!(elemText = extractNode(node, tagName, false)).isNull())
d->description = elemText;
if (d->description.isEmpty())
{
if (!(elemText = extractNode(node, TQString::fromLatin1("body"), false)).isNull())
if (!(elemText = extractNode(node, TQString::tqfromLatin1("body"), false)).isNull())
d->description = elemText;
if (d->description.isEmpty()) // 3rd try: see http://www.intertwingly.net/blog/1299.html
{
if (!(elemText = extractNode(node, TQString::fromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
if (!(elemText = extractNode(node, TQString::tqfromLatin1((format==AtomFeed)? "summary" : "description"), false)).isNull())
d->description = elemText;
}
}
@@ -116,21 +116,21 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
if (format == AtomFeed)
{
if (version == vAtom_1_0)
elemText = extractNode(node, TQString::fromLatin1("updated"));
elemText = extractNode(node, TQString::tqfromLatin1("updated"));
else
elemText = extractNode(node, TQString::fromLatin1("issued"));
elemText = extractNode(node, TQString::tqfromLatin1("issued"));

if (!elemText.isNull())
time = parseISO8601Date(elemText);
}
else
{
elemText = extractNode(node, TQString::fromLatin1("pubDate"));
elemText = extractNode(node, TQString::tqfromLatin1("pubDate"));
if (!elemText.isNull())
time = KRFCDate::parseDate(elemText);
}
if (!(elemText = extractNode(node, TQString::fromLatin1("dc:date"))).isNull())
if (!(elemText = extractNode(node, TQString::tqfromLatin1("dc:date"))).isNull())
{
time = parseISO8601Date(elemText);
}
@@ -139,11 +139,11 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
if (time != 0)
d->pubDate.setTime_t(time);

if (!(elemText = extractNode(node, TQString::fromLatin1("wfw:comment"))).isNull()) {
if (!(elemText = extractNode(node, TQString::tqfromLatin1("wfw:comment"))).isNull()) {
d->commentsLink = elemText;
}

if (!(elemText = extractNode(node, TQString::fromLatin1("slash:comments"))).isNull()) {
if (!(elemText = extractNode(node, TQString::tqfromLatin1("slash:comments"))).isNull()) {
d->numComments = elemText.toInt();
}

@@ -152,19 +152,19 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
// in RSS 1.0, we use <item about> attribute as ID
// FIXME: pass format version instead of checking for attribute

if (!element.isNull() && element.hasAttribute(TQString::fromLatin1("rdf:about")))
if (!element.isNull() && element.hasAttribute(TQString::tqfromLatin1("rdf:about")))
{
d->guid = element.attribute(TQString::fromLatin1("rdf:about")); // HACK: using ns properly did not work
d->guid = element.attribute(TQString::tqfromLatin1("rdf:about")); // HACK: using ns properly did not work
d->guidIsPermaLink = false;
}
else
{
tagName=(format==AtomFeed)? TQString::fromLatin1("id"): TQString::fromLatin1("guid");
tagName=(format==AtomFeed)? TQString::tqfromLatin1("id"): TQString::tqfromLatin1("guid");
TQDomNode n = node.namedItem(tagName);
if (!n.isNull())
{
d->guidIsPermaLink = (format==AtomFeed)? false : true;
if (n.toElement().attribute(TQString::fromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
if (n.toElement().attribute(TQString::tqfromLatin1("isPermaLink"), "true") == "false") d->guidIsPermaLink = false;
if (!(elemText = extractNode(node, tagName)).isNull())
d->guid = elemText;
}
@@ -178,10 +178,10 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
md5Machine.update(d->title.utf8());
md5Machine.update(d->description.utf8());
d->guid = TQString(md5Machine.hexDigest().data());
d->meta[TQString::fromLatin1("guidIsHash")] = TQString::fromLatin1("true");
d->meta[TQString::tqfromLatin1("guidIsHash")] = TQString::tqfromLatin1("true");
}

TQDomNode enclosure = element.namedItem(TQString::fromLatin1("enclosure"));
TQDomNode enclosure = element.namedItem(TQString::tqfromLatin1("enclosure"));
if (enclosure.isElement())
d->enclosure = Enclosure::fromXML(enclosure.toElement());

@@ -191,12 +191,12 @@ Article::Article(const TQDomNode &node, Format format, Version version) : d(new
{
if (i.isElement())
{
if (i.toElement().tagName() == TQString::fromLatin1("metaInfo:meta"))
if (i.toElement().tagName() == TQString::tqfromLatin1("metaInfo:meta"))
{
TQString type = i.toElement().attribute(TQString::fromLatin1("type"));
TQString type = i.toElement().attribute(TQString::tqfromLatin1("type"));
d->meta[type] = i.toElement().text();
}
else if (i.toElement().tagName() == TQString::fromLatin1("category"))
else if (i.toElement().tagName() == TQString::tqfromLatin1("category"))
{
d->categories.append(Category::fromXML(i.toElement()));
}

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

@@ -148,7 +148,7 @@ namespace RSS
* @param parent The parent widget for the KURLLabel.
* @param name A name for the widget which will be used internally.
* @return a widget (a KURLLabel in this case) for the Article.
* This makes building a user-interface which contains the
* This makes building a user-interface which tqcontains the
* information in this Article object more convenient.
* The returned KURLLabel's caption will be the title(), clicking
* on it will emit the URL link(), and it has a TQToolTip attached

+ 2
- 2
akregator/src/librss/category.cpp View File

@@ -64,8 +64,8 @@ bool Category::isNull() const
Category Category::fromXML(const TQDomElement& e)
{
Category obj;
if (e.hasAttribute(TQString::fromLatin1("domain")))
obj.d->domain = e.attribute(TQString::fromLatin1("domain"));
if (e.hasAttribute(TQString::tqfromLatin1("domain")))
obj.d->domain = e.attribute(TQString::tqfromLatin1("domain"));
obj.d->category = e.text();
obj.d->isNull = false;
return obj;

+ 152
- 152
akregator/src/librss/document.cpp View File

@@ -79,15 +79,15 @@ static TQString extractLink(const TQDomNode& node, Format format)
TQDomNode n;
for (n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
const TQDomElement e = n.toElement();
if ( (e.tagName() == TQString::fromLatin1("link"))
&& (e.attribute(TQString::fromLatin1("rel"), TQString::fromLatin1("alternate")) == TQString::fromLatin1("alternate")))
if ( (e.tagName() == TQString::tqfromLatin1("link"))
&& (e.attribute(TQString::tqfromLatin1("rel"), TQString::tqfromLatin1("alternate")) == TQString::tqfromLatin1("alternate")))
{
return n.toElement().attribute(TQString::fromLatin1("href"));
return n.toElement().attribute(TQString::tqfromLatin1("href"));
}
}
}

return extractNode(node, TQString::fromLatin1("link"));
return extractNode(node, TQString::tqfromLatin1("link"));
}

@@ -100,20 +100,20 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
TQString attr;

// we should probably check that it ISN'T feed or rss, rather than check if it is xhtml
if (rootNode.toElement().tagName()==TQString::fromLatin1("html"))
if (rootNode.toElement().tagName()==TQString::tqfromLatin1("html"))
d->valid=false;
else
d->valid=true;
attr = rootNode.toElement().attribute(TQString::fromLatin1("version"), TQString::null);
if (rootNode.toElement().tagName()==TQString::fromLatin1("feed"))
attr = rootNode.toElement().attribute(TQString::tqfromLatin1("version"), TQString::null);
if (rootNode.toElement().tagName()==TQString::tqfromLatin1("feed"))
{
d->format=AtomFeed;
if (attr == TQString::fromLatin1("0.3"))
if (attr == TQString::tqfromLatin1("0.3"))
d->version = vAtom_0_3;
else if (attr == TQString::fromLatin1("0.2")) /* smt -> review */
else if (attr == TQString::tqfromLatin1("0.2")) /* smt -> review */
d->version = vAtom_0_2;
else if (attr == TQString::fromLatin1("0.1")) /* smt -> review */
else if (attr == TQString::tqfromLatin1("0.1")) /* smt -> review */
d->version = vAtom_0_1;
else
d->version = vAtom_1_0;
@@ -121,13 +121,13 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
else
{
d->format=RSSFeed;
if (attr == TQString::fromLatin1("0.91"))
if (attr == TQString::tqfromLatin1("0.91"))
d->version = v0_91;
else if (attr == TQString::fromLatin1("0.92"))
else if (attr == TQString::tqfromLatin1("0.92"))
d->version = v0_92;
else if (attr == TQString::fromLatin1("0.93"))
else if (attr == TQString::tqfromLatin1("0.93"))
d->version = v0_93;
else if (attr == TQString::fromLatin1("0.94"))
else if (attr == TQString::tqfromLatin1("0.94"))
d->version = v0_94;
else // otherwise, we just assume a RSS2 compatible feed. As rss2 is generally
// backward-compatible, this should work
@@ -137,7 +137,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
if (d->format==UnknownFormat)
{
attr = rootNode.toElement().attribute(TQString::fromLatin1("xmlns"), TQString::null);
attr = rootNode.toElement().attribute(TQString::tqfromLatin1("xmlns"), TQString::null);
if (!attr.isNull()) {
/*
* Hardcoding these URLs is actually a bad idea, since the DTD doesn't
@@ -147,11 +147,11 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
* distinguish the RSS versions by analyzing the relationship between
* the nodes.
*/
if (attr == TQString::fromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {
if (attr == TQString::tqfromLatin1("http://my.netscape.com/rdf/simple/0.9/")) {