From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knewsticker/common/configaccess.cpp | 482 +++++++++++++++++------------------ knewsticker/common/configaccess.h | 60 ++--- knewsticker/common/configiface.h | 16 +- knewsticker/common/newsengine.cpp | 42 +-- knewsticker/common/newsengine.h | 46 ++-- knewsticker/common/newsiconmgr.cpp | 74 +++--- knewsticker/common/newsiconmgr.h | 22 +- knewsticker/common/xmlnewsaccess.cpp | 52 ++-- knewsticker/common/xmlnewsaccess.h | 32 +-- 9 files changed, 413 insertions(+), 413 deletions(-) (limited to 'knewsticker/common') diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp index 942b3f70..68b37f57 100644 --- a/knewsticker/common/configaccess.cpp +++ b/knewsticker/common/configaccess.cpp @@ -11,7 +11,7 @@ #include "configaccess.h" #include "newsengine.h" -#include +#include #include #include @@ -20,347 +20,347 @@ static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = { // Arts --------------- NewsSourceBase::Data( - QString::fromLatin1("Bureau 42"), - QString::fromLatin1("http://www.bureau42.com/rdf/"), - QString::fromLatin1("http://www.bureau42.com/favicon.ico"), + TQString::fromLatin1("Bureau 42"), + TQString::fromLatin1("http://www.bureau42.com/rdf/"), + TQString::fromLatin1("http://www.bureau42.com/favicon.ico"), NewsSourceBase::Arts, 5, false, false), NewsSourceBase::Data( - QString::fromLatin1("eFilmCritic"), - QString::fromLatin1("http://efilmcritic.com/fo.rdf"), - QString::fromLatin1("http://efilmcritic.com/favicon.ico"), + TQString::fromLatin1("eFilmCritic"), + TQString::fromLatin1("http://efilmcritic.com/fo.rdf"), + TQString::fromLatin1("http://efilmcritic.com/favicon.ico"), NewsSourceBase::Arts, 3, false, false), NewsSourceBase::Data( - QString::fromLatin1("superhits.ch"), - QString::fromLatin1("http://www.superhits.ch/cgi-bin/superhits.cgi?page=rdf"), - QString::fromLatin1("http://www.superhits.ch/favicon.ico"), - NewsSourceBase::Arts, 10, false, false, QString::fromLatin1("de")), + 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")), // Business ----------- NewsSourceBase::Data( - QString::fromLatin1("Internet.com Business"), - QString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), - QString::null, + TQString::fromLatin1("Internet.com Business"), + TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), + TQString::null, NewsSourceBase::Business, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("TradeSims"), - QString::fromLatin1("http://www.tradesims.com/AEX.rdf"), - QString::null, + TQString::fromLatin1("TradeSims"), + TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"), + TQString::null, NewsSourceBase::Business, 10, false, false), // Computers ---------- NewsSourceBase::Data( - QString::fromLatin1( "linuxartist.org" ), - QString::fromLatin1( "http://www.linuxartist.org/backend.php"), - QString::fromLatin1( "http://www.linuxartist.org/favicon.ico"), + TQString::fromLatin1( "linuxartist.org" ), + TQString::fromLatin1( "http://www.linuxartist.org/backend.php"), + TQString::fromLatin1( "http://www.linuxartist.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false ), NewsSourceBase::Data( - QString::fromLatin1("KDE Deutschland"), - QString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"), - QString::fromLatin1("http://www.kde.de/favicon.ico"), - NewsSourceBase::Computers, 10, true, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("KDE France"), - QString::fromLatin1("http://www.kde-france.org/backend-breves.php3"), - QString::null, - NewsSourceBase::Computers, 10, true, false, QString::fromLatin1("fr")), + TQString::fromLatin1("KDE France"), + TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"), + TQString::null, + NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("fr")), NewsSourceBase::Data( - QString::fromLatin1("FreeBSD Project News"), - QString::fromLatin1("http://www.freebsd.org/news/news.rdf"), - QString::fromLatin1("http://www.freebsd.org/favicon.ico"), + TQString::fromLatin1("FreeBSD Project News"), + TQString::fromLatin1("http://www.freebsd.org/news/news.rdf"), + TQString::fromLatin1("http://www.freebsd.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("dot.kde.org"), - QString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"), - QString::fromLatin1("http://www.kde.org/favicon.ico"), + TQString::fromLatin1("dot.kde.org"), + TQString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"), + TQString::fromLatin1("http://www.kde.org/favicon.ico"), NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - QString::fromLatin1("GNOME News"), - QString::fromLatin1("http://www.gnomedesktop.org/backend.php"), - QString::null, + TQString::fromLatin1("GNOME News"), + TQString::fromLatin1("http://www.gnomedesktop.org/backend.php"), + TQString::null, NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Slashdot"), - QString::fromLatin1("http://slashdot.org/slashdot.rdf"), - QString::fromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot"), + TQString::fromLatin1("http://slashdot.org/slashdot.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - QString::fromLatin1("Ask Slashdot"), - QString::fromLatin1("http://slashdot.org/askslashdot.rdf"), - QString::fromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Ask Slashdot"), + TQString::fromLatin1("http://slashdot.org/askslashdot.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Slashdot: Features"), - QString::fromLatin1("http://slashdot.org/features.rdf"), - QString::fromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Features"), + TQString::fromLatin1("http://slashdot.org/features.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Slashdot: Apache"), - QString::fromLatin1("http://slashdot.org/apache.rdf"), - QString::fromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Apache"), + TQString::fromLatin1("http://slashdot.org/apache.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Slashdot: Books"), - QString::fromLatin1("http://slashdot.org/books.rdf"), - QString::fromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Books"), + TQString::fromLatin1("http://slashdot.org/books.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Jabber News"), - QString::fromLatin1("http://www.jabber.org/news/rss.xml"), - QString::null, + TQString::fromLatin1("Jabber News"), + TQString::fromLatin1("http://www.jabber.org/news/rss.xml"), + TQString::null, NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Freshmeat"), - QString::fromLatin1("http://freshmeat.net/backend/fm.rdf"), - QString::fromLatin1("http://freshmeat.net/favicon.ico"), + TQString::fromLatin1("Freshmeat"), + TQString::fromLatin1("http://freshmeat.net/backend/fm.rdf"), + TQString::fromLatin1("http://freshmeat.net/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Linux Weekly News"), - QString::fromLatin1("http://www.lwn.net/headlines/rss"), - QString::fromLatin1("http://www.lwn.net/favicon.ico"), + TQString::fromLatin1("Linux Weekly News"), + TQString::fromLatin1("http://www.lwn.net/headlines/rss"), + TQString::fromLatin1("http://www.lwn.net/favicon.ico"), NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - QString::fromLatin1("heise online news"), - QString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"), - QString::fromLatin1("http://www.heise.de/favicon.ico"), - NewsSourceBase::Computers, 10, true, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("RUS-CERT Ticker"), - QString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"), - QString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), - NewsSourceBase::Computers, 10, true, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("RUS-CERT Elsewhere"), - QString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"), - QString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("Kuro5hin"), - QString::fromLatin1("http://kuro5hin.org/backend.rdf"), - QString::fromLatin1("http://kuro5hin.org/favicon.ico"), + TQString::fromLatin1("Kuro5hin"), + TQString::fromLatin1("http://kuro5hin.org/backend.rdf"), + TQString::fromLatin1("http://kuro5hin.org/favicon.ico"), NewsSourceBase::Computers, 10, true, false), NewsSourceBase::Data( - QString::fromLatin1("Prolinux"), - QString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"), - QString::fromLatin1("http://www.prolinux.de/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("Linuxde.org"), - QString::fromLatin1("http://www.linuxde.org/backends/news.rdf"), - QString::fromLatin1("http://www.linuxde.org/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("LinuxSecurity.com"), - QString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), - QString::null, + TQString::fromLatin1("LinuxSecurity.com"), + TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), + TQString::null, NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Linux Game Tome"), - QString::fromLatin1("http://happypenguin.org/html/news.rdf"), - QString::null, + TQString::fromLatin1("Linux Game Tome"), + TQString::fromLatin1("http://happypenguin.org/html/news.rdf"), + TQString::null, NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Telefragged"), - QString::fromLatin1("http://www.telefragged.com/cgi-bin/rdf.pl"), - QString::null, + TQString::fromLatin1("Telefragged"), + TQString::fromLatin1("http://www.telefragged.com/cgi-bin/rdf.pl"), + TQString::null, NewsSourceBase::Computers, 10, false, false), /* NewsSourceBase::Data( - QString::fromLatin1("Gimp News"), - QString::fromLatin1("http://www.xach.com/gimp/news/channel.rdf"), - QString::null, + TQString::fromLatin1("Gimp News"), + TQString::fromLatin1("http://www.xach.com/gimp/news/channel.rdf"), + TQString::null, NewsSourceBase::Computers, 10, false, false),*/ NewsSourceBase::Data( - QString::fromLatin1("Mozilla"), - QString::fromLatin1("http://www.mozilla.org/news.rdf"), - QString::fromLatin1("http://www.mozillazine.org/favicon.ico"), + TQString::fromLatin1("Mozilla"), + TQString::fromLatin1("http://www.mozilla.org/news.rdf"), + TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("MozillaZine"), - QString::fromLatin1("http://www.mozillazine.org/contents.rdf"), - QString::fromLatin1("http://www.mozillazine.org/favicon.ico"), + TQString::fromLatin1("MozillaZine"), + TQString::fromLatin1("http://www.mozillazine.org/contents.rdf"), + TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Daemon News"), - QString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), - QString::null, + TQString::fromLatin1("Daemon News"), + TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), + TQString::null, NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("use Perl;"), - QString::fromLatin1("http://use.perl.org/useperl.rdf"), - QString::null, + TQString::fromLatin1("use Perl;"), + TQString::fromLatin1("http://use.perl.org/useperl.rdf"), + TQString::null, NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("desktopian.org"), - QString::fromLatin1("http://www.desktopian.org/includes/headlines.xml"), - QString::fromLatin1("http://www.desktopian.org/favicon.ico"), + TQString::fromLatin1("desktopian.org"), + TQString::fromLatin1("http://www.desktopian.org/includes/headlines.xml"), + TQString::fromLatin1("http://www.desktopian.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("Root prompt"), - QString::fromLatin1("http://www.rootprompt.org/rss/"), - QString::fromLatin1("http://www.rootprompt.org/favicon.ico"), + TQString::fromLatin1("Root prompt"), + TQString::fromLatin1("http://www.rootprompt.org/rss/"), + TQString::fromLatin1("http://www.rootprompt.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("SecurityFocus"), - QString::fromLatin1("http://www.securityfocus.com/rss/news.xml"), - QString::fromLatin1("http://www.securityfocus.com/favicon.ico"), + TQString::fromLatin1("SecurityFocus"), + TQString::fromLatin1("http://www.securityfocus.com/rss/news.xml"), + TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("LinuxNewbie"), - QString::fromLatin1("http://www.linuxnewbie.org/news.cdf"), - QString::fromLatin1("http://www.linuxnewbie.org/favicon.ico"), + TQString::fromLatin1("LinuxNewbie"), + TQString::fromLatin1("http://www.linuxnewbie.org/news.cdf"), + TQString::fromLatin1("http://www.linuxnewbie.org/favicon.ico"), NewsSourceBase::Computers, 5, false, false), NewsSourceBase::Data( - QString::fromLatin1("Arstechnica"), - QString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), - QString::fromLatin1("http://arstechnica.com/favicon.ico"), + TQString::fromLatin1("Arstechnica"), + TQString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), + TQString::fromLatin1("http://arstechnica.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"), - QString::fromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"), - QString::fromLatin1("http://www.amiga-news.de/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("amiga-news.de - english Amiga news"), - QString::fromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"), - QString::fromLatin1("http://www.amiga-news.de/favicon.ico"), + 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"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("RadioTux)"), - QString::fromLatin1("http://blog.radiotux.de/feed/"), - QString::null, - NewsSourceBase::Computers, 10, false, false, QString::fromLatin1("de")), + TQString::fromLatin1("RadioTux)"), + TQString::fromLatin1("http://blog.radiotux.de/feed/"), + TQString::null, + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - QString::fromLatin1("kdenews.unixcode.org"), - QString::fromLatin1("http://kdenews.unixcode.org/?node=news&action=rss"), - QString::null, + TQString::fromLatin1("kdenews.unixcode.org"), + TQString::fromLatin1("http://kdenews.unixcode.org/?node=news&action=rss"), + TQString::null, NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("FreshPorts - the place for ports"), - QString::fromLatin1("http://www.freshports.org/news.php"), - QString::fromLatin1("http://www.freshports.org/favicon.ico"), + TQString::fromLatin1("FreshPorts - the place for ports"), + TQString::fromLatin1("http://www.freshports.org/news.php"), + TQString::fromLatin1("http://www.freshports.org/favicon.ico"), NewsSourceBase::Computers, 20, false, false), NewsSourceBase::Data( - QString::fromLatin1("NetPhoenix"), - QString::fromLatin1("http://www.netphoenix.at/rss/netphoenix.php"), - QString::fromLatin1("http://www.netphoenix.at/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("ShortNews - by www.netphoenix.at"), - QString::fromLatin1("http://www.netphoenix.at/rss/shortnews.php"), - QString::fromLatin1("http://www.netphoenix.at/favicon.ico"), - NewsSourceBase::Computers, 10, false, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("zez.org - about code "), - QString::fromLatin1("http://zez.org/article/rssheadlines"), - QString::null, + TQString::fromLatin1("zez.org - about code "), + TQString::fromLatin1("http://zez.org/article/rssheadlines"), + TQString::null, NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("BSDatwork.com"), - QString::fromLatin1("http://BSDatwork.com/backend.php"), - QString::fromLatin1("http://BSDatwork.com/favicon.ico"), + TQString::fromLatin1("BSDatwork.com"), + TQString::fromLatin1("http://BSDatwork.com/backend.php"), + TQString::fromLatin1("http://BSDatwork.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("FreshSource - the place for source"), - QString::fromLatin1("http://www.freshsource.org/news.php"), - QString::fromLatin1("http://www.freshsource.org/favicon.ico"), + TQString::fromLatin1("FreshSource - the place for source"), + TQString::fromLatin1("http://www.freshsource.org/news.php"), + TQString::fromLatin1("http://www.freshsource.org/favicon.ico"), NewsSourceBase::Computers, 20, false, false), NewsSourceBase::Data( - QString::fromLatin1("The FreeBSD Diary"), - QString::fromLatin1("http://www.freebsddiary.org/news.php"), - QString::fromLatin1("http://www.freebsddiary.org/favicon.ico"), + TQString::fromLatin1("The FreeBSD Diary"), + TQString::fromLatin1("http://www.freebsddiary.org/news.php"), + TQString::fromLatin1("http://www.freebsddiary.org/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("MaximumBSD"), - QString::fromLatin1("http://www.maximumbsd.com/backend/mb.rdf"), - QString::fromLatin1("http://www.maximumbsd.com/favicon.ico"), + TQString::fromLatin1("MaximumBSD"), + TQString::fromLatin1("http://www.maximumbsd.com/backend/mb.rdf"), + TQString::fromLatin1("http://www.maximumbsd.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("BR-Linux.org"), - QString::fromLatin1("http://br-linux.org/noticias/index.rdf"), - QString::fromLatin1("http://br-linux.org/noticias/favicon.ico"), + TQString::fromLatin1("BR-Linux.org"), + TQString::fromLatin1("http://br-linux.org/noticias/index.rdf"), + TQString::fromLatin1("http://br-linux.org/noticias/favicon.ico"), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("OSNews.com"), - QString::fromLatin1("http://www.osnews.com/files/recent.rdf"), - QString::fromLatin1("http://www.osnews.com/favicon.ico"), + TQString::fromLatin1("OSNews.com"), + TQString::fromLatin1("http://www.osnews.com/files/recent.rdf"), + TQString::fromLatin1("http://www.osnews.com/favicon.ico"), NewsSourceBase::Computers, 10, false, false), // Miscellaneous ------ NewsSourceBase::Data( - QString::fromLatin1("tagesschau.de"), - QString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"), - QString::fromLatin1("http://www.tagesschau.de/favicon.ico"), - NewsSourceBase::Misc, 10, true, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("N24.de"), - QString::fromLatin1("http://www.n24.de/rss/?rubrik=home"), - QString::fromLatin1("http://www.n24.de/favicon.ico"), - NewsSourceBase::Misc, 10, true, false, QString::fromLatin1("de")), + 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")), /* NewsSourceBase::Data( - QString::fromLatin1("CNN"), - QString::fromLatin1("http://www.cnn.com/cnn.rss"), - QString::fromLatin1("http://www.cnn.com/favicon.ico"), + TQString::fromLatin1("CNN"), + TQString::fromLatin1("http://www.cnn.com/cnn.rss"), + TQString::fromLatin1("http://www.cnn.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("CNN Europe"), - QString::fromLatin1("http://europe.cnn.com/cnn.rss"), - QString::fromLatin1("http://europe.cnn.com/favicon.ico"), + TQString::fromLatin1("CNN Europe"), + TQString::fromLatin1("http://europe.cnn.com/cnn.rss"), + TQString::fromLatin1("http://europe.cnn.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false), */ NewsSourceBase::Data( - QString::fromLatin1("HotWired"), - QString::fromLatin1("http://www.hotwired.com/webmonkey/meta/headlines.rdf"), - QString::fromLatin1("http://www.hotwired.com/favicon.ico"), + TQString::fromLatin1("HotWired"), + TQString::fromLatin1("http://www.hotwired.com/webmonkey/meta/headlines.rdf"), + TQString::fromLatin1("http://www.hotwired.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1("The Register"), - QString::fromLatin1("http://www.theregister.co.uk/tonys/slashdot.rdf"), - QString::fromLatin1("http://www.theregister.co.uk/favicon.ico"), + TQString::fromLatin1("The Register"), + TQString::fromLatin1("http://www.theregister.co.uk/tonys/slashdot.rdf"), + TQString::fromLatin1("http://www.theregister.co.uk/favicon.ico"), NewsSourceBase::Misc, 10, false, false), NewsSourceBase::Data( - QString::fromLatin1( "Christian Science Monitor" ), - QString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"), - QString::fromLatin1( "http://www.csmonitor.com/favicon.ico"), + TQString::fromLatin1( "Christian Science Monitor" ), + TQString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"), + TQString::fromLatin1( "http://www.csmonitor.com/favicon.ico"), NewsSourceBase::Misc, 10, false, false ), // Magazines ------ NewsSourceBase::Data( - QString::fromLatin1("Revista do Linux"), - QString::fromLatin1("http://www.revistadolinux.com.br/noticias/arquivo/noticias.rdf"), - QString::fromLatin1("http://www.revistadolinux.com.br/favicon.ico"), - NewsSourceBase::Magazines, 10, false, false /*, QString::fromLatin1("br")*/ ), + 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")*/ ), NewsSourceBase::Data( - QString::fromLatin1("Spiegel.de"), - QString::fromLatin1("http://www.spiegel.de/schlagzeilen/rss/0,5291,,00.xml"), - QString::fromLatin1("http://www.spiegel.de/favicon.ico"), - NewsSourceBase::Magazines, 10, true, false, QString::fromLatin1("de")), + 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")), NewsSourceBase::Data( - QString::fromLatin1("FAZ.de"), - QString::fromLatin1("http://www.faz.net/s/Rub/Tpl~Epartner~SRss_.xml"), - QString::fromLatin1("http://www.faz.net/favicon.ico"), - NewsSourceBase::Magazines, 10, true, false, QString::fromLatin1("de")), + 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")), // Recreation NewsSourceBase::Data( - QString::fromLatin1("Segfault"), - QString::fromLatin1("http://segfault.org/stories.xml"), - QString::fromLatin1("http://segfault.org/favicon.ico"), + TQString::fromLatin1("Segfault"), + TQString::fromLatin1("http://segfault.org/stories.xml"), + TQString::fromLatin1("http://segfault.org/favicon.ico"), NewsSourceBase::Recreation, 10, false, false), // Society NewsSourceBase::Data( - QString::fromLatin1("nippon.it"), - QString::fromLatin1("http://www.nippon.it/backend.it.php"), - QString::fromLatin1("http://www.nippon.it/favicon.ico"), - NewsSourceBase::Society, 10, false, false, QString::fromLatin1("it")), + 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")), NewsSourceBase::Data( - QString::fromLatin1( "gflash" ), - QString::fromLatin1( "http://www.gflash.de/backend.php"), - QString::fromLatin1( "http://www.gflash.de/favicon.ico"), - NewsSourceBase::Society, 10, false, false, QString::fromLatin1( "de" ) ), + 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" ) ), NewsSourceBase::Data( - QString::fromLatin1( "Quintessenz" ), - QString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"), - QString::fromLatin1( "http://quintessenz.at/favicon.ico"), - NewsSourceBase::Society, 9, false, false, QString::fromLatin1( "de" ) ) + 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" ) ) }; -ArticleFilter::ArticleFilter(const QString &action, const QString &newsSource, - const QString &condition, const QString &expression, bool enabled) +ArticleFilter::ArticleFilter(const TQString &action, const TQString &newsSource, + const TQString &condition, const TQString &expression, bool enabled) : m_action(action), m_newsSource(newsSource), m_condition(condition), @@ -387,7 +387,7 @@ bool ArticleFilter::matches(Article::Ptr a) const else if (condition() == i18n("do not equal")) matches = (a->headline() != expression()); else { // condition() == i18n("match") - QRegExp regexp = QRegExp(expression()); + TQRegExp regexp = TQRegExp(expression()); matches = regexp.exactMatch(a->headline()); } @@ -398,7 +398,7 @@ bool ArticleFilter::matches(Article::Ptr a) const } ConfigAccess::ConfigAccess() - : m_defaultCfg(new KConfig(QString::null, true, false)) + : m_defaultCfg(new KConfig(TQString::null, true, false)) { m_cfg = m_defaultCfg; } @@ -436,13 +436,13 @@ void ConfigAccess::setMouseWheelSpeed(const unsigned int mouseWheelSpeed) m_cfg->sync(); } -QFont ConfigAccess::font() const +TQFont ConfigAccess::font() const { - QFont font = KGlobalSettings::fixedFont(); + TQFont font = KGlobalSettings::fixedFont(); return m_cfg->readFontEntry("Font", &font); } -void ConfigAccess::setFont(const QFont &font) +void ConfigAccess::setFont(const TQFont &font) { m_cfg->writeEntry("Font", font); m_cfg->sync(); @@ -481,9 +481,9 @@ void ConfigAccess::setOfflineMode(bool offlineMode) m_cfg->sync(); } -QStringList ConfigAccess::newsSources() const +TQStringList ConfigAccess::newsSources() const { - QStringList tempList = m_cfg->readListEntry("News sources"); + TQStringList tempList = m_cfg->readListEntry("News sources"); if (tempList.isEmpty()) for (unsigned int i = 0; i < DEFAULT_NEWSSOURCES; i++) tempList << NewsSourceDefault[i].name; @@ -495,7 +495,7 @@ ArticleFilter::List ConfigAccess::filters() const return m_cfg->readIntListEntry("Filters"); } -void ConfigAccess::setNewsSources(const QStringList &newsSources) +void ConfigAccess::setNewsSources(const TQStringList &newsSources) { m_cfg->writeEntry("News sources", newsSources); m_cfg->sync(); @@ -529,34 +529,34 @@ void ConfigAccess::setScrollingDirection(const unsigned int scrollingDirection) m_cfg->sync(); } -QColor ConfigAccess::foregroundColor() const +TQColor ConfigAccess::foregroundColor() const { return m_cfg->readColorEntry("Foreground color", &Qt::black); } -void ConfigAccess::setForegroundColor(const QColor &foregroundColor) +void ConfigAccess::setForegroundColor(const TQColor &foregroundColor) { m_cfg->writeEntry("Foreground color", foregroundColor); m_cfg->sync(); } -QColor ConfigAccess::backgroundColor() const +TQColor ConfigAccess::backgroundColor() const { return m_cfg->readColorEntry("Background color", &Qt::white); } -void ConfigAccess::setBackgroundColor(const QColor &backgroundColor) +void ConfigAccess::setBackgroundColor(const TQColor &backgroundColor) { m_cfg->writeEntry("Background color", backgroundColor); m_cfg->sync(); } -QColor ConfigAccess::highlightedColor() const +TQColor ConfigAccess::highlightedColor() const { return m_cfg->readColorEntry("Highlighted color", &Qt::red); } -void ConfigAccess::setHighlightedColor(const QColor &highlightedColor) +void ConfigAccess::setHighlightedColor(const TQColor &highlightedColor) { m_cfg->writeEntry("Highlighted color", highlightedColor); m_cfg->sync(); @@ -573,7 +573,7 @@ void ConfigAccess::setUnderlineHighlighted(bool underlineHighlighted) m_cfg->sync(); } -NewsSourceBase *ConfigAccess::newsSource(const QString &newsSource) +NewsSourceBase *ConfigAccess::newsSource(const TQString &newsSource) { NewsSourceBase::Data nsd; @@ -587,13 +587,13 @@ NewsSourceBase *ConfigAccess::newsSource(const QString &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", QString::fromLatin1("C")); + nsd.language = m_cfg->readEntry("Language", TQString::fromLatin1("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 == QString::fromLatin1("C") || + nsd.enabled = (nsd.language == TQString::fromLatin1("C") || KGlobal::locale()->languageList().contains(nsd.language)); break; } @@ -611,8 +611,8 @@ ArticleFilter ConfigAccess::filter(const unsigned int filterNo) const ArticleFilter f; f.setId(filterNo); - if (m_cfg->hasGroup(QString::fromLatin1("Filter #%1").arg(filterNo))) { - m_cfg->setGroup(QString::fromLatin1("Filter #%1").arg(filterNo)); + if (m_cfg->hasGroup(TQString::fromLatin1("Filter #%1").arg(filterNo))) { + m_cfg->setGroup(TQString::fromLatin1("Filter #%1").arg(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(QString::fromLatin1("Filter #%1").arg(f.id())); + m_cfg->setGroup(TQString::fromLatin1("Filter #%1").arg(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 3cdf80e5..8d2c8a50 100644 --- a/knewsticker/common/configaccess.h +++ b/knewsticker/common/configaccess.h @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #define DEFAULT_NEWSSOURCES 63 #define DEFAULT_SUBJECTS 13 @@ -30,25 +30,25 @@ class KURL; class ArticleFilter { public: - typedef QValueList List; + typedef TQValueList List; - ArticleFilter(const QString & = I18N_NOOP(QString::fromLatin1("Show")), - const QString & = I18N_NOOP(QString::fromLatin1("all newssources")), - const QString & = I18N_NOOP(QString::fromLatin1("contain")), - const QString & = QString::null, + 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, bool = true); - QString action() const { return m_action; } - void setAction(const QString &action) { m_action = action; } + TQString action() const { return m_action; } + void setAction(const TQString &action) { m_action = action; } - QString newsSource() const { return m_newsSource; } - void setNewsSource(const QString &newsSource) { m_newsSource = newsSource; } + TQString newsSource() const { return m_newsSource; } + void setNewsSource(const TQString &newsSource) { m_newsSource = newsSource; } - QString condition() const { return m_condition; } - void setCondition(const QString &condition) { m_condition = condition; } + TQString condition() const { return m_condition; } + void setCondition(const TQString &condition) { m_condition = condition; } - QString expression() const { return m_expression; } - void setExpression(const QString &expression) { m_expression = expression; } + TQString expression() const { return m_expression; } + void setExpression(const TQString &expression) { m_expression = expression; } bool enabled() const { return m_enabled; } void setEnabled(bool enabled) { m_enabled = enabled; } @@ -59,10 +59,10 @@ class ArticleFilter { bool matches(Article::Ptr) const; private: - QString m_action; - QString m_newsSource; - QString m_condition; - QString m_expression; + TQString m_action; + TQString m_newsSource; + TQString m_condition; + TQString m_expression; bool m_enabled; unsigned int m_id; }; @@ -84,12 +84,12 @@ class ConfigAccess : public ConfigIface virtual bool underlineHighlighted() const; virtual bool showIcons() const; virtual bool slowedScrolling() const; - virtual QColor foregroundColor() const; - virtual QColor backgroundColor() const; - virtual QColor highlightedColor() const; - QFont font() const; - virtual QStringList newsSources() const; - NewsSourceBase *newsSource(const QString &); + virtual TQColor foregroundColor() const; + virtual TQColor backgroundColor() const; + virtual TQColor highlightedColor() const; + TQFont font() const; + virtual TQStringList newsSources() const; + NewsSourceBase *newsSource(const TQString &); ArticleFilter::List filters() const; ArticleFilter filter(const unsigned int) const; @@ -117,11 +117,11 @@ class ConfigAccess : public ConfigIface virtual void setUnderlineHighlighted(bool); virtual void setShowIcons(bool); virtual void setSlowedScrolling(bool); - virtual void setForegroundColor(const QColor &); - virtual void setBackgroundColor(const QColor &); - virtual void setHighlightedColor(const QColor &); - void setFont(const QFont &); - virtual void setNewsSources(const QStringList &); + virtual void setForegroundColor(const TQColor &); + virtual void setBackgroundColor(const TQColor &); + virtual void setHighlightedColor(const TQColor &); + void setFont(const TQFont &); + virtual void setNewsSources(const TQStringList &); void setNewsSource(const NewsSourceBase::Data &); void setFilters(const ArticleFilter::List &); void setFilter(const ArticleFilter &); diff --git a/knewsticker/common/configiface.h b/knewsticker/common/configiface.h index 64bc312d..e5f425c9 100644 --- a/knewsticker/common/configiface.h +++ b/knewsticker/common/configiface.h @@ -32,10 +32,10 @@ class ConfigIface virtual bool underlineHighlighted() const = 0; virtual bool showIcons() const = 0; virtual bool slowedScrolling() const = 0; - virtual QColor foregroundColor() const = 0; - virtual QColor backgroundColor() const = 0; - virtual QColor highlightedColor() const = 0; - virtual QStringList newsSources() const = 0; + virtual TQColor foregroundColor() const = 0; + virtual TQColor backgroundColor() const = 0; + virtual TQColor highlightedColor() const = 0; + virtual TQStringList newsSources() const = 0; virtual void setInterval(const unsigned int) = 0; virtual void setScrollingSpeed(const unsigned int) = 0; @@ -47,10 +47,10 @@ class ConfigIface virtual void setUnderlineHighlighted(bool) = 0; virtual void setShowIcons(bool) = 0; virtual void setSlowedScrolling(bool) = 0; - virtual void setForegroundColor(const QColor &) = 0; - virtual void setBackgroundColor(const QColor &) = 0; - virtual void setHighlightedColor(const QColor &) = 0; - virtual void setNewsSources(const QStringList &) = 0; + virtual void setForegroundColor(const TQColor &) = 0; + virtual void setBackgroundColor(const TQColor &) = 0; + virtual void setHighlightedColor(const TQColor &) = 0; + virtual void setNewsSources(const TQStringList &) = 0; }; #endif // CONFIGIFACE_H diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp index cce7895c..a283a68b 100644 --- a/knewsticker/common/newsengine.cpp +++ b/knewsticker/common/newsengine.cpp @@ -21,9 +21,9 @@ #include #include -#include +#include -Article::Article(NewsSourceBase *parent, const QString &headline, +Article::Article(NewsSourceBase *parent, const TQString &headline, const KURL &address) : XMLNewsArticle(headline, address), m_parent(parent), @@ -45,22 +45,22 @@ void Article::open() NewsSourceBase::NewsSourceBase(const Data &nsd, ConfigIface *config) : XMLNewsSource(), m_data(nsd), - m_icon(QPixmap()), + m_icon(TQPixmap()), m_cfg(dynamic_cast(config)), m_newsIconMgr(NewsIconMgr::self()) { - connect(this, SIGNAL(loadComplete(XMLNewsSource *, bool)), - SLOT(slotProcessArticles(XMLNewsSource *, bool))); + connect(this, TQT_SIGNAL(loadComplete(XMLNewsSource *, bool)), + TQT_SLOT(slotProcessArticles(XMLNewsSource *, bool))); } void NewsSourceBase::getIcon() { - connect(m_newsIconMgr, SIGNAL(gotIcon(const KURL &, const QPixmap &)), - this, SLOT(slotGotIcon(const KURL &, const QPixmap &))); + connect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), + this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); m_newsIconMgr->getIcon( KURL( m_data.icon ) ); } -QString NewsSourceBase::newsSourceName() const +TQString NewsSourceBase::newsSourceName() const { if (m_cfg->customNames() || m_name.isEmpty()) return m_data.name; @@ -68,7 +68,7 @@ QString NewsSourceBase::newsSourceName() const return m_name; } -QString NewsSourceBase::subjectText(const Subject subject) +TQString NewsSourceBase::subjectText(const Subject subject) { switch (subject) { case Arts: return i18n("Arts"); @@ -144,7 +144,7 @@ void NewsSourceBase::slotProcessArticles(XMLNewsSource *, bool gotEm) emit newNewsAvailable(this, oldArticles != m_articles); } -Article::Ptr NewsSourceBase::article(const QString &headline) +Article::Ptr NewsSourceBase::article(const TQString &headline) { Article::List::ConstIterator it = m_articles.begin(); Article::List::ConstIterator end = m_articles.end(); @@ -155,13 +155,13 @@ Article::Ptr NewsSourceBase::article(const QString &headline) return 0L; } -void NewsSourceBase::slotGotIcon(const KURL &url, const QPixmap &pixmap) +void NewsSourceBase::slotGotIcon(const KURL &url, const TQPixmap &pixmap) { if (url.url() == m_data.icon) { m_icon = pixmap; - disconnect(m_newsIconMgr, SIGNAL(gotIcon(const KURL &, const QPixmap &)), - this, SLOT(slotGotIcon(const KURL &, const QPixmap &))); + disconnect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), + this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); } } @@ -181,10 +181,10 @@ ProgramNewsSource::ProgramNewsSource(const NewsSourceBase::Data &nsd, m_program(new KProcess()), m_programOutput(0) { - connect(m_program, SIGNAL(processExited(KProcess *)), - SLOT(slotProgramExited(KProcess *))); - connect(m_program, SIGNAL(receivedStdout(KProcess *, char *, int)), - SLOT(slotGotProgramOutput(KProcess *, char *, int))); + connect(m_program, TQT_SIGNAL(processExited(KProcess *)), + TQT_SLOT(slotProgramExited(KProcess *))); + connect(m_program, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), + TQT_SLOT(slotGotProgramOutput(KProcess *, char *, int))); m_data.sourceFile = KURL(m_data.sourceFile).encodedPathAndQuery(); } @@ -213,7 +213,7 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc) { bool okSoFar = true; - QString errorMsg; + TQString errorMsg; if (!proc->normalExit()) { errorMsg = i18n("

