summaryrefslogtreecommitdiffstats
path: root/knewsticker/common
diff options
context:
space:
mode:
Diffstat (limited to 'knewsticker/common')
-rw-r--r--knewsticker/common/configaccess.cpp460
-rw-r--r--knewsticker/common/configaccess.h8
-rw-r--r--knewsticker/common/newsengine.cpp12
-rw-r--r--knewsticker/common/newsengine.h11
-rw-r--r--knewsticker/common/newsiconmgr.cpp18
-rw-r--r--knewsticker/common/newsiconmgr.h1
-rw-r--r--knewsticker/common/xmlnewsaccess.cpp26
-rw-r--r--knewsticker/common/xmlnewsaccess.h3
8 files changed, 272 insertions, 267 deletions
diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp
index 68b37f57..40e304fb 100644
--- a/knewsticker/common/configaccess.cpp
+++ b/knewsticker/common/configaccess.cpp
@@ -20,343 +20,343 @@
static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
// Arts ---------------
NewsSourceBase::Data(
- TQString::fromLatin1("Bureau 42"),
- TQString::fromLatin1("http://www.bureau42.com/rdf/"),
- TQString::fromLatin1("http://www.bureau42.com/favicon.ico"),
+ TQString::tqfromLatin1("Bureau 42"),
+ TQString::tqfromLatin1("http://www.bureau42.com/rdf/"),
+ TQString::tqfromLatin1("http://www.bureau42.com/favicon.ico"),
NewsSourceBase::Arts, 5, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("eFilmCritic"),
- TQString::fromLatin1("http://efilmcritic.com/fo.rdf"),
- TQString::fromLatin1("http://efilmcritic.com/favicon.ico"),
+ TQString::tqfromLatin1("eFilmCritic"),
+ TQString::tqfromLatin1("http://efilmcritic.com/fo.rdf"),
+ TQString::tqfromLatin1("http://efilmcritic.com/favicon.ico"),
NewsSourceBase::Arts, 3, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("superhits.ch"),
- TQString::fromLatin1("http://www.superhits.ch/cgi-bin/superhits.cgi?page=rdf"),
- TQString::fromLatin1("http://www.superhits.ch/favicon.ico"),
- NewsSourceBase::Arts, 10, false, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("superhits.ch"),
+ TQString::tqfromLatin1("http://www.superhits.ch/cgi-bin/superhits.cgi?page=rdf"),
+ TQString::tqfromLatin1("http://www.superhits.ch/favicon.ico"),
+ NewsSourceBase::Arts, 10, false, false, TQString::tqfromLatin1("de")),
// Business -----------
NewsSourceBase::Data(
- TQString::fromLatin1("Internet.com Business"),
- TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
- TQString::null,
+ TQString::tqfromLatin1("Internet.com Business"),
+ TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
+ TQString(),
NewsSourceBase::Business, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("TradeSims"),
- TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"),
- TQString::null,
+ TQString::tqfromLatin1("TradeSims"),
+ TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"),
+ TQString(),
NewsSourceBase::Business, 10, false, false),
// Computers ----------
NewsSourceBase::Data(
- TQString::fromLatin1( "linuxartist.org" ),
- TQString::fromLatin1( "http://www.linuxartist.org/backend.php"),
- TQString::fromLatin1( "http://www.linuxartist.org/favicon.ico"),
+ TQString::tqfromLatin1( "linuxartist.org" ),
+ TQString::tqfromLatin1( "http://www.linuxartist.org/backend.php"),
+ TQString::tqfromLatin1( "http://www.linuxartist.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false ),
NewsSourceBase::Data(
- TQString::fromLatin1("KDE Deutschland"),
- TQString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"),
- TQString::fromLatin1("http://www.kde.de/favicon.ico"),
- NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("KDE Deutschland"),
+ TQString::tqfromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"),
+ TQString::tqfromLatin1("http://www.kde.de/favicon.ico"),
+ NewsSourceBase::Computers, 10, true, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("KDE France"),
- TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"),
- TQString::null,
- NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("fr")),
+ TQString::tqfromLatin1("KDE France"),
+ TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"),
+ TQString(),
+ NewsSourceBase::Computers, 10, true, false, TQString::tqfromLatin1("fr")),
NewsSourceBase::Data(
- TQString::fromLatin1("FreeBSD Project News"),
- TQString::fromLatin1("http://www.freebsd.org/news/news.rdf"),
- TQString::fromLatin1("http://www.freebsd.org/favicon.ico"),
+ TQString::tqfromLatin1("FreeBSD Project News"),
+ TQString::tqfromLatin1("http://www.freebsd.org/news/news.rdf"),
+ TQString::tqfromLatin1("http://www.freebsd.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("dot.kde.org"),
- TQString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"),
- TQString::fromLatin1("http://www.kde.org/favicon.ico"),
+ TQString::tqfromLatin1("dot.kde.org"),
+ TQString::tqfromLatin1("http://www.kde.org/dotkdeorg.rdf"),
+ TQString::tqfromLatin1("http://www.kde.org/favicon.ico"),
NewsSourceBase::Computers, 10, true, false),
NewsSourceBase::Data(
- TQString::fromLatin1("GNOME News"),
- TQString::fromLatin1("http://www.gnomedesktop.org/backend.php"),
- TQString::null,
+ TQString::tqfromLatin1("GNOME News"),
+ TQString::tqfromLatin1("http://www.gnomedesktop.org/backend.php"),
+ TQString(),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Slashdot"),
- TQString::fromLatin1("http://slashdot.org/slashdot.rdf"),
- TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+ TQString::tqfromLatin1("Slashdot"),
+ TQString::tqfromLatin1("http://slashdot.org/slashdot.rdf"),
+ TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
NewsSourceBase::Computers, 10, true, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Ask Slashdot"),
- TQString::fromLatin1("http://slashdot.org/askslashdot.rdf"),
- TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+ TQString::tqfromLatin1("Ask Slashdot"),
+ TQString::tqfromLatin1("http://slashdot.org/askslashdot.rdf"),
+ TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Slashdot: Features"),
- TQString::fromLatin1("http://slashdot.org/features.rdf"),
- TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+ TQString::tqfromLatin1("Slashdot: Features"),
+ TQString::tqfromLatin1("http://slashdot.org/features.rdf"),
+ TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Slashdot: Apache"),
- TQString::fromLatin1("http://slashdot.org/apache.rdf"),
- TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+ TQString::tqfromLatin1("Slashdot: Apache"),
+ TQString::tqfromLatin1("http://slashdot.org/apache.rdf"),
+ TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Slashdot: Books"),
- TQString::fromLatin1("http://slashdot.org/books.rdf"),
- TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+ TQString::tqfromLatin1("Slashdot: Books"),
+ TQString::tqfromLatin1("http://slashdot.org/books.rdf"),
+ TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Jabber News"),
- TQString::fromLatin1("http://www.jabber.org/news/rss.xml"),
- TQString::null,
+ TQString::tqfromLatin1("Jabber News"),
+ TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"),
+ TQString(),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Freshmeat"),
- TQString::fromLatin1("http://freshmeat.net/backend/fm.rdf"),
- TQString::fromLatin1("http://freshmeat.net/favicon.ico"),
+ TQString::tqfromLatin1("Freshmeat"),
+ TQString::tqfromLatin1("http://freshmeat.net/backend/fm.rdf"),
+ TQString::tqfromLatin1("http://freshmeat.net/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Linux Weekly News"),
- TQString::fromLatin1("http://www.lwn.net/headlines/rss"),
- TQString::fromLatin1("http://www.lwn.net/favicon.ico"),
+ TQString::tqfromLatin1("Linux Weekly News"),
+ TQString::tqfromLatin1("http://www.lwn.net/headlines/rss"),
+ TQString::tqfromLatin1("http://www.lwn.net/favicon.ico"),
NewsSourceBase::Computers, 10, true, false),
NewsSourceBase::Data(
- TQString::fromLatin1("heise online news"),
- TQString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"),
- TQString::fromLatin1("http://www.heise.de/favicon.ico"),
- NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("heise online news"),
+ TQString::tqfromLatin1("http://www.heise.de/newsticker/heise.rdf"),
+ TQString::tqfromLatin1("http://www.heise.de/favicon.ico"),
+ NewsSourceBase::Computers, 10, true, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("RUS-CERT Ticker"),
- TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"),
- TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
- NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("RUS-CERT Ticker"),
+ TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"),
+ TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
+ NewsSourceBase::Computers, 10, true, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("RUS-CERT Elsewhere"),
- TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"),
- TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
- NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("RUS-CERT Elsewhere"),
+ TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"),
+ TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
+ NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("Kuro5hin"),
- TQString::fromLatin1("http://kuro5hin.org/backend.rdf"),
- TQString::fromLatin1("http://kuro5hin.org/favicon.ico"),
+ TQString::tqfromLatin1("Kuro5hin"),
+ TQString::tqfromLatin1("http://kuro5hin.org/backend.rdf"),
+ TQString::tqfromLatin1("http://kuro5hin.org/favicon.ico"),
NewsSourceBase::Computers, 10, true, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Prolinux"),
- TQString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"),
- TQString::fromLatin1("http://www.prolinux.de/favicon.ico"),
- NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("Prolinux"),
+ TQString::tqfromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"),
+ TQString::tqfromLatin1("http://www.prolinux.de/favicon.ico"),
+ NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("Linuxde.org"),
- TQString::fromLatin1("http://www.linuxde.org/backends/news.rdf"),
- TQString::fromLatin1("http://www.linuxde.org/favicon.ico"),
- NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("Linuxde.org"),
+ TQString::tqfromLatin1("http://www.linuxde.org/backends/news.rdf"),
+ TQString::tqfromLatin1("http://www.linuxde.org/favicon.ico"),
+ NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("LinuxSecurity.com"),
- TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"),
- TQString::null,
+ TQString::tqfromLatin1("LinuxSecurity.com"),
+ TQString::tqfromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"),
+ TQString(),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Linux Game Tome"),
- TQString::fromLatin1("http://happypenguin.org/html/news.rdf"),
- TQString::null,
+ TQString::tqfromLatin1("Linux Game Tome"),
+ TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"),
+ TQString(),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Telefragged"),
- TQString::fromLatin1("http://www.telefragged.com/cgi-bin/rdf.pl"),
- TQString::null,
+ TQString::tqfromLatin1("Telefragged"),
+ TQString::tqfromLatin1("http://www.telefragged.com/cgi-bin/rdf.pl"),
+ TQString(),
NewsSourceBase::Computers, 10, false, false),
/* NewsSourceBase::Data(
- TQString::fromLatin1("Gimp News"),
- TQString::fromLatin1("http://www.xach.com/gimp/news/channel.rdf"),
- TQString::null,
+ TQString::tqfromLatin1("Gimp News"),
+ TQString::tqfromLatin1("http://www.xach.com/gimp/news/channel.rdf"),
+ TQString(),
NewsSourceBase::Computers, 10, false, false),*/
NewsSourceBase::Data(
- TQString::fromLatin1("Mozilla"),
- TQString::fromLatin1("http://www.mozilla.org/news.rdf"),
- TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"),
+ TQString::tqfromLatin1("Mozilla"),
+ TQString::tqfromLatin1("http://www.mozilla.org/news.rdf"),
+ TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("MozillaZine"),
- TQString::fromLatin1("http://www.mozillazine.org/contents.rdf"),
- TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"),
+ TQString::tqfromLatin1("MozillaZine"),
+ TQString::tqfromLatin1("http://www.mozillazine.org/contents.rdf"),
+ TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Daemon News"),
- TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
- TQString::null,
+ TQString::tqfromLatin1("Daemon News"),
+ TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
+ TQString(),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("use Perl;"),
- TQString::fromLatin1("http://use.perl.org/useperl.rdf"),
- TQString::null,
+ TQString::tqfromLatin1("use Perl;"),
+ TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"),
+ TQString(),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("desktopian.org"),
- TQString::fromLatin1("http://www.desktopian.org/includes/headlines.xml"),
- TQString::fromLatin1("http://www.desktopian.org/favicon.ico"),
+ TQString::tqfromLatin1("desktopian.org"),
+ TQString::tqfromLatin1("http://www.desktopian.org/includes/headlines.xml"),
+ TQString::tqfromLatin1("http://www.desktopian.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Root prompt"),
- TQString::fromLatin1("http://www.rootprompt.org/rss/"),
- TQString::fromLatin1("http://www.rootprompt.org/favicon.ico"),
+ TQString::tqfromLatin1("Root prompt"),
+ TQString::tqfromLatin1("http://www.rootprompt.org/rss/"),
+ TQString::tqfromLatin1("http://www.rootprompt.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("SecurityFocus"),
- TQString::fromLatin1("http://www.securityfocus.com/rss/news.xml"),
- TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"),
+ TQString::tqfromLatin1("SecurityFocus"),
+ TQString::tqfromLatin1("http://www.securityfocus.com/rss/news.xml"),
+ TQString::tqfromLatin1("http://www.securityfocus.com/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("LinuxNewbie"),
- TQString::fromLatin1("http://www.linuxnewbie.org/news.cdf"),
- TQString::fromLatin1("http://www.linuxnewbie.org/favicon.ico"),
+ TQString::tqfromLatin1("LinuxNewbie"),
+ TQString::tqfromLatin1("http://www.linuxnewbie.org/news.cdf"),
+ TQString::tqfromLatin1("http://www.linuxnewbie.org/favicon.ico"),
NewsSourceBase::Computers, 5, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("Arstechnica"),
- TQString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"),
- TQString::fromLatin1("http://arstechnica.com/favicon.ico"),
+ TQString::tqfromLatin1("Arstechnica"),
+ TQString::tqfromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"),
+ TQString::tqfromLatin1("http://arstechnica.com/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"),
- TQString::fromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"),
- TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"),
- NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"),
+ TQString::tqfromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"),
+ TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"),
+ NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("amiga-news.de - english Amiga news"),
- TQString::fromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"),
- TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"),
+ TQString::tqfromLatin1("amiga-news.de - english Amiga news"),
+ TQString::tqfromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"),
+ TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("RadioTux)"),
- TQString::fromLatin1("http://blog.radiotux.de/feed/"),
- TQString::null,
- NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("RadioTux)"),
+ TQString::tqfromLatin1("http://blog.radiotux.de/feed/"),
+ TQString(),
+ NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("kdenews.unixcode.org"),
- TQString::fromLatin1("http://kdenews.unixcode.org/?node=news&action=rss"),
- TQString::null,
+ TQString::tqfromLatin1("kdenews.unixcode.org"),
+ TQString::tqfromLatin1("http://kdenews.unixcode.org/?node=news&action=rss"),
+ TQString(),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("FreshPorts - the place for ports"),
- TQString::fromLatin1("http://www.freshports.org/news.php"),
- TQString::fromLatin1("http://www.freshports.org/favicon.ico"),
+ TQString::tqfromLatin1("FreshPorts - the place for ports"),
+ TQString::tqfromLatin1("http://www.freshports.org/news.php"),
+ TQString::tqfromLatin1("http://www.freshports.org/favicon.ico"),
NewsSourceBase::Computers, 20, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("NetPhoenix"),
- TQString::fromLatin1("http://www.netphoenix.at/rss/netphoenix.php"),
- TQString::fromLatin1("http://www.netphoenix.at/favicon.ico"),
- NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("NetPhoenix"),
+ TQString::tqfromLatin1("http://www.netphoenix.at/rss/netphoenix.php"),
+ TQString::tqfromLatin1("http://www.netphoenix.at/favicon.ico"),
+ NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("ShortNews - by www.netphoenix.at"),
- TQString::fromLatin1("http://www.netphoenix.at/rss/shortnews.php"),
- TQString::fromLatin1("http://www.netphoenix.at/favicon.ico"),
- NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("ShortNews - by www.netphoenix.at"),
+ TQString::tqfromLatin1("http://www.netphoenix.at/rss/shortnews.php"),
+ TQString::tqfromLatin1("http://www.netphoenix.at/favicon.ico"),
+ NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("zez.org - about code "),
- TQString::fromLatin1("http://zez.org/article/rssheadlines"),
- TQString::null,
+ TQString::tqfromLatin1("zez.org - about code "),
+ TQString::tqfromLatin1("http://zez.org/article/rssheadlines"),
+ TQString(),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("BSDatwork.com"),
- TQString::fromLatin1("http://BSDatwork.com/backend.php"),
- TQString::fromLatin1("http://BSDatwork.com/favicon.ico"),
+ TQString::tqfromLatin1("BSDatwork.com"),
+ TQString::tqfromLatin1("http://BSDatwork.com/backend.php"),
+ TQString::tqfromLatin1("http://BSDatwork.com/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("FreshSource - the place for source"),
- TQString::fromLatin1("http://www.freshsource.org/news.php"),
- TQString::fromLatin1("http://www.freshsource.org/favicon.ico"),
+ TQString::tqfromLatin1("FreshSource - the place for source"),
+ TQString::tqfromLatin1("http://www.freshsource.org/news.php"),
+ TQString::tqfromLatin1("http://www.freshsource.org/favicon.ico"),
NewsSourceBase::Computers, 20, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("The FreeBSD Diary"),
- TQString::fromLatin1("http://www.freebsddiary.org/news.php"),
- TQString::fromLatin1("http://www.freebsddiary.org/favicon.ico"),
+ TQString::tqfromLatin1("The FreeBSD Diary"),
+ TQString::tqfromLatin1("http://www.freebsddiary.org/news.php"),
+ TQString::tqfromLatin1("http://www.freebsddiary.org/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("MaximumBSD"),
- TQString::fromLatin1("http://www.maximumbsd.com/backend/mb.rdf"),
- TQString::fromLatin1("http://www.maximumbsd.com/favicon.ico"),
+ TQString::tqfromLatin1("MaximumBSD"),
+ TQString::tqfromLatin1("http://www.maximumbsd.com/backend/mb.rdf"),
+ TQString::tqfromLatin1("http://www.maximumbsd.com/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("BR-Linux.org"),
- TQString::fromLatin1("http://br-linux.org/noticias/index.rdf"),
- TQString::fromLatin1("http://br-linux.org/noticias/favicon.ico"),
+ TQString::tqfromLatin1("BR-Linux.org"),
+ TQString::tqfromLatin1("http://br-linux.org/noticias/index.rdf"),
+ TQString::tqfromLatin1("http://br-linux.org/noticias/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("OSNews.com"),
- TQString::fromLatin1("http://www.osnews.com/files/recent.rdf"),
- TQString::fromLatin1("http://www.osnews.com/favicon.ico"),
+ TQString::tqfromLatin1("OSNews.com"),
+ TQString::tqfromLatin1("http://www.osnews.com/files/recent.rdf"),
+ TQString::tqfromLatin1("http://www.osnews.com/favicon.ico"),
NewsSourceBase::Computers, 10, false, false),
// Miscellaneous ------
NewsSourceBase::Data(
- TQString::fromLatin1("tagesschau.de"),
- TQString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"),
- TQString::fromLatin1("http://www.tagesschau.de/favicon.ico"),
- NewsSourceBase::Misc, 10, true, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("tagesschau.de"),
+ TQString::tqfromLatin1("http://www.tagesschau.de/newsticker.rdf"),
+ TQString::tqfromLatin1("http://www.tagesschau.de/favicon.ico"),
+ NewsSourceBase::Misc, 10, true, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("N24.de"),
- TQString::fromLatin1("http://www.n24.de/rss/?rubrik=home"),
- TQString::fromLatin1("http://www.n24.de/favicon.ico"),
- NewsSourceBase::Misc, 10, true, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("N24.de"),
+ TQString::tqfromLatin1("http://www.n24.de/rss/?rubrik=home"),
+ TQString::tqfromLatin1("http://www.n24.de/favicon.ico"),
+ NewsSourceBase::Misc, 10, true, false, TQString::tqfromLatin1("de")),
/*
NewsSourceBase::Data(
- TQString::fromLatin1("CNN"),
- TQString::fromLatin1("http://www.cnn.com/cnn.rss"),
- TQString::fromLatin1("http://www.cnn.com/favicon.ico"),
+ TQString::tqfromLatin1("CNN"),
+ TQString::tqfromLatin1("http://www.cnn.com/cnn.rss"),
+ TQString::tqfromLatin1("http://www.cnn.com/favicon.ico"),
NewsSourceBase::Misc, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("CNN Europe"),
- TQString::fromLatin1("http://europe.cnn.com/cnn.rss"),
- TQString::fromLatin1("http://europe.cnn.com/favicon.ico"),
+ TQString::tqfromLatin1("CNN Europe"),
+ TQString::tqfromLatin1("http://europe.cnn.com/cnn.rss"),
+ TQString::tqfromLatin1("http://europe.cnn.com/favicon.ico"),
NewsSourceBase::Misc, 10, false, false),
*/
NewsSourceBase::Data(
- TQString::fromLatin1("HotWired"),
- TQString::fromLatin1("http://www.hotwired.com/webmonkey/meta/headlines.rdf"),
- TQString::fromLatin1("http://www.hotwired.com/favicon.ico"),
+ TQString::tqfromLatin1("HotWired"),
+ TQString::tqfromLatin1("http://www.hotwired.com/webmonkey/meta/headlines.rdf"),
+ TQString::tqfromLatin1("http://www.hotwired.com/favicon.ico"),
NewsSourceBase::Misc, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1("The Register"),
- TQString::fromLatin1("http://www.theregister.co.uk/tonys/slashdot.rdf"),
- TQString::fromLatin1("http://www.theregister.co.uk/favicon.ico"),
+ TQString::tqfromLatin1("The Register"),
+ TQString::tqfromLatin1("http://www.theregister.co.uk/tonys/slashdot.rdf"),
+ TQString::tqfromLatin1("http://www.theregister.co.uk/favicon.ico"),
NewsSourceBase::Misc, 10, false, false),
NewsSourceBase::Data(
- TQString::fromLatin1( "Christian Science Monitor" ),
- TQString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"),
- TQString::fromLatin1( "http://www.csmonitor.com/favicon.ico"),
+ TQString::tqfromLatin1( "Christian Science Monitor" ),
+ TQString::tqfromLatin1( "http://www.csmonitor.com/rss/csm.rss"),
+ TQString::tqfromLatin1( "http://www.csmonitor.com/favicon.ico"),
NewsSourceBase::Misc, 10, false, false ),
// Magazines ------
NewsSourceBase::Data(
- TQString::fromLatin1("Revista do Linux"),
- TQString::fromLatin1("http://www.revistadolinux.com.br/noticias/arquivo/noticias.rdf"),
- TQString::fromLatin1("http://www.revistadolinux.com.br/favicon.ico"),
- NewsSourceBase::Magazines, 10, false, false /*, TQString::fromLatin1("br")*/ ),
+ TQString::tqfromLatin1("Revista do Linux"),
+ TQString::tqfromLatin1("http://www.revistadolinux.com.br/noticias/arquivo/noticias.rdf"),
+ TQString::tqfromLatin1("http://www.revistadolinux.com.br/favicon.ico"),
+ NewsSourceBase::Magazines, 10, false, false /*, TQString::tqfromLatin1("br")*/ ),
NewsSourceBase::Data(
- TQString::fromLatin1("Spiegel.de"),
- TQString::fromLatin1("http://www.spiegel.de/schlagzeilen/rss/0,5291,,00.xml"),
- TQString::fromLatin1("http://www.spiegel.de/favicon.ico"),
- NewsSourceBase::Magazines, 10, true, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("Spiegel.de"),
+ TQString::tqfromLatin1("http://www.spiegel.de/schlagzeilen/rss/0,5291,,00.xml"),
+ TQString::tqfromLatin1("http://www.spiegel.de/favicon.ico"),
+ NewsSourceBase::Magazines, 10, true, false, TQString::tqfromLatin1("de")),
NewsSourceBase::Data(
- TQString::fromLatin1("FAZ.de"),
- TQString::fromLatin1("http://www.faz.net/s/Rub/Tpl~Epartner~SRss_.xml"),
- TQString::fromLatin1("http://www.faz.net/favicon.ico"),
- NewsSourceBase::Magazines, 10, true, false, TQString::fromLatin1("de")),
+ TQString::tqfromLatin1("FAZ.de"),
+ TQString::tqfromLatin1("http://www.faz.net/s/Rub/Tpl~Epartner~SRss_.xml"),
+ TQString::tqfromLatin1("http://www.faz.net/favicon.ico"),
+ NewsSourceBase::Magazines, 10, true, false, TQString::tqfromLatin1("de")),
// Recreation
NewsSourceBase::Data(
- TQString::fromLatin1("Segfault"),
- TQString::fromLatin1("http://segfault.org/stories.xml"),
- TQString::fromLatin1("http://segfault.org/favicon.ico"),
+ TQString::tqfromLatin1("Segfault"),
+ TQString::tqfromLatin1("http://segfault.org/stories.xml"),
+ TQString::tqfromLatin1("http://segfault.org/favicon.ico"),
NewsSourceBase::Recreation, 10, false, false),
// Society
NewsSourceBase::Data(
- TQString::fromLatin1("nippon.it"),
- TQString::fromLatin1("http://www.nippon.it/backend.it.php"),
- TQString::fromLatin1("http://www.nippon.it/favicon.ico"),
- NewsSourceBase::Society, 10, false, false, TQString::fromLatin1("it")),
+ TQString::tqfromLatin1("nippon.it"),
+ TQString::tqfromLatin1("http://www.nippon.it/backend.it.php"),
+ TQString::tqfromLatin1("http://www.nippon.it/favicon.ico"),
+ NewsSourceBase::Society, 10, false, false, TQString::tqfromLatin1("it")),
NewsSourceBase::Data(
- TQString::fromLatin1( "gflash" ),
- TQString::fromLatin1( "http://www.gflash.de/backend.php"),
- TQString::fromLatin1( "http://www.gflash.de/favicon.ico"),
- NewsSourceBase::Society, 10, false, false, TQString::fromLatin1( "de" ) ),
+ TQString::tqfromLatin1( "gflash" ),
+ TQString::tqfromLatin1( "http://www.gflash.de/backend.php"),
+ TQString::tqfromLatin1( "http://www.gflash.de/favicon.ico"),
+ NewsSourceBase::Society, 10, false, false, TQString::tqfromLatin1( "de" ) ),
NewsSourceBase::Data(
- TQString::fromLatin1( "Quintessenz" ),
- TQString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"),
- TQString::fromLatin1( "http://quintessenz.at/favicon.ico"),
- NewsSourceBase::Society, 9, false, false, TQString::fromLatin1( "de" ) )
+ TQString::tqfromLatin1( "Quintessenz" ),
+ TQString::tqfromLatin1( "http://quintessenz.at/cgi-bin/rdf"),
+ TQString::tqfromLatin1( "http://quintessenz.at/favicon.ico"),
+ NewsSourceBase::Society, 9, false, false, TQString::tqfromLatin1( "de" ) )
};
ArticleFilter::ArticleFilter(const TQString &action, const TQString &newsSource,
@@ -379,9 +379,9 @@ bool ArticleFilter::matches(Article::Ptr a) const
bool matches;
if (condition() == i18n("contain"))
- matches = a->headline().contains(expression());
+ matches = a->headline().tqcontains(expression());
else if (condition() == i18n("do not contain"))
- matches = !a->headline().contains(expression());
+ matches = !a->headline().tqcontains(expression());
else if (condition() == i18n("equal"))
matches = (a->headline() == expression());
else if (condition() == i18n("do not equal"))
@@ -398,7 +398,7 @@ bool ArticleFilter::matches(Article::Ptr a) const
}
ConfigAccess::ConfigAccess()
- : m_defaultCfg(new KConfig(TQString::null, true, false))
+ : m_defaultCfg(new KConfig(TQString(), true, false))
{
m_cfg = m_defaultCfg;
}
@@ -531,7 +531,7 @@ void ConfigAccess::setScrollingDirection(const unsigned int scrollingDirection)
TQColor ConfigAccess::foregroundColor() const
{
- return m_cfg->readColorEntry("Foreground color", &Qt::black);
+ return m_cfg->readColorEntry("Foreground color", &TQt::black);
}
void ConfigAccess::setForegroundColor(const TQColor &foregroundColor)
@@ -542,7 +542,7 @@ void ConfigAccess::setForegroundColor(const TQColor &foregroundColor)
TQColor ConfigAccess::backgroundColor() const
{
- return m_cfg->readColorEntry("Background color", &Qt::white);
+ return m_cfg->readColorEntry("Background color", &TQt::white);
}
void ConfigAccess::setBackgroundColor(const TQColor &backgroundColor)
@@ -553,7 +553,7 @@ void ConfigAccess::setBackgroundColor(const TQColor &backgroundColor)
TQColor ConfigAccess::highlightedColor() const
{
- return m_cfg->readColorEntry("Highlighted color", &Qt::red);
+ return m_cfg->readColorEntry("Highlighted color", &TQt::red);
}
void ConfigAccess::setHighlightedColor(const TQColor &highlightedColor)
@@ -587,14 +587,14 @@ NewsSourceBase *ConfigAccess::newsSource(const TQString &newsSource)
nsd.icon = m_cfg->readEntry("Icon");
nsd.maxArticles = m_cfg->readNumEntry("Max articles", 10);
nsd.enabled = m_cfg->readBoolEntry("Enabled", true);
- nsd.language = m_cfg->readEntry("Language", TQString::fromLatin1("C"));
+ nsd.language = m_cfg->readEntry("Language", TQString::tqfromLatin1("C"));
m_cfg->setGroup("KNewsTicker");
} else for (unsigned int i = 0; i < DEFAULT_NEWSSOURCES; i++)
if (NewsSourceDefault[i].name == newsSource) {
nsd = NewsSourceDefault[i];
if (nsd.enabled)
- nsd.enabled = (nsd.language == TQString::fromLatin1("C") ||
- KGlobal::locale()->languageList().contains(nsd.language));
+ nsd.enabled = (nsd.language == TQString::tqfromLatin1("C") ||
+ KGlobal::locale()->languageList().tqcontains(nsd.language));
break;
}
@@ -611,8 +611,8 @@ ArticleFilter ConfigAccess::filter(const unsigned int filterNo) const
ArticleFilter f;
f.setId(filterNo);
- if (m_cfg->hasGroup(TQString::fromLatin1("Filter #%1").arg(filterNo))) {
- m_cfg->setGroup(TQString::fromLatin1("Filter #%1").arg(filterNo));
+ if (m_cfg->hasGroup(TQString::tqfromLatin1("Filter #%1").tqarg(filterNo))) {
+ m_cfg->setGroup(TQString::tqfromLatin1("Filter #%1").tqarg(filterNo));
f.setAction(m_cfg->readEntry("Action", i18n("Show")));
f.setNewsSource(m_cfg->readEntry("News source", i18n("all news sources")));
f.setCondition(m_cfg->readEntry("Condition", i18n("contain")));
@@ -640,7 +640,7 @@ void ConfigAccess::setNewsSource(const NewsSourceBase::Data &ns)
void ConfigAccess::setFilter(const ArticleFilter &f)
{
- m_cfg->setGroup(TQString::fromLatin1("Filter #%1").arg(f.id()));
+ m_cfg->setGroup(TQString::tqfromLatin1("Filter #%1").tqarg(f.id()));
m_cfg->writeEntry("Action", f.action());
m_cfg->writeEntry("News source", f.newsSource());
m_cfg->writeEntry("Condition", f.condition());
diff --git a/knewsticker/common/configaccess.h b/knewsticker/common/configaccess.h
index d434b152..50f42cce 100644
--- a/knewsticker/common/configaccess.h
+++ b/knewsticker/common/configaccess.h
@@ -32,10 +32,10 @@ class ArticleFilter {
public:
typedef TQValueList<int> List;
- ArticleFilter(const TQString & = I18N_NOOP(TQString::fromLatin1("Show")),
- const TQString & = I18N_NOOP(TQString::fromLatin1("all newssources")),
- const TQString & = I18N_NOOP(TQString::fromLatin1("contain")),
- const TQString & = TQString::null,
+ ArticleFilter(const TQString & = I18N_NOOP(TQString::tqfromLatin1("Show")),
+ const TQString & = I18N_NOOP(TQString::tqfromLatin1("all newssources")),
+ const TQString & = I18N_NOOP(TQString::tqfromLatin1("contain")),
+ const TQString & = TQString(),
bool = true);
TQString action() const { return m_action; }
diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp
index 911095d9..ef1e5f81 100644
--- a/knewsticker/common/newsengine.cpp
+++ b/knewsticker/common/newsengine.cpp
@@ -23,10 +23,10 @@
#include <tqbuffer.h>
-Article::Article(NewsSourceBase *parent, const TQString &headline,
+Article::Article(NewsSourceBase *tqparent, const TQString &headline,
const KURL &address)
: XMLNewsArticle(headline, address),
- m_parent(parent),
+ m_parent(tqparent),
m_read(false)
{
}
@@ -222,7 +222,7 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc)
} else {
ErrorCode error = static_cast<ErrorCode>(proc->exitStatus());
if (error != NOERR) {
- errorMsg = errorMessage(error).arg(m_data.sourceFile);
+ errorMsg = errorMessage(error).tqarg(m_data.sourceFile);
okSoFar = false;
}
}
@@ -230,11 +230,11 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc)
if (!okSoFar) {
TQString output = TQString(m_programOutput->buffer());
if (!output.isEmpty()) {
- output = TQString::fromLatin1("\"") + output + TQString::fromLatin1("\"");
- errorMsg += i18n("<p>Program output:<br>%1<br>").arg(output);
+ output = TQString::tqfromLatin1("\"") + output + TQString::tqfromLatin1("\"");
+ errorMsg += i18n("<p>Program output:<br>%1<br>").tqarg(output);
}
KMessageBox::detailedError(0, i18n("An error occurred while updating the"
- " news source '%1'.").arg(newsSourceName()), errorMsg,
+ " news source '%1'.").tqarg(newsSourceName()), errorMsg,
i18n("KNewsTicker Error"));
}
diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h
index ffc5dd08..554b95fb 100644
--- a/knewsticker/common/newsengine.h
+++ b/knewsticker/common/newsengine.h
@@ -42,7 +42,7 @@ class KDE_EXPORT Article : public XMLNewsArticle, public KShared
typedef KSharedPtr<Article> Ptr;
typedef TQValueList<Ptr> List;
- Article(NewsSourceBase *, const TQString & = TQString::null,
+ Article(NewsSourceBase *, const TQString & = TQString(),
const KURL & = KURL());
bool operator==(const Article &other) const;
@@ -61,6 +61,7 @@ class KDE_EXPORT Article : public XMLNewsArticle, public KShared
class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared
{
Q_OBJECT
+ TQ_OBJECT
public:
enum Subject {
@@ -69,12 +70,12 @@ class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared
};
struct Data {
Data(const TQString &_name = I18N_NOOP("Unknown"),
- const TQString &_sourceFile = TQString::null,
- const TQString &_icon = TQString::null,
+ const TQString &_sourceFile = TQString(),
+ const TQString &_icon = TQString(),
const Subject _subject = Computers,
unsigned int _maxArticles = 10,
bool _enabled = true, bool _isProgram = false,
- const TQString &_language = TQString::fromLatin1("C"))
+ const TQString &_language = TQString::tqfromLatin1("C"))
{
name = _name;
sourceFile = _sourceFile;
@@ -135,6 +136,7 @@ class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared
class KDE_EXPORT SourceFileNewsSource : public NewsSourceBase
{
Q_OBJECT
+ TQ_OBJECT
public:
SourceFileNewsSource(const NewsSourceBase::Data &, ConfigIface *);
@@ -173,6 +175,7 @@ class KDE_EXPORT SourceFileNewsSource : public NewsSourceBase
class KDE_EXPORT ProgramNewsSource : public NewsSourceBase
{
Q_OBJECT
+ TQ_OBJECT
public:
enum ErrorCode { NOERR = 0, EPERM, ENOENT, EIO = 5, E2BIG = 7,
diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp
index b6787dff..59044942 100644
--- a/knewsticker/common/newsiconmgr.cpp
+++ b/knewsticker/common/newsiconmgr.cpp
@@ -37,9 +37,9 @@ NewsIconMgr *NewsIconMgr::self()
return m_instance;
}
-NewsIconMgr::NewsIconMgr(TQObject *parent, const char *name)
- : TQObject(parent, name), DCOPObject("NewsIconMgr"),
- m_stdIcon(SmallIcon(TQString::fromLatin1("news")))
+NewsIconMgr::NewsIconMgr(TQObject *tqparent, const char *name)
+ : TQObject(tqparent, name), DCOPObject("NewsIconMgr"),
+ m_stdIcon(SmallIcon(TQString::tqfromLatin1("news")))
{
connectDCOPSignal("kded",
"favicons", "iconChanged(bool, TQString, TQString)",
@@ -64,7 +64,7 @@ void NewsIconMgr::getIcon(const KURL &url)
TQPixmap icon(url.encodedPathAndQuery());
if (!icon.isNull()) {
if (icon.size() != TQSize(16, 16)) {
- if (!icon.convertFromImage(icon.convertToImage().smoothScale(16, 16, TQImage::ScaleMin))) {
+ if (!icon.convertFromImage(icon.convertToImage().smoothScale(16, 16, TQ_ScaleMin))) {
emit gotIcon(url, m_stdIcon);
return;
}
@@ -85,7 +85,7 @@ void NewsIconMgr::getIcon(const KURL &url)
kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data);
} else {
emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache",
- TQString::fromLatin1("favicons/%1.png").arg(url.host()))));
+ TQString::tqfromLatin1("favicons/%1.png").tqarg(url.host()))));
}
} else {
KIO::Job *job = KIO::get(url, true, false);
@@ -127,13 +127,13 @@ void NewsIconMgr::slotGotIcon(bool isHost, TQString hostOrURL, TQString iconName
{
KURL url = KURL(hostOrURL);
if (!isHost)
- url.setProtocol(TQString::fromLatin1("http"));
+ url.setProtocol(TQString::tqfromLatin1("http"));
if (iconName.isNull())
emit gotIcon(url, m_stdIcon);
else
emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache",
- TQString::fromLatin1("favicons/%1.png").arg(url.host()))));
+ TQString::tqfromLatin1("favicons/%1.png").tqarg(url.host()))));
}
TQString NewsIconMgr::favicon(const KURL &url) const
@@ -146,14 +146,14 @@ TQString NewsIconMgr::favicon(const KURL &url) const
kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply);
- if (replyType == "TQString") {
+ if (replyType == TQSTRING_OBJECT_NAME_STRING) {
TQDataStream replyStream(reply, IO_ReadOnly);
TQString result;
replyStream >> result;
return result;
}
- return TQString::null;
+ return TQString();
}
#include "newsiconmgr.moc"
diff --git a/knewsticker/common/newsiconmgr.h b/knewsticker/common/newsiconmgr.h
index 30071155..0aa313f3 100644
--- a/knewsticker/common/newsiconmgr.h
+++ b/knewsticker/common/newsiconmgr.h
@@ -26,6 +26,7 @@ typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
class NewsIconMgr : public TQObject, public DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public:
diff --git a/knewsticker/common/xmlnewsaccess.cpp b/knewsticker/common/xmlnewsaccess.cpp
index 8f4619f6..3aff700b 100644
--- a/knewsticker/common/xmlnewsaccess.cpp
+++ b/knewsticker/common/xmlnewsaccess.cpp
@@ -37,9 +37,9 @@ bool XMLNewsArticle::operator==(const XMLNewsArticle &a)
}
XMLNewsSource::XMLNewsSource() : TQObject(),
- m_name(TQString::null),
- m_link(TQString::null),
- m_description(TQString::null),
+ m_name(TQString()),
+ m_link(TQString()),
+ m_description(TQString()),
m_downloadData(0)
{
}
@@ -60,8 +60,8 @@ void XMLNewsSource::loadFrom(const KURL &url)
m_downloadData->open(IO_WriteOnly);
KIO::Job *job = KIO::get(url, false, false);
- job->addMetaData(TQString::fromLatin1("UserAgent"),
- TQString::fromLatin1("KNewsTicker v0.2"));
+ job->addMetaData(TQString::tqfromLatin1("UserAgent"),
+ TQString::tqfromLatin1("KNewsTicker v0.2"));
connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
@@ -88,7 +88,7 @@ void XMLNewsSource::processData(const TQByteArray &data, bool okSoFar)
if (okSoFar) {
/*
* Some servers prepend whitespace before the <?xml...?> declaration.
- * Since QDom doesn't like that we strip this first.
+ * Since TQDom doesn't like that we strip this first.
*/
TQDomDocument domDoc;
@@ -104,21 +104,21 @@ void XMLNewsSource::processData(const TQByteArray &data, bool okSoFar)
tmpData.setRawData(charData, len);
if (validContent = domDoc.setContent(tmpData)) {
- TQDomNode channelNode = domDoc.documentElement().namedItem(TQString::fromLatin1("channel"));
+ TQDomNode channelNode = domDoc.documentElement().namedItem(TQString::tqfromLatin1("channel"));
- m_name = channelNode.namedItem(TQString::fromLatin1("title")).toElement().text().simplifyWhiteSpace();
+ m_name = channelNode.namedItem(TQString::tqfromLatin1("title")).toElement().text().simplifyWhiteSpace();
kdDebug(5005) << "XMLNewsSource::processData(): Successfully updated " << m_name << endl;
- m_link = channelNode.namedItem(TQString::fromLatin1("link")).toElement().text().simplifyWhiteSpace();
- m_description = channelNode.namedItem(TQString::fromLatin1("description")).toElement().text().simplifyWhiteSpace();
+ m_link = channelNode.namedItem(TQString::tqfromLatin1("link")).toElement().text().simplifyWhiteSpace();
+ m_description = channelNode.namedItem(TQString::tqfromLatin1("description")).toElement().text().simplifyWhiteSpace();
- TQDomNodeList items = domDoc.elementsByTagName(TQString::fromLatin1("item"));
+ TQDomNodeList items = domDoc.elementsByTagName(TQString::tqfromLatin1("item"));
m_articles.clear();
TQDomNode itemNode;
TQString headline, address;
for (unsigned int i = 0; i < items.count(); i++) {
itemNode = items.item(i);
- headline = KCharsets::resolveEntities(itemNode.namedItem(TQString::fromLatin1("title")).toElement().text().simplifyWhiteSpace());
- address = KCharsets::resolveEntities(itemNode.namedItem(TQString::fromLatin1("link")).toElement().text().simplifyWhiteSpace());
+ headline = KCharsets::resolveEntities(itemNode.namedItem(TQString::tqfromLatin1("title")).toElement().text().simplifyWhiteSpace());
+ address = KCharsets::resolveEntities(itemNode.namedItem(TQString::tqfromLatin1("link")).toElement().text().simplifyWhiteSpace());
m_articles.append(XMLNewsArticle(headline, KURL( address )));
}
}
diff --git a/knewsticker/common/xmlnewsaccess.h b/knewsticker/common/xmlnewsaccess.h
index 0d036690..d801e05a 100644
--- a/knewsticker/common/xmlnewsaccess.h
+++ b/knewsticker/common/xmlnewsaccess.h
@@ -49,9 +49,10 @@ class XMLNewsArticle
KURL m_address;
};
-class XMLNewsSource : public QObject
+class XMLNewsSource : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
XMLNewsSource();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 15:03:38 +0000