From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knewsticker/common/configaccess.cpp | 460 ++++++++++----------- knewsticker/common/configaccess.h | 8 +- knewsticker/common/newsengine.cpp | 12 +- knewsticker/common/newsengine.h | 11 +- knewsticker/common/newsiconmgr.cpp | 18 +- knewsticker/common/newsiconmgr.h | 1 + knewsticker/common/xmlnewsaccess.cpp | 26 +- knewsticker/common/xmlnewsaccess.h | 3 +- knewsticker/knewsticker.cpp | 100 ++--- knewsticker/knewsticker.h | 4 +- knewsticker/knewstickerconfig.cpp | 54 +-- knewsticker/knewstickerconfig.h | 7 +- knewsticker/knewstickerconfigwidget.ui | 108 ++--- knewsticker/knewstickerstub/knewstickerstub.cpp | 8 +- .../kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp | 18 +- .../kntsrcfilepropsdlg/kntsrcfilepropsdlg.h | 8 +- .../kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui | 22 +- knewsticker/newsscroller.cpp | 48 +-- knewsticker/newsscroller.h | 5 +- knewsticker/newssourcedlg.ui | 38 +- knewsticker/newssourcedlgimpl.cpp | 34 +- knewsticker/newssourcedlgimpl.h | 4 +- 22 files changed, 505 insertions(+), 492 deletions(-) (limited to 'knewsticker') 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 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 -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(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("

Program output:
%1
").arg(output); + output = TQString::tqfromLatin1("\"") + output + TQString::tqfromLatin1("\""); + errorMsg += i18n("

Program output:
%1
").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

Ptr; typedef TQValueList 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 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 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(); diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index 9b15f5da..545aba63 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -34,9 +34,9 @@ #include -KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget *parent, const char *name) +KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget *tqparent, const char *name) : ConfigIface(), DCOPObject("KNewsTicker"), - KPanelApplet(cfgFile, t, actions, parent, name), + KPanelApplet(cfgFile, t, actions, tqparent, name), m_instance(new KInstance("knewsticker")), m_dcopClient(new DCOPClient()), m_cfg(new ConfigAccess(config())), @@ -47,7 +47,7 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget I18N_NOOP("A news ticker applet."), KAboutData::License_BSD, I18N_NOOP("(c) 2000, 2001 The KNewsTicker developers"))) { - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); m_contextMenu = new KNewsTickerMenu(this); connect(m_contextMenu, TQT_SIGNAL(aboutToHide()), @@ -57,16 +57,16 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget m_arrowButton = new KArrowButton(this); TQToolTip::add(m_arrowButton, i18n("Show menu")); connect(m_arrowButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotArrowButtonPressed())); - m_arrowButton->setFocusPolicy(NoFocus); + m_arrowButton->setFocusPolicy(TQ_NoFocus); setupArrowButton(); - layout->addWidget(m_arrowButton); + tqlayout->addWidget(m_arrowButton); m_scroller = new NewsScroller(this, m_cfg); - layout->addWidget(m_scroller); + tqlayout->addWidget(m_scroller); m_dcopClient->registerAs("knewsticker", false); - TQToolTip::add(m_scroller, TQString::null); + TQToolTip::add(m_scroller, TQString()); connect(m_scroller, TQT_SIGNAL(contextMenu()), TQT_SLOT(slotOpenContextMenu())); connect(m_newsTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateNews())); @@ -95,12 +95,12 @@ KNewsTicker::~KNewsTicker() int KNewsTicker::heightForWidth(int) const { - return m_scroller->sizeHint().height() + m_arrowButton->height(); + return m_scroller->tqsizeHint().height() + m_arrowButton->height(); } int KNewsTicker::widthForHeight(int) const { - return m_scroller->sizeHint().width() + m_arrowButton->width(); + return m_scroller->tqsizeHint().width() + m_arrowButton->width(); } void KNewsTicker::preferences() @@ -119,7 +119,7 @@ void KNewsTicker::about() void KNewsTicker::help() { - kapp->invokeHelp(TQString::null, TQString::fromLatin1("knewsticker")); + kapp->invokeHelp(TQString(), TQString::tqfromLatin1("knewsticker")); } void KNewsTicker::reportBug() @@ -212,7 +212,7 @@ void KNewsTicker::slotNewsSourceUpdated(const NewsSourceBase::Ptr &ns, if (m_newNews) { KNotifyClient::Instance instance(m_instance); - KNotifyClient::event(winId(), TQString::fromLatin1("NewNews")); + KNotifyClient::event(winId(), TQString::tqfromLatin1("NewNews")); } } @@ -224,7 +224,7 @@ void KNewsTicker::slotNewsSourceFailed(const NewsSourceBase::Ptr &ns) void KNewsTicker::mousePressEvent(TQMouseEvent *e) { - if (e->button() == TQMouseEvent::RightButton) + if (e->button() == Qt::RightButton) slotOpenContextMenu(); } @@ -242,13 +242,13 @@ void KNewsTicker::slotArrowButtonPressed() if (position() == KPanelApplet::pTop) { pos.setY(pos.y() + size.height() + 2); } else if (position() == KPanelApplet::pBottom) { - const int y = pos.y() - m_contextMenu->sizeHint().height() - 2; - pos.setY(QMAX(0, y)); + const int y = pos.y() - m_contextMenu->tqsizeHint().height() - 2; + pos.setY(TQMAX(0, y)); } else if (position() == KPanelApplet::pLeft ) { pos.setX(pos.x() + size.width() + 2); } else { // position() == KPanelApplet::pRight - const int x = pos.x() - m_contextMenu->sizeHint().width() - 2; - pos.setX(QMAX(0, x)); + const int x = pos.x() - m_contextMenu->tqsizeHint().width() - 2; + pos.setX(TQMAX(0, x)); } m_contextMenu->setFullMenu(true); @@ -257,21 +257,21 @@ void KNewsTicker::slotArrowButtonPressed() void KNewsTicker::positionChange(Position) { - delete layout(); + delete tqlayout(); - TQBoxLayout *layout; + TQBoxLayout *tqlayout; - if (orientation() == Horizontal) - layout = new TQHBoxLayout(this); + if (orientation() ==Qt::Horizontal) + tqlayout = new TQHBoxLayout(this); else - layout = new TQVBoxLayout(this); + tqlayout = new TQVBoxLayout(this); if (m_arrowButton) { - layout->addWidget(m_arrowButton); + tqlayout->addWidget(m_arrowButton); setupArrowButton(); } - layout->addWidget(m_scroller); + tqlayout->addWidget(m_scroller); } void KNewsTicker::slotContextMenuAboutToHide() @@ -283,25 +283,25 @@ void KNewsTicker::slotContextMenuAboutToHide() void KNewsTicker::slotNotifyOfFailures() { KNotifyClient::Instance instance(m_instance); - TQString notification = TQString::null; + TQString notification = TQString(); if (m_failedNewsUpdates.count() == 1) notification = i18n("Could not update news site '%1'.
" "The supplied resource file is probably invalid or" - " broken.").arg(m_failedNewsUpdates.first()); + " broken.").tqarg(m_failedNewsUpdates.first()); else if (m_failedNewsUpdates.count() > 1 && m_failedNewsUpdates.count() < 8) { notification = i18n("The following news sites had problems. Their" " resource files are probably invalid or broken.
    "); TQStringList::ConstIterator it = m_failedNewsUpdates.begin(); TQStringList::ConstIterator end = m_failedNewsUpdates.end(); for (; it != end; ++it) - notification += TQString::fromLatin1("
  • %1
    • ").arg(*it); - notification += TQString::fromLatin1("
"); + notification += TQString::tqfromLatin1("
  • %1
    • ").tqarg(*it); + notification += TQString::tqfromLatin1(""); } else notification = i18n("Failed to update several news" " sites. The Internet connection might be cut."); - KNotifyClient::event(winId(), TQString::fromLatin1("InvalidRDF"), notification); + KNotifyClient::event(winId(), TQString::tqfromLatin1("InvalidRDF"), notification); } void KNewsTicker::setInterval(const uint interval) @@ -387,23 +387,23 @@ void KNewsTicker::setHighlightedColor(const TQColor &highlightedColor) void KNewsTicker::setupArrowButton() { - ArrowType at; + Qt::ArrowType at; - if (orientation() == Horizontal) { + if (orientation() ==Qt::Horizontal) { m_arrowButton->setFixedWidth(12); m_arrowButton->setMaximumHeight(128); - at = (position() == KPanelApplet::pTop ? DownArrow : UpArrow); + at = (position() == KPanelApplet::pTop ? Qt::DownArrow : Qt::UpArrow); } else { m_arrowButton->setMaximumWidth(128); m_arrowButton->setFixedHeight(12); - at = (position() == KPanelApplet::pLeft ? RightArrow : LeftArrow); + at = (position() == KPanelApplet::pLeft ? Qt::RightArrow : Qt::LeftArrow); } m_arrowButton->setArrowType(at); } -KNewsTickerMenu::KNewsTickerMenu(KNewsTicker *parent, const char *name) - : KPopupMenu(parent, name), - m_parent(parent), +KNewsTickerMenu::KNewsTickerMenu(KNewsTicker *tqparent, const char *name) + : KPopupMenu(tqparent, name), + m_parent(tqparent), m_fullMenu(false) { populateMenu(); @@ -417,10 +417,10 @@ void KNewsTickerMenu::populateMenu() * Perhaps this hardcoded stuff should be replaced by some kind of * themeing functionality? */ - const TQPixmap lookIcon = SmallIcon(TQString::fromLatin1("viewmag")); - const TQPixmap newArticleIcon = SmallIcon(TQString::fromLatin1("info")); - const TQPixmap oldArticleIcon = SmallIcon(TQString::fromLatin1("mime_empty")); - const TQPixmap noArticlesIcon = SmallIcon(TQString::fromLatin1("remove")); + const TQPixmap lookIcon = SmallIcon(TQString::tqfromLatin1("viewmag")); + const TQPixmap newArticleIcon = SmallIcon(TQString::tqfromLatin1("info")); + const TQPixmap oldArticleIcon = SmallIcon(TQString::tqfromLatin1("mime_empty")); + const TQPixmap noArticlesIcon = SmallIcon(TQString::tqfromLatin1("remove")); unsigned int articleIdx = 0; const NewsSourceBase::List sources = m_parent->m_newsSources; @@ -429,19 +429,19 @@ void KNewsTickerMenu::populateMenu() NewsSourceBase::Ptr ns = *nIt; KPopupMenu *submenu = new KPopupMenu; - int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), this, TQT_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000); - setItemParameter(checkNewsId, sources.findIndex(ns)); + int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), TQT_TQOBJECT(this), TQT_SLOT(slotCheckNews(int)), 0, sources.tqfindIndex(ns) + 1000); + setItemParameter(checkNewsId, sources.tqfindIndex(ns)); submenu->insertSeparator(); - if (m_parent->m_pendingNewsUpdates.contains(ns->newsSourceName())) { + if (m_parent->m_pendingNewsUpdates.tqcontains(ns->newsSourceName())) { submenu->insertItem(noArticlesIcon, i18n("Currently Being Updated, No Articles Available")); } else if (!ns->articles().isEmpty()) { const Article::List articles = ns->articles(); Article::List::ConstIterator artIt = articles.begin(); for (; artIt != articles.end(); ++artIt) { Article::Ptr a = *artIt; - TQString headline = a->headline().replace('&', "&&"); + TQString headline = a->headline().tqreplace('&', "&&"); int id; if ( a->read() ) id = submenu->insertItem(oldArticleIcon, headline, this, TQT_SLOT(slotOpenArticle(int)), 0, articleIdx+2000); @@ -454,7 +454,7 @@ void KNewsTickerMenu::populateMenu() submenu->insertItem(noArticlesIcon, i18n("No Articles Available")); } - insertItem(ns->icon(), ns->newsSourceName().replace('&', "&&"), submenu); + insertItem(ns->icon(), ns->newsSourceName().tqreplace('&', "&&"), submenu); } if (!m_parent->m_cfg->newsSources().isEmpty()) @@ -467,9 +467,9 @@ void KNewsTickerMenu::populateMenu() if (m_fullMenu) { insertSeparator(); - const TQPixmap logoIcon = SmallIcon(TQString::fromLatin1("knewsticker")); - const TQPixmap helpIcon = SmallIcon(TQString::fromLatin1("help")); - const TQPixmap confIcon = SmallIcon(TQString::fromLatin1("configure")); + const TQPixmap logoIcon = SmallIcon(TQString::tqfromLatin1("knewsticker")); + const TQPixmap helpIcon = SmallIcon(TQString::tqfromLatin1("help")); + const TQPixmap confIcon = SmallIcon(TQString::tqfromLatin1("configure")); insertTitle(logoIcon, i18n("KNewsTicker"), 0, 0); @@ -533,13 +533,13 @@ void KNewsTickerMenu::slotOpenArticle(int idx) extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString &configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString &configFile) { - KGlobal::locale()->insertCatalogue(TQString::fromLatin1("knewsticker")); + KGlobal::locale()->insertCatalogue(TQString::tqfromLatin1("knewsticker")); return new KNewsTicker(configFile, KPanelApplet::Stretch, KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help | KPanelApplet::ReportBug, - parent, "knewsticker"); + tqparent, "knewsticker"); } } diff --git a/knewsticker/knewsticker.h b/knewsticker/knewsticker.h index e5621da1..25863a9e 100644 --- a/knewsticker/knewsticker.h +++ b/knewsticker/knewsticker.h @@ -38,6 +38,7 @@ class KNewsTicker : public KPanelApplet, virtual public ConfigIface, virtual public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP friend class KNewsTickerMenu; @@ -115,13 +116,14 @@ class KNewsTicker : public KPanelApplet, virtual public ConfigIface, KNewsTickerMenu *m_contextMenu; bool m_newNews; NewsSourceBase::List m_newsSources; - QStringList m_failedNewsUpdates; + TQStringList m_failedNewsUpdates; TQStringList m_pendingNewsUpdates; }; class KNewsTickerMenu : public KPopupMenu { Q_OBJECT +// TQ_OBJECT public: KNewsTickerMenu(KNewsTicker *, const char * = 0); diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp index 4aa04851..9f868beb 100644 --- a/knewsticker/knewstickerconfig.cpp +++ b/knewsticker/knewstickerconfig.cpp @@ -33,8 +33,8 @@ #include #include -CategoryItem::CategoryItem(TQListView *parent, const TQString &text) - : TQListViewItem(parent, text) +CategoryItem::CategoryItem(TQListView *tqparent, const TQString &text) + : TQListViewItem(tqparent, text) { setOpen(true); } @@ -42,17 +42,17 @@ CategoryItem::CategoryItem(TQListView *parent, const TQString &text) void CategoryItem::setOpen(bool open) { if (open) - setPixmap(0, SmallIcon(TQString::fromLatin1("folder_open"))); + setPixmap(0, SmallIcon(TQString::tqfromLatin1("folder_open"))); else - setPixmap(0, SmallIcon(TQString::fromLatin1("folder"))); + setPixmap(0, SmallIcon(TQString::tqfromLatin1("folder"))); TQListViewItem::setOpen(open); } -NewsSourceItem::NewsSourceItem(KNewsTickerConfig *kcm, CategoryItem *parent, +NewsSourceItem::NewsSourceItem(KNewsTickerConfig *kcm, CategoryItem *tqparent, const NewsSourceBase::Data &nsd) - : TQCheckListItem(parent, TQString::null, TQCheckListItem::CheckBox), - m_parent(parent), + : TQCheckListItem(tqparent, TQString(), TQCheckListItem::CheckBox), + m_parent(tqparent), m_kcm(kcm) { setData(nsd); @@ -89,15 +89,15 @@ void NewsSourceItem::setIcon(const TQPixmap &pixmap) setPixmap(0, pixmap); } -KNewsTickerConfig::KNewsTickerConfig(ConfigAccess *cfg, TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, i18n("Configuration"), Ok|Close), +KNewsTickerConfig::KNewsTickerConfig(ConfigAccess *cfg, TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, i18n("Configuration"), Ok|Close), m_cfg(cfg), m_child(new KNewsTickerConfigWidget(this)), m_newsIconMgr(NewsIconMgr::self()) { setMainWidget(m_child); - // Change various properties of the view which the Qt Designer cannot + // Change various properties of the view which the TQt Designer cannot // set at design time yet. m_child->niInterval->setLabel(i18n("News query interval:")); m_child->niInterval->setRange(4, 180); @@ -234,7 +234,7 @@ bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e) if ( TQTextDrag::decode(d, newSourceUrl) ) { // // This is just for http://www.webreference.com/services/news/ - newSourceUrl = newSourceUrl.replace( TQRegExp("^view-source:http%3A//"), "http://" ); + newSourceUrl = newSourceUrl.tqreplace( TQRegExp("^view-source:http%3A//"), "http://" ); // newSourceUrl = newSourceUrl.stripWhiteSpace(); @@ -251,7 +251,7 @@ bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e) } int i = 0; while (validName == false) { - name = i18n("Unknown %1").arg(i); + name = i18n("Unknown %1").tqarg(i); for (TQListViewItemIterator it(m_child->lvNewsSources); it.current(); it++) { if (it.current()->text(0) == name) { i++; @@ -320,7 +320,7 @@ void KNewsTickerConfig::removeNewsSource() " source?

    ", "

    Do you really want to remove these %n news" " sources?

    ", - m_child->lvNewsSources->selectedItems().count()), TQString::null, KStdGuiItem::del()) == KMessageBox::Continue) { + m_child->lvNewsSources->selectedItems().count()), TQString(), KStdGuiItem::del()) == KMessageBox::Continue) { int itemCount = m_child->lvNewsSources->selectedItems().count(); for (int j = 0; j < itemCount; j++) { if (m_child->lvNewsSources->selectedItems().isEmpty()) { break; } @@ -330,8 +330,8 @@ void KNewsTickerConfig::removeNewsSource() m_child->comboFilterNewsSource->removeItem(i); break; } - if (dynamic_cast(item) && item->parent()->childCount() == 1) - delete item->parent(); + if (dynamic_cast(item) && item->tqparent()->childCount() == 1) + delete item->tqparent(); else delete item; } @@ -343,7 +343,7 @@ void KNewsTickerConfig::removeNewsSource() void KNewsTickerConfig::removeFilter(TQListViewItem *item) { if (KMessageBox::warningContinueCancel(this, i18n("

    Do you really want to remove the selected" - " filter?

    "), TQString::null, KStdGuiItem::del()) == KMessageBox::Continue) { + " filter?

    "), TQString(), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; m_child->bRemoveFilter->setEnabled(false); } @@ -356,17 +356,17 @@ void KNewsTickerConfig::slotNewsSourceContextMenu(KListView *, TQListViewItem *i KPopupMenu *menu = new KPopupMenu(); - TQPixmap addIcon = SmallIcon(TQString::fromLatin1("news_subscribe")); - TQPixmap modifyIcon = SmallIcon(TQString::fromLatin1("edit")); - TQPixmap removeIcon = SmallIcon(TQString::fromLatin1("news_unsubscribe")); - TQPixmap logoIcon = SmallIcon(TQString::fromLatin1("knewsticker")); + TQPixmap addIcon = SmallIcon(TQString::tqfromLatin1("news_subscribe")); + TQPixmap modifyIcon = SmallIcon(TQString::tqfromLatin1("edit")); + TQPixmap removeIcon = SmallIcon(TQString::tqfromLatin1("news_unsubscribe")); + TQPixmap logoIcon = SmallIcon(TQString::tqfromLatin1("knewsticker")); menu->insertTitle(logoIcon, i18n("Edit News Source")); menu->insertItem(addIcon, i18n("&Add News Source"), 0); if (item) { - menu->insertItem(modifyIcon, i18n("&Modify '%1'").arg(item->text(0)), 1); + menu->insertItem(modifyIcon, i18n("&Modify '%1'").tqarg(item->text(0)), 1); if (m_child->lvNewsSources->selectedItems().count() == 1) { - menu->insertItem(removeIcon, i18n("&Remove '%1'").arg(item->text(0)), 2); + menu->insertItem(removeIcon, i18n("&Remove '%1'").tqarg(item->text(0)), 2); } else { menu->insertItem(removeIcon, i18n("&Remove News Sources"), 2); } @@ -421,10 +421,10 @@ void KNewsTickerConfig::slotModifyNewsSource() void KNewsTickerConfig::slotModifyNewsSource(const NewsSourceBase::Data &nsd) { if (m_modifyItem->data().subject != nsd.subject) { - TQListViewItem *parentItem = m_modifyItem->parentItem(); - parentItem->takeItem(m_modifyItem); - if (parentItem->childCount() == 0) - delete parentItem; + TQListViewItem *tqparentItem = m_modifyItem->tqparentItem(); + tqparentItem->takeItem(m_modifyItem); + if (tqparentItem->childCount() == 0) + delete tqparentItem; CategoryItem *catItem = 0L; @@ -565,7 +565,7 @@ void KNewsTickerConfig::getNewsIcon(NewsSourceItem *item, const KURL &url) void KNewsTickerConfig::slotGotNewsIcon(const KURL &url, const TQPixmap &pixmap) { - if (m_itemIconMap.find(url.url()) == m_itemIconMap.end()) { + if (m_itemIconMap.tqfind(url.url()) == m_itemIconMap.end()) { kdDebug(5005) << "Got unknown icon for URL " << url << endl; return; } diff --git a/knewsticker/knewstickerconfig.h b/knewsticker/knewstickerconfig.h index 1280413d..79b268d2 100644 --- a/knewsticker/knewstickerconfig.h +++ b/knewsticker/knewstickerconfig.h @@ -27,7 +27,7 @@ class KConfig; class NewsIconMgr; class ConfigAccess; -class CategoryItem : public QListViewItem +class CategoryItem : public TQListViewItem { public: CategoryItem(TQListView *, const TQString &); @@ -35,7 +35,7 @@ class CategoryItem : public QListViewItem void setOpen(bool); }; -class NewsSourceItem : public QCheckListItem +class NewsSourceItem : public TQCheckListItem { public: NewsSourceItem(KNewsTickerConfig *, CategoryItem *, const NewsSourceBase::Data &); @@ -44,7 +44,7 @@ class NewsSourceItem : public QCheckListItem void setData(const NewsSourceBase::Data &); void setIcon(const TQPixmap &); - TQListViewItem *parentItem() { return TQCheckListItem::parent(); } + TQListViewItem *tqparentItem() { return TQCheckListItem::tqparent(); } private: TQString m_icon; @@ -57,6 +57,7 @@ class NewsSourceItem : public QCheckListItem class KNewsTickerConfig : public KDialogBase { Q_OBJECT + TQ_OBJECT friend class NewsSourceItem; public: KNewsTickerConfig(ConfigAccess *, TQWidget * = 0, const char * = 0); diff --git a/knewsticker/knewstickerconfigwidget.ui b/knewsticker/knewstickerconfigwidget.ui index 3afa390d..af476a68 100644 --- a/knewsticker/knewstickerconfigwidget.ui +++ b/knewsticker/knewstickerconfigwidget.ui @@ -2,7 +2,7 @@ KNewsTickerConfigWidget The core widget of the KCMNewsTicker KControl module. Frerich Raabe <raabe@kde.org> - + KNewsTickerConfigWidget @@ -22,9 +22,9 @@ 0 - + - + @@ -36,15 +36,15 @@ 4 - + tabScrollerPreferences - + - + - + tabGeneral @@ -61,16 +61,16 @@ 4 - + gbGeneral General - + - + @@ -108,7 +108,7 @@ The default value (30 minutes) should be appropriate and reasonable in most cases. - + Layout5 @@ -122,7 +122,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case 6 - + lNonSensitive @@ -136,7 +136,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case This slider allows you to define how quickly/slowly the text should be scrolled when using the mousewheel. - + sliderMouseWheelSpeed @@ -159,7 +159,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case This slider allows you to define how fast/slow the text should be scrolled when using the mousewheel. - + lSensitive @@ -175,7 +175,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case - + lMouseWheelSensitivity @@ -192,7 +192,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case This slider allows you to define how fast/slow the text should be scrolled when using the mousewheel. - + cbCustomNames @@ -218,7 +218,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case Expanding - + 20 20 @@ -227,7 +227,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case - + tabNewsSources @@ -298,7 +298,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case Note that you can also right-click on the list to open a menu which lets you add and remove news sources. You can also enable or disable certain news sources temporarily by checking or unchecking the box next to it; those news sources whose boxes are checked are considered activated and will be processed by KNewsTicker. - + bRemoveNewsSource @@ -325,14 +325,14 @@ Note that you can also right-click on the list to open a menu which lets you add Expanding - + 20 20 - + bAddNewsSource @@ -346,7 +346,7 @@ Note that you can also right-click on the list to open a menu which lets you add Click this button to add a new site to the list. Note that you can also drag a RDF or RSS file to this list (i.e. from Konqueror) to add it to the list. - + bModifyNewsSource @@ -365,7 +365,7 @@ Note that you can also right-click on the list to open a menu which lets you add - + tabFilters @@ -480,14 +480,14 @@ Note that the filters are processed from the top to the bottom so that of two fi Expanding - + 20 20 - + bRemoveFilter @@ -504,7 +504,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Press this button to remove the selected filter from the list. - + bAddFilter @@ -518,7 +518,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Press this button to add the configured filter to the list. - + gbFilterProperties @@ -566,14 +566,14 @@ Note that the filters are processed from the top to the bottom so that of two fi Fixed - + 20 20 - + lArticles @@ -597,7 +597,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Here you can specify which news sources (or all of them) are affected. Note that only the news sources which have been activated on the <i>News sources</i> tab are shown in this combo box. - + lwhose @@ -629,14 +629,14 @@ Note that the filters are processed from the top to the bottom so that of two fi Expanding - + 20 20 - + lHeadlines @@ -689,7 +689,7 @@ Note that the filters are processed from the top to the bottom so that of two fi - + tabScrollerPreferences @@ -706,7 +706,7 @@ Note that the filters are processed from the top to the bottom so that of two fi 4 - + gbScrollerBehaviour @@ -723,7 +723,7 @@ Note that the filters are processed from the top to the bottom so that of two fi 6 - + Layout5 @@ -737,7 +737,7 @@ Note that the filters are processed from the top to the bottom so that of two fi 6 - + lScrollingSpeed @@ -754,7 +754,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Here you can define how fast the text should be scrolling. If you only have a little space on your taskbar (and therefore a rather small news ticker), you should probably set this to a slower speed so that you have a chance to read the headlines. For wider news tickers (and better eyes), faster scrolling is probably appropriate so that you do not have to wait too long for the next headline. - + Layout6_2 @@ -768,7 +768,7 @@ Note that the filters are processed from the top to the bottom so that of two fi 6 - + lSlow @@ -782,7 +782,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Here you can define how fast the text should be scrolling. If you only have a little space on your taskbar (and therefore a rather small news ticker), you should probably set this to a slower speed so that you have a chance to read the headlines. For wider news tickers (and better eyes), faster scrolling is probably appropriate so that you do not have to wait too long for the next headline. - + sliderScrollSpeed @@ -805,7 +805,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Here you can define how fast the text should be scrolling. If you only have a little space on your taskbar (and therefore a rather small news ticker), you should probably set this to a slower speed so that you have a chance to read the headlines. For wider news tickers (and better eyes), faster scrolling is probably appropriate so that you do not have to wait too long for the next headline. - + lFast @@ -823,7 +823,7 @@ Note that the filters are processed from the top to the bottom so that of two fi - + lDirectionOfScrolling_2 @@ -883,7 +883,7 @@ Note that the filters are processed from the top to the bottom so that of two fi - + gbScrollerAppearance @@ -903,7 +903,7 @@ Note that the filters are processed from the top to the bottom so that of two fi 6 - + lHighlightedColor_2 @@ -934,7 +934,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Click this button to open a convenient color-selection dialog which lets you choose the color of the headlines when they are highlighted (when you move the mouse over them). - + lBackgroundColor_2 @@ -965,7 +965,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Click this button to open a convenient color-selection dialog which lets you choose the background color of the scrolling text. - + lForegroundColor_2 @@ -996,7 +996,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Click this button to open a convenient color-selection dialog which lets you choose the color of the scrolling text. - + lFont_2 @@ -1013,7 +1013,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Click on the button at the right labeled <i>Choose Font...</i> to choose the font which will be used for the scrolling text. Please note that certain fonts are harder to read than others, especially when they are used as scrolling text. You should probably choose a font which can be easily read while it is moving. - + bChooseFont @@ -1029,7 +1029,7 @@ Note that the filters are processed from the top to the bottom so that of two fi - + gbMiscScrollingOptions @@ -1046,7 +1046,7 @@ Note that the filters are processed from the top to the bottom so that of two fi 6 - + cbScrollMostRecentOnly @@ -1060,7 +1060,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Check this button to show only the most recent headline for each news site. - + cbShowIcons @@ -1074,7 +1074,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Click this button to make KNewsTicker show the icons of the news site to which each headline belongs. This makes associating a headline to a news site very easy but takes up some space in the text. - + cbSlowedScrolling @@ -1088,7 +1088,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Check this box to make KNewsTicker slow the scrolling down when you move the mouse cursor over the scrolling text. This makes clicking on items and dragging the icons (if enabled) away a lot easier. - + cbUnderlineHighlighted @@ -1114,7 +1114,7 @@ Note that the filters are processed from the top to the bottom so that of two fi Expanding - + 20 20 @@ -1160,7 +1160,7 @@ Note that the filters are processed from the top to the bottom so that of two fi klistview.h knuminput.h - + knuminput.h knuminput.h diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp index ac4ddeeb..d291b12e 100644 --- a/knewsticker/knewstickerstub/knewstickerstub.cpp +++ b/knewsticker/knewstickerstub/knewstickerstub.cpp @@ -49,7 +49,7 @@ int main(int argc, char **argv) DCOPClient *dcopClient = app.dcopClient(); dcopClient->attach(); - KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false); + KConfig cfg(TQString::tqfromLatin1("knewsticker_panelappletrc"), false, false); ConfigAccess configFrontend(&cfg); if (args->isSet("addrdf")) { @@ -57,10 +57,10 @@ int main(int argc, char **argv) // TODO: Use the "Suggest" functionality from addnewssourcedlgimpl.cpp here. TQString name = i18n("Unknown"); - if (newsSources.contains(name)) + if (newsSources.tqcontains(name)) for (unsigned int i = 0; ; i++) - if (!newsSources.contains(i18n("Unknown %1").arg(i))) { - name = i18n("Unknown %1").arg(i); + if (!newsSources.tqcontains(i18n("Unknown %1").tqarg(i))) { + name = i18n("Unknown %1").tqarg(i); break; } diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp index 14ca80d0..6401a13e 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp @@ -30,7 +30,7 @@ using namespace RSS; -class ArticleListBoxItem : public QListBoxText +class ArticleListBoxItem : public TQListBoxText { public: ArticleListBoxItem( TQListBox *listbox, const Article &article ); @@ -58,8 +58,8 @@ KntSrcFilePropsDlg::KntSrcFilePropsDlg(KPropertiesDialog *props) TQT_SLOT(slotClickedArticle(TQListBoxItem *))); Loader *loader = Loader::create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - TQT_SLOT(slotConstructUI(Loader *, Document, Status))); + connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), + TQT_SLOT(slotConstructUI(Loader *, Document, tqStatus))); loader->loadFrom(props->item()->url(), new FileRetriever); connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), @@ -68,13 +68,13 @@ KntSrcFilePropsDlg::KntSrcFilePropsDlg(KPropertiesDialog *props) m_child->show(); } -void KntSrcFilePropsDlg::slotConstructUI(Loader *, Document doc, Status status) +void KntSrcFilePropsDlg::slotConstructUI(Loader *, Document doc, tqStatus status) { if (status != RSS::Success) return; KURL iconURL = doc.link(); - iconURL.setEncodedPathAndQuery(TQString::fromLatin1("/favicon.ico")); + iconURL.setEncodedPathAndQuery(TQString::tqfromLatin1("/favicon.ico")); NewsIconMgr::self()->getIcon(iconURL); m_child->urlName->setText(doc.title()); @@ -104,15 +104,15 @@ void KntSrcFilePropsDlg::slotClickedArticle(TQListBoxItem *item) slotOpenURL(articleItem->article().link().url()); } -TQObject *KntSrcFilePropsFactory::createObject(TQObject *parent, const char *, +TQObject *KntSrcFilePropsFactory::createObject(TQObject *tqparent, const char *, const char *classname, const TQStringList &) { - if (TQString::fromLatin1(classname) == "KPropsDlgPlugin") + if (TQString::tqfromLatin1(classname) == "KPropsDlgPlugin") { - if (!parent->inherits("KPropertiesDialog")) + if (!tqparent->inherits("KPropertiesDialog")) return 0L; - TQObject *obj = new KntSrcFilePropsDlg(static_cast(parent)); + TQObject *obj = new KntSrcFilePropsDlg(static_cast(TQT_TQWIDGET(tqparent))); return obj; } return 0L; diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h index 0b1a0022..8a06a7b4 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h @@ -26,27 +26,29 @@ namespace RSS { using RSS::Loader; using RSS::Document; -using RSS::Status; +using RSS::tqStatus; class KntSrcFilePropsFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: virtual TQObject *createObject(TQObject * = 0, const char * = 0, - const char * = "TQObject", const TQStringList & = TQStringList()); + const char * = TQOBJECT_OBJECT_NAME_STRING, const TQStringList & = TQStringList()); }; class KntSrcFilePropsDlg : public KPropsDlgPlugin { Q_OBJECT + TQ_OBJECT public: KntSrcFilePropsDlg(KPropertiesDialog *); protected slots: void slotOpenURL(const TQString &); - void slotConstructUI(Loader *loader, Document doc, Status status); + void slotConstructUI(Loader *loader, Document doc, tqStatus status); void slotGotIcon(const KURL &, const TQPixmap &); void slotClickedArticle(TQListBoxItem *); diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui index b8d1827e..c5e265f6 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui @@ -2,7 +2,7 @@ KntSrcFilePropsDlgWidget The widget to be used for the RDF/RSS file properties dialog plugin. Frerich Raabe <raabe@kde.org> - + KntSrcFilePropsDlgWidget @@ -14,9 +14,9 @@ 274 - + - + @@ -38,14 +38,14 @@ Expanding - + 20 20 - + pixmapIcon @@ -78,7 +78,7 @@ http://www.heise.de/newsticker/ - + lDescription @@ -92,7 +92,7 @@ Here you can see a brief description about the news site and its contents. - + lName @@ -109,7 +109,7 @@ This is the name of the news site. - + mleDescription @@ -144,7 +144,7 @@ Maximum - + 20 63 @@ -159,7 +159,7 @@ 5 - + lArticles @@ -206,7 +206,7 @@ kurllabel.h kseparator.h - + kurllabel.h kseparator.h diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index 060b7cd9..76d81050 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -55,7 +55,7 @@ public: int w, h; if (m_scroller->m_cfg->showIcons()) { w = m_article->newsSource()->icon().width() + 4 + metrics.width(m_article->headline()); - h = QMAX(metrics.height(), m_article->newsSource()->icon().height()); + h = TQMAX(metrics.height(), m_article->newsSource()->icon().height()); } else { w = metrics.width(m_article->headline()); h = metrics.height(); @@ -128,8 +128,8 @@ private: TQPixmap *m_highlighted; }; -NewsScroller::NewsScroller(TQWidget *parent, ConfigAccess *cfg, const char *name) - : TQFrame(parent, name, WNoAutoErase), +NewsScroller::NewsScroller(TQWidget *tqparent, ConfigAccess *cfg, const char *name) + : TQFrame(tqparent, name, WNoAutoErase), m_cfg(cfg), m_scrollTimer(new TQTimer(this)), m_activeHeadline(0), @@ -150,9 +150,9 @@ NewsScroller::NewsScroller(TQWidget *parent, ConfigAccess *cfg, const char *name reset(); } -TQSize NewsScroller::sizeHint() const +TQSize NewsScroller::tqsizeHint() const { - return TQSize(fontMetrics().width(TQString::fromLatin1("X")) * 20, fontMetrics().height() * 2); + return TQSize(fontMetrics().width(TQString::tqfromLatin1("X")) * 20, fontMetrics().height() * 2); } TQSizePolicy NewsScroller::sizePolicy() const @@ -177,23 +177,23 @@ void NewsScroller::dropEvent(TQDropEvent* event) if ( TQTextDrag::decode(event, newSourceUrl) ) { // // This is just for http://www.webreference.com/services/news/ - newSourceUrl = newSourceUrl.replace(TQRegExp( - TQString::fromLatin1("^view-source:http%3A//")), - TQString::fromLatin1("http://")); + newSourceUrl = newSourceUrl.tqreplace(TQRegExp( + TQString::tqfromLatin1("^view-source:http%3A//")), + TQString::tqfromLatin1("http://")); // newSourceUrl = newSourceUrl.stripWhiteSpace(); if (!isHeadline(newSourceUrl) && KMessageBox::questionYesNo(this, i18n("

    Do you really want to add '%1' to" " the list of news sources?

    ") - .arg(newSourceUrl), TQString::null, i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) { - KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false); + .tqarg(newSourceUrl), TQString(), i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) { + KConfig cfg(TQString::tqfromLatin1("knewsticker_panelappletrc"), false, false); ConfigAccess configFrontend(&cfg); TQStringList newsSources = configFrontend.newsSources(); TQString name = i18n("Unknown"); - if (newsSources.contains(name)) + if (newsSources.tqcontains(name)) for (unsigned int i = 0; ; i++) - if (!newsSources.contains(i18n("Unknown %1").arg(i))) { - name = i18n("Unknown %1").arg(i); + if (!newsSources.tqcontains(i18n("Unknown %1").tqarg(i))) { + name = i18n("Unknown %1").tqarg(i); break; } @@ -256,7 +256,7 @@ void NewsScroller::scroll(int distance, bool interpret_directions) TQPoint pt = mapFromGlobal(TQCursor::pos()); - if (contentsRect().contains(pt)) + if (contentsRect().tqcontains(pt)) updateActive(pt); update(); @@ -270,7 +270,7 @@ void NewsScroller::enterEvent(TQEvent *) void NewsScroller::mousePressEvent(TQMouseEvent *e) { - if (e->button() == TQMouseEvent::LeftButton || e->button() == TQMouseEvent::MidButton) { + if (e->button() == Qt::LeftButton || e->button() == Qt::MidButton) { m_dragPos = e->pos(); if (m_activeHeadline) @@ -280,14 +280,14 @@ void NewsScroller::mousePressEvent(TQMouseEvent *e) void NewsScroller::mouseReleaseEvent(TQMouseEvent *e) { - if ((e->button() == TQMouseEvent::LeftButton || e->button() == TQMouseEvent::MidButton) + if ((e->button() == Qt::LeftButton || e->button() == Qt::MidButton) && m_activeHeadline && m_activeHeadline->article()->headline() == m_tempHeadline && !m_mouseDrag) { m_activeHeadline->article()->open(); - m_tempHeadline = TQString::null; + m_tempHeadline = TQString(); } - if (e->button() == TQMouseEvent::RightButton) + if (e->button() == Qt::RightButton) emit(contextMenu()); if (m_mouseDrag) { @@ -304,10 +304,10 @@ void NewsScroller::mouseMoveEvent(TQMouseEvent *e) // If not, check whether we need to start a drag. int dragDistance = 0; if (m_cfg->horizontalScrolling()) - dragDistance = QABS(e->x() - m_dragPos.x()); + dragDistance = TQABS(e->x() - m_dragPos.x()); else - dragDistance = QABS(e->y() - m_dragPos.y()); - m_mouseDrag = (e->state() & TQMouseEvent::LeftButton != 0) && + dragDistance = TQABS(e->y() - m_dragPos.y()); + m_mouseDrag = (e->state() & Qt::LeftButton != 0) && dragDistance >= KGlobal::config()->readNumEntry("StartDragDist", KApplication::startDragDistance()); if (m_mouseDrag) // Stop the scroller if we just started a drag. m_scrollTimer->stop(); @@ -344,7 +344,7 @@ void NewsScroller::wheelEvent(TQWheelEvent *e) { // ### This 11 - m_cfg->mouseWheelSpeed() could be eliminated by swapping // the labels of the TQSlider. :] - int distance = qRound(QABS(e->delta()) / (11 - m_cfg->mouseWheelSpeed())); + int distance = tqRound(TQABS(e->delta()) / (11 - m_cfg->mouseWheelSpeed())); int direction = e->delta() > 0 ? -1 : 1; for (int i = 0; i < distance; i++) @@ -440,7 +440,7 @@ void NewsScroller::reset(bool bSeparatorOnly) if (m_cfg->scrollingSpeed()) m_scrollTimer->start(speedAsInterval(m_cfg->scrollingSpeed())); - TQString sep = m_headlines.isEmpty() ? i18n(" +++ No News Available +++") : TQString::fromLatin1(" +++ "); + TQString sep = m_headlines.isEmpty() ? i18n(" +++ No News Available +++") : TQString::tqfromLatin1(" +++ "); int w = fontMetrics().width(sep); int h = fontMetrics().height(); @@ -548,7 +548,7 @@ bool NewsScroller::updateActive(const TQPoint &pt) rect.setWidth(width()); } - if (rect.contains(pt)) + if (rect.tqcontains(pt)) break; } if (*it) diff --git a/knewsticker/newsscroller.h b/knewsticker/newsscroller.h index b66e4a08..b05d9d2e 100644 --- a/knewsticker/newsscroller.h +++ b/knewsticker/newsscroller.h @@ -28,14 +28,15 @@ class Headline; template class TQPtrList; typedef TQPtrList HeadlineList; -class NewsScroller : public QFrame +class NewsScroller : public TQFrame { Q_OBJECT + TQ_OBJECT public: NewsScroller(TQWidget *, ConfigAccess *, const char * = 0); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual TQSizePolicy sizePolicy() const; // Convenience stuff. Somehow ugly, no? diff --git a/knewsticker/newssourcedlg.ui b/knewsticker/newssourcedlg.ui index bc2690b2..29df9791 100644 --- a/knewsticker/newssourcedlg.ui +++ b/knewsticker/newssourcedlg.ui @@ -2,7 +2,7 @@ NewsSourceDlg The dialog to be used to edit another news source. Frerich Raabe <raabe@kde.org> - + NewsSourceDlg @@ -28,9 +28,9 @@ image0 - + - + @@ -42,16 +42,16 @@ 4 - + gbNewsSourceProperties News Source Properties - + - + @@ -63,7 +63,7 @@ 6 - + lName @@ -91,7 +91,7 @@ Here you can enter the name of the news source.<br>Note that you can also use the button at the bottom right labeled <i>Suggest</i> to let KNewsTicker fill this field automatically, after you have entered a source file below. - + lSourceFile @@ -108,7 +108,7 @@ Enter the path to the source file for the news source you want to add here. If you specified a source file here, you can use the button at the bottom right labeled <i>Suggest</i> to let KNewsTicker fill in the remaining values automatically. - + lIcon @@ -136,7 +136,7 @@ Here you can specify the path to an icon to be used for this news source. Icons make it easier to distinguish between multiple news sources as the headlines scroll by.<br>Note that you can also use the button at the bottom right labeled <i>Suggest</i> to let KNewsTicker fill this field automatically, after you have entered a source file above. - + pixmapIcon @@ -161,7 +161,7 @@ This is what the currently configured icon for this news source looks like. To change this icon, use the input field at the left. - + lCategory @@ -200,7 +200,7 @@ Expanding - + lMaxArticles @@ -234,7 +234,7 @@ This option lets you define how many articles KNewsTicker should cache for this news source. This value will never be exceeded.<br>Note that you can also use the button at the bottom right labeled <i>Suggest</i> to let KNewsTicker fill this field automatically, after you have entered a source file above. - + cbProgram @@ -261,7 +261,7 @@ - + bCancel @@ -275,7 +275,7 @@ Press this button to close this dialog, discarding all entered information. - + bSuggest @@ -292,7 +292,7 @@ Press this button to make KNewsTicker guess more or less reasonable values for some of the news properties (such as the name, icon or maximum number of articles).<br>Note that you have to supply a source file in order to use this function. - + bOk @@ -397,12 +397,12 @@ klineedit.h knuminput.h - + slotOkClicked() slotCancelClicked() slotModified() slotSourceFileChanged() slotSuggestClicked() - - + + diff --git a/knewsticker/newssourcedlgimpl.cpp b/knewsticker/newssourcedlgimpl.cpp index 03704155..3c8df5e9 100644 --- a/knewsticker/newssourcedlgimpl.cpp +++ b/knewsticker/newssourcedlgimpl.cpp @@ -25,8 +25,8 @@ #include #include -SuggestProgressDlg::SuggestProgressDlg(const KURL &url, TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, i18n("Downloading Data"), Cancel, Cancel), +SuggestProgressDlg::SuggestProgressDlg(const KURL &url, TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, i18n("Downloading Data"), Cancel, Cancel), m_gotSourceFile(false), m_gotIcon(false) { @@ -54,9 +54,9 @@ SuggestProgressDlg::SuggestProgressDlg(const KURL &url, TQWidget *parent, const this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); KURL u = url; if (url.isLocalFile()) - u = TQString::null; + u = TQString(); else - u.setEncodedPathAndQuery(TQString::fromLatin1("/favicon.ico")); + u.setEncodedPathAndQuery(TQString::tqfromLatin1("/favicon.ico")); NewsIconMgr::self()->getIcon(u); } @@ -95,8 +95,8 @@ void SuggestProgressDlg::slotGotIcon(const KURL &url, const TQPixmap &pixmap) done(m_succeeded ? TQDialog::Accepted : TQDialog::Rejected); } -NewsSourceDlgImpl::NewsSourceDlgImpl(TQWidget *parent, const char *name, bool modal, WFlags fl) - : NewsSourceDlg(parent, name, modal, fl), +NewsSourceDlgImpl::NewsSourceDlgImpl(TQWidget *tqparent, const char *name, bool modal, WFlags fl) + : NewsSourceDlg(tqparent, name, modal, fl), m_modified(false) { connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), @@ -138,12 +138,12 @@ void NewsSourceDlgImpl::slotOkClicked() KURL iconURL ( leIcon->text() ); if (iconURL.protocol().isEmpty()) - if (iconURL.host().startsWith(TQString::fromLatin1("ftp."))) - iconURL.setProtocol(TQString::fromLatin1("ftp")); - else if (iconURL.host().startsWith(TQString::fromLatin1("www."))) - iconURL.setProtocol(TQString::fromLatin1("http")); + if (iconURL.host().startsWith(TQString::tqfromLatin1("ftp."))) + iconURL.setProtocol(TQString::tqfromLatin1("ftp")); + else if (iconURL.host().startsWith(TQString::tqfromLatin1("www."))) + iconURL.setProtocol(TQString::tqfromLatin1("http")); else - iconURL.setProtocol(TQString::fromLatin1("file")); + iconURL.setProtocol(TQString::tqfromLatin1("file")); NewsSourceBase::Data nsd(leName->text(), url.url(), iconURL.url(), subject, sbMaxArticles->value(), true, cbProgram->isChecked()); @@ -191,8 +191,8 @@ void NewsSourceDlgImpl::setup(const NewsSourceBase::Data &nsd, bool modify) comboCategory->setCurrentItem(nsd.subject); sbMaxArticles->setValue(nsd.maxArticles); KURL iconURL ( nsd.icon ); - if (iconURL.protocol() == TQString::fromLatin1("file")) - iconURL.setProtocol(TQString::null); + if (iconURL.protocol() == TQString::tqfromLatin1("file")) + iconURL.setProtocol(TQString()); leIcon->setText(iconURL.url()); NewsIconMgr::self()->getIcon(iconURL); if (modify == true) { @@ -205,10 +205,10 @@ KURL NewsSourceDlgImpl::polishedURL(const KURL &url) const KURL newURL = url; if (url.protocol().isEmpty()) - if (url.url().startsWith(TQString::fromLatin1("ftp"))) - newURL = TQString::fromLatin1("ftp://") + url.url(); + if (url.url().startsWith(TQString::tqfromLatin1("ftp"))) + newURL = TQString::tqfromLatin1("ftp://") + url.url(); else - newURL = TQString::fromLatin1("http://") + url.url(); + newURL = TQString::tqfromLatin1("http://") + url.url(); return newURL; } @@ -222,7 +222,7 @@ bool NewsSourceDlgImpl::validateURL(const KURL &url) return false; } - if (!url.isValid() || !url.hasPath() || url.encodedPathAndQuery() == TQString::fromLatin1("/")) { + if (!url.isValid() || !url.hasPath() || url.encodedPathAndQuery() == TQString::tqfromLatin1("/")) { KMessageBox::error(this, i18n("KNewsTicker needs a valid RDF or RSS file to" " suggest sensible values. The specified source file is invalid."), i18n("Invalid Source File")); diff --git a/knewsticker/newssourcedlgimpl.h b/knewsticker/newssourcedlgimpl.h index 92f74252..19552a9a 100644 --- a/knewsticker/newssourcedlgimpl.h +++ b/knewsticker/newssourcedlgimpl.h @@ -26,9 +26,10 @@ class TQTimer; class SuggestProgressDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SuggestProgressDlg(const KURL &url, TQWidget *parent, const char *name = 0); + SuggestProgressDlg(const KURL &url, TQWidget *tqparent, const char *name = 0); virtual ~SuggestProgressDlg(); XMLNewsSource *xmlSrc() { return m_xmlSrc; } @@ -54,6 +55,7 @@ class SuggestProgressDlg : public KDialogBase class NewsSourceDlgImpl : public NewsSourceDlg { Q_OBJECT + TQ_OBJECT public: NewsSourceDlgImpl(TQWidget * = 0, const char * = 0, bool = FALSE, WFlags = 0); -- cgit v1.2.1