The program '%1' was terminated abnormally.
This can" @@ -228,9 +228,9 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc) } if (!okSoFar) { - QString output = QString(m_programOutput->buffer()); + TQString output = TQString(m_programOutput->buffer()); if (!output.isEmpty()) { - output = QString::fromLatin1("\"") + output + QString::fromLatin1("\""); + output = TQString::fromLatin1("\"") + output + TQString::fromLatin1("\""); errorMsg += i18n("

Program output:
%1
").arg(output); } KMessageBox::detailedError(0, i18n("An error occurred while updating the" @@ -244,7 +244,7 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc) m_programOutput = 0; } -QString ProgramNewsSource::errorMessage(const ErrorCode errorCode) +TQString ProgramNewsSource::errorMessage(const ErrorCode errorCode) { switch (errorCode) { case EPERM: return i18n("The program '%1' could not be started at all."); diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h index 342dd7fe..430efff7 100644 --- a/knewsticker/common/newsengine.h +++ b/knewsticker/common/newsengine.h @@ -18,9 +18,9 @@ #include "configiface.h" #include "xmlnewsaccess.h" -#include -#include -#include +#include +#include +#include #include #include @@ -40,9 +40,9 @@ class KDE_EXPORT Article : public XMLNewsArticle, public KShared { public: typedef KSharedPtr

Ptr; - typedef QValueList List; + typedef TQValueList List; - Article(NewsSourceBase *, const QString & = QString::null, + Article(NewsSourceBase *, const TQString & = TQString::null, const KURL & = KURL()); bool operator==(const Article &other) const; @@ -68,13 +68,13 @@ class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared Reference, Science, Shopping, Society, Sports, Misc, Magazines }; struct Data { - Data(const QString &_name = I18N_NOOP("Unknown"), - const QString &_sourceFile = QString::null, - const QString &_icon = QString::null, + Data(const TQString &_name = I18N_NOOP("Unknown"), + const TQString &_sourceFile = TQString::null, + const TQString &_icon = TQString::null, const Subject _subject = Computers, unsigned int _maxArticles = 10, bool _enabled = true, bool _isProgram = false, - const QString &_language = QString::fromLatin1("C")) + const TQString &_language = TQString::fromLatin1("C")) { name = _name; sourceFile = _sourceFile; @@ -86,32 +86,32 @@ class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared language = _language; } - QString name; - QString sourceFile; - QString icon; + TQString name; + TQString sourceFile; + TQString icon; Subject subject; unsigned int maxArticles; bool enabled; bool isProgram; - QString language; + TQString language; }; typedef KSharedPtr Ptr; - typedef QValueList List; + typedef TQValueList List; NewsSourceBase(const Data &, ConfigIface *); - virtual QString newsSourceName() const; - QString sourceFile() const { return m_data.sourceFile; } + virtual TQString newsSourceName() const; + TQString sourceFile() const { return m_data.sourceFile; } unsigned int maxArticles() const { return m_data.maxArticles; } - QPixmap icon() const { return m_icon; } + TQPixmap icon() const { return m_icon; } void getIcon(); Data data() const { return m_data; } Article::List articles() const { return m_articles; } - Article::Ptr article(const QString &); + Article::Ptr article(const TQString &); - static QString subjectText(const Subject); + static TQString subjectText(const Subject); signals: void newNewsAvailable(const NewsSourceBase::Ptr &, bool); @@ -122,11 +122,11 @@ class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared protected slots: void slotProcessArticles(XMLNewsSource *, bool); - void slotGotIcon(const KURL &, const QPixmap &); + void slotGotIcon(const KURL &, const TQPixmap &); protected: Data m_data; - QPixmap m_icon; + TQPixmap m_icon; ConfigAccess *m_cfg; NewsIconMgr *m_newsIconMgr; Article::List m_articles; @@ -194,10 +194,10 @@ class KDE_EXPORT ProgramNewsSource : public NewsSourceBase void slotProgramExited(KProcess *); private: - static QString errorMessage(const ErrorCode); + static TQString errorMessage(const ErrorCode); KProcess *m_program; - QBuffer *m_programOutput; + TQBuffer *m_programOutput; }; #endif // NEWSENGINE_H diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp index 69617490..b6787dff 100644 --- a/knewsticker/common/newsiconmgr.cpp +++ b/knewsticker/common/newsiconmgr.cpp @@ -16,15 +16,15 @@ #include #include -#include -#include -#include +#include +#include +#include struct KIODownload { KURL url; - QByteArray data; - QIODevice::Offset dataOffset; + TQByteArray data; + TQIODevice::Offset dataOffset; }; NewsIconMgr *NewsIconMgr::m_instance = 0; @@ -37,13 +37,13 @@ NewsIconMgr *NewsIconMgr::self() return m_instance; } -NewsIconMgr::NewsIconMgr(QObject *parent, const char *name) - : QObject(parent, name), DCOPObject("NewsIconMgr"), - m_stdIcon(SmallIcon(QString::fromLatin1("news"))) +NewsIconMgr::NewsIconMgr(TQObject *parent, const char *name) + : TQObject(parent, name), DCOPObject("NewsIconMgr"), + m_stdIcon(SmallIcon(TQString::fromLatin1("news"))) { connectDCOPSignal("kded", - "favicons", "iconChanged(bool, QString, QString)", - "slotGotIcon(bool, QString, QString)", + "favicons", "iconChanged(bool, TQString, TQString)", + "slotGotIcon(bool, TQString, TQString)", false); } @@ -60,11 +60,11 @@ void NewsIconMgr::getIcon(const KURL &url) } if (url.isLocalFile()) { - if (QFile::exists(url.encodedPathAndQuery())) { - QPixmap icon(url.encodedPathAndQuery()); + if (TQFile::exists(url.encodedPathAndQuery())) { + TQPixmap icon(url.encodedPathAndQuery()); if (!icon.isNull()) { - if (icon.size() != QSize(16, 16)) { - if (!icon.convertFromImage(icon.convertToImage().smoothScale(16, 16, QImage::ScaleMin))) { + if (icon.size() != TQSize(16, 16)) { + if (!icon.convertFromImage(icon.convertToImage().smoothScale(16, 16, TQImage::ScaleMin))) { emit gotIcon(url, m_stdIcon); return; } @@ -79,19 +79,19 @@ void NewsIconMgr::getIcon(const KURL &url) if (url.encodedPathAndQuery() == "/favicon.ico") { if (favicon(url).isNull()) { - QByteArray data; - QDataStream ds(data, IO_WriteOnly); + TQByteArray data; + TQDataStream ds(data, IO_WriteOnly); ds << url; kapp->dcopClient()->send("kded", "favicons", "downloadHostIcon(KURL)", data); } else { - emit gotIcon(url, QPixmap(KGlobal::dirs()->findResource("cache", - QString::fromLatin1("favicons/%1.png").arg(url.host())))); + emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", + TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } } else { KIO::Job *job = KIO::get(url, true, false); - connect(job, SIGNAL(data(KIO::Job *, const QByteArray &)), - SLOT(slotData(KIO::Job *, const QByteArray &))); - connect(job, SIGNAL(result(KIO::Job *)), SLOT(slotResult(KIO::Job *))); + 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 *))); KIODownload download; download.url = url; @@ -100,7 +100,7 @@ void NewsIconMgr::getIcon(const KURL &url) } } -bool NewsIconMgr::isStdIcon(const QPixmap &pixmap) const +bool NewsIconMgr::isStdIcon(const TQPixmap &pixmap) const { if (!pixmap.isNull()) return pixmap.convertToImage() == m_stdIcon.convertToImage(); @@ -108,9 +108,9 @@ bool NewsIconMgr::isStdIcon(const QPixmap &pixmap) const return false; } -void NewsIconMgr::slotData(KIO::Job *job, const QByteArray &data) +void NewsIconMgr::slotData(KIO::Job *job, const TQByteArray &data) { - QBuffer buf(m_kioDownload[job].data); + TQBuffer buf(m_kioDownload[job].data); buf.open(IO_WriteOnly); buf.at(m_kioDownload[job].dataOffset); buf.writeBlock(data); @@ -119,41 +119,41 @@ void NewsIconMgr::slotData(KIO::Job *job, const QByteArray &data) void NewsIconMgr::slotResult(KIO::Job *job) { - emit gotIcon(m_kioDownload[job].url, QPixmap(m_kioDownload[job].data)); + emit gotIcon(m_kioDownload[job].url, TQPixmap(m_kioDownload[job].data)); m_kioDownload.remove(job); } -void NewsIconMgr::slotGotIcon(bool isHost, QString hostOrURL, QString iconName) +void NewsIconMgr::slotGotIcon(bool isHost, TQString hostOrURL, TQString iconName) { KURL url = KURL(hostOrURL); if (!isHost) - url.setProtocol(QString::fromLatin1("http")); + url.setProtocol(TQString::fromLatin1("http")); if (iconName.isNull()) emit gotIcon(url, m_stdIcon); else - emit gotIcon(url, QPixmap(KGlobal::dirs()->findResource("cache", - QString::fromLatin1("favicons/%1.png").arg(url.host())))); + emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", + TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } -QString NewsIconMgr::favicon(const KURL &url) const +TQString NewsIconMgr::favicon(const KURL &url) const { - QByteArray data, reply; - QCString replyType; - QDataStream ds(data, IO_WriteOnly); + TQByteArray data, reply; + TQCString replyType; + TQDataStream ds(data, IO_WriteOnly); ds << url; kapp->dcopClient()->call("kded", "favicons", "iconForURL(KURL)", data, replyType, reply); - if (replyType == "QString") { - QDataStream replyStream(reply, IO_ReadOnly); - QString result; + if (replyType == "TQString") { + TQDataStream replyStream(reply, IO_ReadOnly); + TQString result; replyStream >> result; return result; } - return QString::null; + return TQString::null; } #include "newsiconmgr.moc" diff --git a/knewsticker/common/newsiconmgr.h b/knewsticker/common/newsiconmgr.h index e4c6b657..30071155 100644 --- a/knewsticker/common/newsiconmgr.h +++ b/knewsticker/common/newsiconmgr.h @@ -11,8 +11,8 @@ #ifndef NEWSICONMGR_H #define NEWSICONMGR_H -#include -#include +#include +#include #include #include @@ -21,9 +21,9 @@ class DCOPClient; struct KIODownload; -typedef QMap KIODownloadMap; +typedef TQMap KIODownloadMap; -class NewsIconMgr : public QObject, public DCOPObject +class NewsIconMgr : public TQObject, public DCOPObject { Q_OBJECT K_DCOP @@ -32,26 +32,26 @@ class NewsIconMgr : public QObject, public DCOPObject static NewsIconMgr *self(); void getIcon(const KURL &); - bool isStdIcon(const QPixmap &) const; + bool isStdIcon(const TQPixmap &) const; k_dcop: - void slotGotIcon(bool, QString, QString); + void slotGotIcon(bool, TQString, TQString); signals: - void gotIcon(const KURL &, const QPixmap &); + void gotIcon(const KURL &, const TQPixmap &); protected: - NewsIconMgr(QObject * = 0L, const char * = 0L); + NewsIconMgr(TQObject * = 0L, const char * = 0L); ~NewsIconMgr(); private slots: - void slotData(KIO::Job *, const QByteArray &); + void slotData(KIO::Job *, const TQByteArray &); void slotResult(KIO::Job *); private: - QString favicon(const KURL &) const; + TQString favicon(const KURL &) const; - QPixmap m_stdIcon; + TQPixmap m_stdIcon; KIODownloadMap m_kioDownload; static NewsIconMgr *m_instance; diff --git a/knewsticker/common/xmlnewsaccess.cpp b/knewsticker/common/xmlnewsaccess.cpp index 1c892e8e..b8998e0c 100644 --- a/knewsticker/common/xmlnewsaccess.cpp +++ b/knewsticker/common/xmlnewsaccess.cpp @@ -14,11 +14,11 @@ #include #include -#include -#include -#include +#include +#include +#include -XMLNewsArticle::XMLNewsArticle(const QString &headline, const KURL &address) +XMLNewsArticle::XMLNewsArticle(const TQString &headline, const KURL &address) : m_headline(headline), m_address(address) { @@ -36,10 +36,10 @@ bool XMLNewsArticle::operator==(const XMLNewsArticle &a) return m_headline == a.headline() && m_address == a.address(); } -XMLNewsSource::XMLNewsSource() : QObject(), - m_name(QString::null), - m_link(QString::null), - m_description(QString::null), +XMLNewsSource::XMLNewsSource() : TQObject(), + m_name(TQString::null), + m_link(TQString::null), + m_description(TQString::null), m_downloadData(0) { } @@ -60,14 +60,14 @@ void XMLNewsSource::loadFrom(const KURL &url) m_downloadData->open(IO_WriteOnly); KIO::Job *job = KIO::get(url, false, false); - job->addMetaData(QString::fromLatin1("UserAgent"), - QString::fromLatin1("KNewsTicker v0.2")); - connect(job, SIGNAL(data(KIO::Job *, const QByteArray &)), - SLOT(slotData(KIO::Job *, const QByteArray &))); - connect(job, SIGNAL(result(KIO::Job *)), SLOT(slotResult(KIO::Job *))); + job->addMetaData(TQString::fromLatin1("UserAgent"), + TQString::fromLatin1("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 *))); } -void XMLNewsSource::slotData(KIO::Job *, const QByteArray &data) +void XMLNewsSource::slotData(KIO::Job *, const TQByteArray &data) { m_downloadData->writeBlock(data.data(), data.size()); } @@ -80,7 +80,7 @@ void XMLNewsSource::slotResult(KIO::Job *job) m_downloadData = 0; } -void XMLNewsSource::processData(const QByteArray &data, bool okSoFar) +void XMLNewsSource::processData(const TQByteArray &data, bool okSoFar) { bool validContent = okSoFar; kdDebug(5005) << "XMLNewsSource::processData(): validContent = " << validContent << endl; @@ -90,7 +90,7 @@ void XMLNewsSource::processData(const QByteArray &data, bool okSoFar) * Some servers prepend whitespace before the declaration. * Since QDom doesn't like that we strip this first. */ - QDomDocument domDoc; + TQDomDocument domDoc; const char *charData = data.data(); int len = data.count(); @@ -100,25 +100,25 @@ void XMLNewsSource::processData(const QByteArray &data, bool okSoFar) charData++; } - QByteArray tmpData; + TQByteArray tmpData; tmpData.setRawData(charData, len); if (validContent = domDoc.setContent(tmpData)) { - QDomNode channelNode = domDoc.documentElement().namedItem(QString::fromLatin1("channel")); + TQDomNode channelNode = domDoc.documentElement().namedItem(TQString::fromLatin1("channel")); - m_name = channelNode.namedItem(QString::fromLatin1("title")).toElement().text().simplifyWhiteSpace(); + m_name = channelNode.namedItem(TQString::fromLatin1("title")).toElement().text().simplifyWhiteSpace(); kdDebug(5005) << "XMLNewsSource::processData(): Successfully updated " << m_name << endl; - m_link = channelNode.namedItem(QString::fromLatin1("link")).toElement().text().simplifyWhiteSpace(); - m_description = channelNode.namedItem(QString::fromLatin1("description")).toElement().text().simplifyWhiteSpace(); + m_link = channelNode.namedItem(TQString::fromLatin1("link")).toElement().text().simplifyWhiteSpace(); + m_description = channelNode.namedItem(TQString::fromLatin1("description")).toElement().text().simplifyWhiteSpace(); - QDomNodeList items = domDoc.elementsByTagName(QString::fromLatin1("item")); + TQDomNodeList items = domDoc.elementsByTagName(TQString::fromLatin1("item")); m_articles.clear(); - QDomNode itemNode; - QString headline, address; + TQDomNode itemNode; + TQString headline, address; for (unsigned int i = 0; i < items.count(); i++) { itemNode = items.item(i); - headline = KCharsets::resolveEntities(itemNode.namedItem(QString::fromLatin1("title")).toElement().text().simplifyWhiteSpace()); - address = KCharsets::resolveEntities(itemNode.namedItem(QString::fromLatin1("link")).toElement().text().simplifyWhiteSpace()); + headline = KCharsets::resolveEntities(itemNode.namedItem(TQString::fromLatin1("title")).toElement().text().simplifyWhiteSpace()); + address = KCharsets::resolveEntities(itemNode.namedItem(TQString::fromLatin1("link")).toElement().text().simplifyWhiteSpace()); m_articles.append(XMLNewsArticle(headline, KURL( address ))); } } diff --git a/knewsticker/common/xmlnewsaccess.h b/knewsticker/common/xmlnewsaccess.h index 91cbf77f..46cbab59 100644 --- a/knewsticker/common/xmlnewsaccess.h +++ b/knewsticker/common/xmlnewsaccess.h @@ -15,8 +15,8 @@ #include #endif -#include -#include +#include +#include #include #include @@ -28,15 +28,15 @@ class XMLNewsSource; class XMLNewsArticle { public: - typedef QValueList List; + typedef TQValueList List; XMLNewsArticle() {} - XMLNewsArticle(const QString &headline, const KURL &addresss); + XMLNewsArticle(const TQString &headline, const KURL &addresss); XMLNewsArticle(const XMLNewsArticle &other) { (*this) = other; } XMLNewsArticle &operator=(const XMLNewsArticle &other); - QString headline() const { return m_headline; } - void setHeadline(const QString &headline) { m_headline = headline; } + TQString headline() const { return m_headline; } + void setHeadline(const TQString &headline) { m_headline = headline; } KURL address() const { return m_address; } void setAddress(const KURL &address) { m_address = address; } @@ -45,7 +45,7 @@ class XMLNewsArticle bool operator!= (const XMLNewsArticle &a) { return !operator==(a); } private: - QString m_headline; + TQString m_headline; KURL m_address; }; @@ -59,28 +59,28 @@ class XMLNewsSource : public QObject void loadFrom(const KURL &); - virtual QString newsSourceName() const { return m_name; } - virtual QString link() const { return m_link; } - virtual QString description() const { return m_description; } + virtual TQString newsSourceName() const { return m_name; } + virtual TQString link() const { return m_link; } + virtual TQString description() const { return m_description; } const XMLNewsArticle::List &articles() const { return m_articles; } signals: void loadComplete(XMLNewsSource *, bool); protected: - void processData(const QByteArray &, bool = true); + void processData(const TQByteArray &, bool = true); - QString m_name; - QString m_link; - QString m_description; + TQString m_name; + TQString m_link; + TQString m_description; private slots: - void slotData(KIO::Job *, const QByteArray &); + void slotData(KIO::Job *, const TQByteArray &); void slotResult(KIO::Job *); private: XMLNewsArticle::List m_articles; - QBuffer *m_downloadData; + TQBuffer *m_downloadData; }; #endif // XMLNEWSACCESS_H -- cgit v1.2.1