summaryrefslogtreecommitdiffstats
path: root/konq-plugins/akregator
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:22:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:22:56 +0000
commit7346aee26bf190a7e70333c40fab4caca847cd27 (patch)
tree4b019b434f88dcc3eeaafe1d3f26240b4c4718e8 /konq-plugins/akregator
parent23a3d3aa5b44cbdf305495919866d9dbf4f6da54 (diff)
downloadtdeaddons-7346aee26bf190a7e70333c40fab4caca847cd27.tar.gz
tdeaddons-7346aee26bf190a7e70333c40fab4caca847cd27.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1157634 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konq-plugins/akregator')
-rw-r--r--konq-plugins/akregator/akregatorplugin.cpp22
-rw-r--r--konq-plugins/akregator/akregatorplugin.h8
-rw-r--r--konq-plugins/akregator/feeddetector.cpp46
-rw-r--r--konq-plugins/akregator/feeddetector.h20
-rw-r--r--konq-plugins/akregator/konqfeedicon.cpp54
-rw-r--r--konq-plugins/akregator/konqfeedicon.h8
-rw-r--r--konq-plugins/akregator/pluginbase.cpp14
-rw-r--r--konq-plugins/akregator/pluginbase.h6
8 files changed, 89 insertions, 89 deletions
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp
index a2a82f2..2f59adc 100644
--- a/konq-plugins/akregator/akregatorplugin.cpp
+++ b/konq-plugins/akregator/akregatorplugin.cpp
@@ -38,21 +38,21 @@
#include <khtmlview.h>
#include <kmessagebox.h>
-#include <qdir.h>
-#include <qcstring.h>
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqdir.h>
+#include <tqcstring.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
using namespace Akregator;
typedef KGenericFactory<AkregatorMenu, KonqPopupMenu> AkregatorMenuFactory;
K_EXPORT_COMPONENT_FACTORY( libakregatorkonqplugin, AkregatorMenuFactory("akregatorkonqplugin") )
-AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const QStringList& /* list */ )
+AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringList& /* list */ )
: KonqPopupMenuPlugin( popupmenu, name), PluginBase(), m_conf(0), m_part(0)
{
kdDebug() << "AkregatorMenu::AkregatorMenu()" << endl;
- if ( QCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) )
+ if ( TQCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) )
return;
// Do nothing if user has turned us off.
@@ -84,7 +84,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
if (isFeedUrl(it))
{
kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl;
- KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" );
+ KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" );
addAction( action );
addSeparator();
m_feedURL = it->url().url();
@@ -101,7 +101,7 @@ AkregatorMenu::~AkregatorMenu()
delete m_conf;
}
-bool AkregatorMenu::isFeedUrl(const QString &url)
+bool AkregatorMenu::isFeedUrl(const TQString &url)
{
if (url.contains(".htm", false) != 0) return false;
if (url.contains("rss", false) != 0) return true;
@@ -116,7 +116,7 @@ bool AkregatorMenu::isFeedUrl(const KFileItem * item)
return true;
else
{
- QString url = item->url().url();
+ TQString url = item->url().url();
// If URL ends in .htm or .html, it is not a feed url.
return isFeedUrl(url);
}
@@ -125,9 +125,9 @@ bool AkregatorMenu::isFeedUrl(const KFileItem * item)
void AkregatorMenu::slotAddFeed()
{
- QString url = m_part ? fixRelativeURL(m_feedURL, m_part->baseURL()) : m_feedURL;
+ TQString url = m_part ? fixRelativeURL(m_feedURL, m_part->baseURL()) : m_feedURL;
if(akregatorRunning())
- addFeedsViaDCOP(QStringList(url));
+ addFeedsViaDCOP(TQStringList(url));
else
addFeedViaCmdLine(url);
}
diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h
index 8074f2f..9fb6787 100644
--- a/konq-plugins/akregator/akregatorplugin.h
+++ b/konq-plugins/akregator/akregatorplugin.h
@@ -37,21 +37,21 @@ class AkregatorMenu : public KonqPopupMenuPlugin, PluginBase
{
Q_OBJECT
public:
- AkregatorMenu( KonqPopupMenu *, const char *name, const QStringList &list );
+ AkregatorMenu( KonqPopupMenu *, const char *name, const TQStringList &list );
virtual ~AkregatorMenu();
public slots:
void slotAddFeed();
protected:
- bool isFeedUrl(const QString &s);
+ bool isFeedUrl(const TQString &s);
bool isFeedUrl(const KFileItem *item);
private:
- QStringList m_feedMimeTypes;
+ TQStringList m_feedMimeTypes;
KConfig *m_conf;
KHTMLPart *m_part;
- QString m_feedURL;
+ TQString m_feedURL;
};
}
diff --git a/konq-plugins/akregator/feeddetector.cpp b/konq-plugins/akregator/feeddetector.cpp
index 928a282..57a333c 100644
--- a/konq-plugins/akregator/feeddetector.cpp
+++ b/konq-plugins/akregator/feeddetector.cpp
@@ -22,10 +22,10 @@
without including the source code for Qt in the source distribution.
*/
-#include <qregexp.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
#include <kcharsets.h>
#include "feeddetector.h"
@@ -33,26 +33,26 @@
using namespace Akregator;
-FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s)
+FeedDetectorEntryList FeedDetector::extractFromLinkTags(const TQString& s)
{
//reduce all sequences of spaces, newlines etc. to one space:
- QString str = s.simplifyWhiteSpace();
+ TQString str = s.simplifyWhiteSpace();
// extracts <link> tags
- QRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false);
+ TQRegExp reLinkTag("<[\\s]?LINK[^>]*REL[\\s]?=[\\s]?\\\"[\\s]?(ALTERNATE|SERVICE\\.FEED)[\\s]?\\\"[^>]*>", false);
// extracts the URL (href="url")
- QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
+ TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
// extracts type attribute
- QRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
+ TQRegExp reType("TYPE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
// extracts the title (title="title")
- QRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
+ TQRegExp reTitle("TITLE[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
int pos = 0;
int matchpos = 0;
// get all <link> tags
- QStringList linkTags;
+ TQStringList linkTags;
//int strlength = str.length();
while ( matchpos != -1 )
{
@@ -66,9 +66,9 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s)
FeedDetectorEntryList list;
- for ( QStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it )
+ for ( TQStringList::Iterator it = linkTags.begin(); it != linkTags.end(); ++it )
{
- QString type;
+ TQString type;
int pos = reType.search(*it, 0);
if (pos != -1)
type = reType.cap(1).lower();
@@ -78,14 +78,14 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s)
&& type != "application/atom+xml" && type != "text/xml" )
continue;
- QString title;
+ TQString title;
pos = reTitle.search(*it, 0);
if (pos != -1)
title = reTitle.cap(1);
title = KCharsets::resolveEntities(title);
- QString url;
+ TQString url;
pos = reHref.search(*it, 0);
if (pos != -1)
url = reHref.cap(1);
@@ -104,33 +104,33 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const QString& s)
return list;
}
-QStringList FeedDetector::extractBruteForce(const QString& s)
+TQStringList FeedDetector::extractBruteForce(const TQString& s)
{
- QString str = s.simplifyWhiteSpace();
+ TQString str = s.simplifyWhiteSpace();
- QRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false);
+ TQRegExp reAhrefTag("<[\\s]?A[^>]?HREF=[\\s]?\\\"[^\\\"]*\\\"[^>]*>", false);
// extracts the URL (href="url")
- QRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
+ TQRegExp reHref("HREF[\\s]?=[\\s]?\\\"([^\\\"]*)\\\"", false);
- QRegExp rssrdfxml(".*(RSS|RDF|XML)", false);
+ TQRegExp rssrdfxml(".*(RSS|RDF|XML)", false);
int pos = 0;
int matchpos = 0;
// get all <a href> tags and capture url
- QStringList list;
+ TQStringList list;
//int strlength = str.length();
while ( matchpos != -1 )
{
matchpos = reAhrefTag.search(str, pos);
if ( matchpos != -1 )
{
- QString ahref = str.mid(matchpos, reAhrefTag.matchedLength());
+ TQString ahref = str.mid(matchpos, reAhrefTag.matchedLength());
int hrefpos = reHref.search(ahref, 0);
if ( hrefpos != -1 )
{
- QString url = reHref.cap(1);
+ TQString url = reHref.cap(1);
url = KCharsets::resolveEntities(url);
diff --git a/konq-plugins/akregator/feeddetector.h b/konq-plugins/akregator/feeddetector.h
index b557e33..8002d42 100644
--- a/konq-plugins/akregator/feeddetector.h
+++ b/konq-plugins/akregator/feeddetector.h
@@ -25,8 +25,8 @@
#ifndef AKREGATORFEEDDETECTOR_H
#define AKREGATORFEEDDETECTOR_H
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
class QStringList;
@@ -37,18 +37,18 @@ namespace Akregator
{
public:
FeedDetectorEntry() {}
- FeedDetectorEntry(const QString& url, const QString& title)
+ FeedDetectorEntry(const TQString& url, const TQString& title)
: m_url(url), m_title(title) {}
- const QString& url() const { return m_url; }
- const QString& title() const { return m_title; }
+ const TQString& url() const { return m_url; }
+ const TQString& title() const { return m_title; }
private:
- const QString m_url;
- const QString m_title;
+ const TQString m_url;
+ const TQString m_title;
};
- typedef QValueList<FeedDetectorEntry> FeedDetectorEntryList;
+ typedef TQValueList<FeedDetectorEntry> FeedDetectorEntryList;
/** a class providing functions to detect linked feeds in HTML sources */
class FeedDetector
@@ -60,14 +60,14 @@ namespace Akregator
@param s the html source to scan (the actual source, no URI)
@return a list containing the detected feeds
*/
- static FeedDetectorEntryList extractFromLinkTags(const QString& s);
+ static FeedDetectorEntryList extractFromLinkTags(const TQString& s);
/** \brief searches an HTML page for slightly feed-like looking links and catches everything not running away quickly enough.
Extracts links from @c <a @c href> tags which end with @c xml, @c rss or @c rdf
@param s the html source to scan (the actual source, no URI)
@return a list containing the detected feeds
*/
- static QStringList extractBruteForce(const QString& s);
+ static TQStringList extractBruteForce(const TQString& s);
private:
FeedDetector() {}
diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp
index 436a4be..ce6f89e 100644
--- a/konq-plugins/akregator/konqfeedicon.cpp
+++ b/konq-plugins/akregator/konqfeedicon.cpp
@@ -41,13 +41,13 @@
#include <kurllabel.h>
#include <kurl.h>
-#include <qcursor.h>
-#include <qobjectlist.h>
-#include <qpixmap.h>
-#include <qstringlist.h>
-#include <qstylesheet.h>
-#include <qtimer.h>
-#include <qtooltip.h>
+#include <tqcursor.h>
+#include <tqobjectlist.h>
+#include <tqpixmap.h>
+#include <tqstringlist.h>
+#include <tqstylesheet.h>
+#include <tqtimer.h>
+#include <tqtooltip.h>
using namespace Akregator;
@@ -55,7 +55,7 @@ typedef KGenericFactory<KonqFeedIcon> KonqFeedIconFactory;
K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon,
KonqFeedIconFactory("akregatorkonqfeedicon"))
-KonqFeedIcon::KonqFeedIcon(QObject *parent, const char *name, const QStringList &)
+KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &)
: KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0)
{
KGlobal::locale()->insertCatalogue("akregator_konqplugin");
@@ -63,15 +63,15 @@ KonqFeedIcon::KonqFeedIcon(QObject *parent, const char *name, const QStringList
m_part = dynamic_cast<KHTMLPart*>(parent);
if(!m_part) { kdDebug() << "couldn't get part" << endl; return; }
// FIXME: need to do this because of a bug in khtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?)
- //connect(m_part->view(), SIGNAL(finishedLayout()), this, SLOT(addFeedIcon()));
- QTimer::singleShot(0, this, SLOT(waitPartToLoad()));
+ //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon()));
+ TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad()));
}
void KonqFeedIcon::waitPartToLoad()
{
- connect(m_part, SIGNAL(completed()), this, SLOT(addFeedIcon()));
- connect(m_part, SIGNAL(completed(bool)), this, SLOT(addFeedIcon())); // to make pages with metarefresh to work
- connect(m_part, SIGNAL(started(KIO::Job *)), this, SLOT(removeFeedIcon()));
+ connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addFeedIcon()));
+ connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addFeedIcon())); // to make pages with metarefresh to work
+ connect(m_part, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(removeFeedIcon()));
addFeedIcon();
}
@@ -101,7 +101,7 @@ bool KonqFeedIcon::feedFound()
return false;
unsigned int i;
- QString doc = "";
+ TQString doc = "";
for (i = 0; i < linkNodes.length(); i++)
{
@@ -110,7 +110,7 @@ bool KonqFeedIcon::feedFound()
for (unsigned int j = 0; j < node.attributes().length(); j++)
{
doc += node.attributes().item(j).nodeName().string() + "=\"";
- doc += QStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", "&quot;");
+ doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", "&quot;");
doc += "\" ";
}
doc += "/>";
@@ -126,21 +126,21 @@ void KonqFeedIcon::contextMenu()
m_menu = new KPopupMenu(m_part->widget());
if(m_feedList.count() == 1) {
m_menu->insertTitle(m_feedList.first().title());
- m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, SLOT(addFeeds()) );
+ m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, TQT_SLOT(addFeeds()) );
}
else {
m_menu->insertTitle(i18n("Add Feeds to Akregator"));
- connect(m_menu, SIGNAL(activated(int)), this, SLOT(addFeed(int)));
+ connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addFeed(int)));
int id = 0;
for(FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it) {
m_menu->insertItem(SmallIcon("bookmark_add"), (*it).title(), id);
id++;
}
- //disconnect(m_menu, SIGNAL(activated(int)), this, SLOT(addFeed(int)));
+ //disconnect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addFeed(int)));
m_menu->insertSeparator();
- m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to Akregator"), this, SLOT(addFeeds()), 0, 50000 );
+ m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to Akregator"), this, TQT_SLOT(addFeeds()), 0, 50000 );
}
- m_menu->popup(QCursor::pos());
+ m_menu->popup(TQCursor::pos());
}
void KonqFeedIcon::addFeedIcon()
@@ -156,17 +156,17 @@ void KonqFeedIcon::addFeedIcon()
// from khtmlpart's ualabel
m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
- m_feedIcon->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+ m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
m_feedIcon->setUseCursor(false);
//FIXME hackish
- m_feedIcon->setPixmap(QPixmap(locate("data", "akregator/pics/rss.png")));
+ m_feedIcon->setPixmap(TQPixmap(locate("data", "akregator/pics/rss.png")));
- QToolTip::remove(m_feedIcon);
- QToolTip::add(m_feedIcon, i18n("Monitor this site for updates (using news feed)"));
+ TQToolTip::remove(m_feedIcon);
+ TQToolTip::add(m_feedIcon, i18n("Monitor this site for updates (using news feed)"));
m_statusBarEx->addStatusBarItem(m_feedIcon, 0, true);
- connect(m_feedIcon, SIGNAL(leftClickedURL()), this, SLOT(contextMenu()));
+ connect(m_feedIcon, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(contextMenu()));
}
void KonqFeedIcon::removeFeedIcon()
@@ -188,7 +188,7 @@ void KonqFeedIcon::addFeed(int id)
{
if(id == 50000) return;
if(akregatorRunning())
- addFeedsViaDCOP(QStringList(fixRelativeURL(m_feedList[id].url(), m_part->baseURL())));
+ addFeedsViaDCOP(TQStringList(fixRelativeURL(m_feedList[id].url(), m_part->baseURL())));
else
addFeedViaCmdLine(fixRelativeURL(m_feedList[id].url(), m_part->baseURL()));
}
@@ -198,7 +198,7 @@ void KonqFeedIcon::addFeeds()
{
if(akregatorRunning())
{
- QStringList list;
+ TQStringList list;
for ( FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it )
list.append(fixRelativeURL((*it).url(), m_part->baseURL()));
addFeedsViaDCOP(list);
diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h
index ba3bb8c..2fccffb 100644
--- a/konq-plugins/akregator/konqfeedicon.h
+++ b/konq-plugins/akregator/konqfeedicon.h
@@ -25,7 +25,7 @@
#ifndef KONQFEEDICON_H
#define KONQFEEDICON_H
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include <kparts/plugin.h>
#include <kpopupmenu.h>
#include "feeddetector.h"
@@ -47,7 +47,7 @@ class KonqFeedIcon : public KParts::Plugin, PluginBase
{
Q_OBJECT
public:
- KonqFeedIcon(QObject *parent, const char *name, const QStringList &);
+ KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &);
~KonqFeedIcon();
@@ -58,11 +58,11 @@ private:
*/
bool feedFound();
- QGuardedPtr<KHTMLPart> m_part;
+ TQGuardedPtr<KHTMLPart> m_part;
KURLLabel *m_feedIcon;
KParts::StatusBarExtension *m_statusBarEx;
FeedDetectorEntryList m_feedList;
- QGuardedPtr<KPopupMenu> m_menu;
+ TQGuardedPtr<KPopupMenu> m_menu;
private slots:
void waitPartToLoad();
diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp
index 4c6b5b1..f837426 100644
--- a/konq-plugins/akregator/pluginbase.cpp
+++ b/konq-plugins/akregator/pluginbase.cpp
@@ -30,7 +30,7 @@
#include "feeddetector.h"
#include "pluginbase.h"
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <kdebug.h>
@@ -49,7 +49,7 @@ bool PluginBase::akregatorRunning()
return reply.isValid();
}
-void PluginBase::addFeedsViaDCOP(const QStringList& urls)
+void PluginBase::addFeedsViaDCOP(const TQStringList& urls)
{
kdDebug() << "PluginBase::addFeedsViaDCOP" << endl;
DCOPRef akr("akregator", "AkregatorIface");
@@ -60,7 +60,7 @@ void PluginBase::addFeedsViaDCOP(const QStringList& urls)
}*/
}
-void PluginBase::addFeedViaCmdLine(QString url)
+void PluginBase::addFeedViaCmdLine(TQString url)
{
KProcess *proc = new KProcess;
*proc << "akregator" << "-g" << i18n("Imported Feeds");
@@ -70,9 +70,9 @@ void PluginBase::addFeedViaCmdLine(QString url)
}
// handle all the wild stuff that KURL doesn't handle
-QString PluginBase::fixRelativeURL(const QString &s, const KURL &baseurl)
+TQString PluginBase::fixRelativeURL(const TQString &s, const KURL &baseurl)
{
- QString s2=s;
+ TQString s2=s;
KURL u;
if (KURL::isRelativeURL(s2))
{
@@ -84,8 +84,8 @@ QString PluginBase::fixRelativeURL(const QString &s, const KURL &baseurl)
else if (s2.startsWith("/"))
{
KURL b2(baseurl);
- b2.setPath(QString()); // delete path and query, so that only protocol://host remains
- b2.setQuery(QString());
+ b2.setPath(TQString()); // delete path and query, so that only protocol://host remains
+ b2.setQuery(TQString());
u = KURL(b2, s2.remove(0,1)); // remove leading "/"
}
else
diff --git a/konq-plugins/akregator/pluginbase.h b/konq-plugins/akregator/pluginbase.h
index 8dcecf5..0bb24b9 100644
--- a/konq-plugins/akregator/pluginbase.h
+++ b/konq-plugins/akregator/pluginbase.h
@@ -48,12 +48,12 @@ class PluginBase
/**
* Adds feed to aKregator via DCOP.
*/
- void addFeedsViaDCOP(const QStringList& urls);
+ void addFeedsViaDCOP(const TQStringList& urls);
/**
* Adds feed to aKregator via command line.
*/
- void addFeedViaCmdLine(QString url);
- QString fixRelativeURL(const QString &s, const KURL &baseurl);
+ void addFeedViaCmdLine(TQString url);
+ TQString fixRelativeURL(const TQString &s, const KURL &baseurl);
};
}