diff options
author | Timothy Pearson <[email protected]> | 2011-12-15 15:49:40 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-15 15:49:40 -0600 |
commit | 808e453c56036211f57482ed847d54aca01bba68 (patch) | |
tree | 75515d5768dea10d4fbe4cd772e0a89c1c4b3aa9 /knewsticker | |
parent | cd9b9ed7fd0ac8a75106148254aa58e2e5c04863 (diff) | |
download | tdenetwork-808e453c56036211f57482ed847d54aca01bba68.tar.gz tdenetwork-808e453c56036211f57482ed847d54aca01bba68.zip |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'knewsticker')
-rw-r--r-- | knewsticker/common/configaccess.cpp | 418 | ||||
-rw-r--r-- | knewsticker/common/configaccess.h | 6 | ||||
-rw-r--r-- | knewsticker/common/newsengine.cpp | 8 | ||||
-rw-r--r-- | knewsticker/common/newsengine.h | 2 | ||||
-rw-r--r-- | knewsticker/common/newsiconmgr.cpp | 8 | ||||
-rw-r--r-- | knewsticker/common/xmlnewsaccess.cpp | 18 | ||||
-rw-r--r-- | knewsticker/knewsticker.cpp | 56 | ||||
-rw-r--r-- | knewsticker/knewstickerconfig.cpp | 18 | ||||
-rw-r--r-- | knewsticker/knewstickerconfigwidget.ui | 12 | ||||
-rw-r--r-- | knewsticker/knewstickerstub/knewstickerstub.cpp | 6 | ||||
-rw-r--r-- | knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp | 10 | ||||
-rw-r--r-- | knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h | 4 | ||||
-rw-r--r-- | knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui | 4 | ||||
-rw-r--r-- | knewsticker/newsscroller.cpp | 18 | ||||
-rw-r--r-- | knewsticker/newsscroller.h | 2 | ||||
-rw-r--r-- | knewsticker/newssourcedlgimpl.cpp | 22 |
16 files changed, 306 insertions, 306 deletions
diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp index 5fc86dcc..aba34266 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::tqfromLatin1("Bureau 42"), - TQString::tqfromLatin1("http://www.bureau42.com/rdf/"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("eFilmCritic"), - TQString::tqfromLatin1("http://efilmcritic.com/fo.rdf"), - TQString::tqfromLatin1("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( - 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")), + 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( - TQString::tqfromLatin1("Internet.com Business"), - TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), + TQString::fromLatin1("Internet.com Business"), + TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), TQString(), NewsSourceBase::Business, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("TradeSims"), - TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"), + TQString::fromLatin1("TradeSims"), + TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"), TQString(), NewsSourceBase::Business, 10, false, false), // Computers ---------- NewsSourceBase::Data( - TQString::tqfromLatin1( "linuxartist.org" ), - TQString::tqfromLatin1( "http://www.linuxartist.org/backend.php"), - TQString::tqfromLatin1( "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( - 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")), + 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( - TQString::tqfromLatin1("KDE France"), - TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"), + TQString::fromLatin1("KDE France"), + TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"), TQString(), - NewsSourceBase::Computers, 10, true, false, TQString::tqfromLatin1("fr")), + NewsSourceBase::Computers, 10, true, false, TQString::fromLatin1("fr")), NewsSourceBase::Data( - TQString::tqfromLatin1("FreeBSD Project News"), - TQString::tqfromLatin1("http://www.freebsd.org/news/news.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("dot.kde.org"), - TQString::tqfromLatin1("http://www.kde.org/dotkdeorg.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("GNOME News"), - TQString::tqfromLatin1("http://www.gnomedesktop.org/backend.php"), + TQString::fromLatin1("GNOME News"), + TQString::fromLatin1("http://www.gnomedesktop.org/backend.php"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Slashdot"), - TQString::tqfromLatin1("http://slashdot.org/slashdot.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("Ask Slashdot"), - TQString::tqfromLatin1("http://slashdot.org/askslashdot.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("Slashdot: Features"), - TQString::tqfromLatin1("http://slashdot.org/features.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("Slashdot: Apache"), - TQString::tqfromLatin1("http://slashdot.org/apache.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("Slashdot: Books"), - TQString::tqfromLatin1("http://slashdot.org/books.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("Jabber News"), - TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"), + TQString::fromLatin1("Jabber News"), + TQString::fromLatin1("http://www.jabber.org/news/rss.xml"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Freshmeat"), - TQString::tqfromLatin1("http://freshmeat.net/backend/fm.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("Linux Weekly News"), - TQString::tqfromLatin1("http://www.lwn.net/headlines/rss"), - TQString::tqfromLatin1("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( - 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")), + 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( - 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")), + 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( - 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")), + 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( - TQString::tqfromLatin1("Kuro5hin"), - TQString::tqfromLatin1("http://kuro5hin.org/backend.rdf"), - TQString::tqfromLatin1("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( - 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")), + 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( - 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")), + 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( - TQString::tqfromLatin1("LinuxSecurity.com"), - TQString::tqfromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), + TQString::fromLatin1("LinuxSecurity.com"), + TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Linux Game Tome"), - TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"), + TQString::fromLatin1("Linux Game Tome"), + TQString::fromLatin1("http://happypenguin.org/html/news.rdf"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("Telefragged"), - TQString::tqfromLatin1("http://www.telefragged.com/cgi-bin/rdf.pl"), + TQString::fromLatin1("Telefragged"), + TQString::fromLatin1("http://www.telefragged.com/cgi-bin/rdf.pl"), TQString(), NewsSourceBase::Computers, 10, false, false), /* NewsSourceBase::Data( - TQString::tqfromLatin1("Gimp News"), - TQString::tqfromLatin1("http://www.xach.com/gimp/news/channel.rdf"), + TQString::fromLatin1("Gimp News"), + TQString::fromLatin1("http://www.xach.com/gimp/news/channel.rdf"), TQString(), NewsSourceBase::Computers, 10, false, false),*/ NewsSourceBase::Data( - TQString::tqfromLatin1("Mozilla"), - TQString::tqfromLatin1("http://www.mozilla.org/news.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("MozillaZine"), - TQString::tqfromLatin1("http://www.mozillazine.org/contents.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("Daemon News"), - TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), + TQString::fromLatin1("Daemon News"), + TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("use Perl;"), - TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"), + TQString::fromLatin1("use Perl;"), + TQString::fromLatin1("http://use.perl.org/useperl.rdf"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("desktopian.org"), - TQString::tqfromLatin1("http://www.desktopian.org/includes/headlines.xml"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("Root prompt"), - TQString::tqfromLatin1("http://www.rootprompt.org/rss/"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("SecurityFocus"), - TQString::tqfromLatin1("http://www.securityfocus.com/rss/news.xml"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("LinuxNewbie"), - TQString::tqfromLatin1("http://www.linuxnewbie.org/news.cdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("Arstechnica"), - TQString::tqfromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), - TQString::tqfromLatin1("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( - 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")), + 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( - 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"), + 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( - TQString::tqfromLatin1("RadioTux)"), - TQString::tqfromLatin1("http://blog.radiotux.de/feed/"), + TQString::fromLatin1("RadioTux)"), + TQString::fromLatin1("http://blog.radiotux.de/feed/"), TQString(), - NewsSourceBase::Computers, 10, false, false, TQString::tqfromLatin1("de")), + NewsSourceBase::Computers, 10, false, false, TQString::fromLatin1("de")), NewsSourceBase::Data( - TQString::tqfromLatin1("kdenews.unixcode.org"), - TQString::tqfromLatin1("http://kdenews.unixcode.org/?node=news&action=rss"), + TQString::fromLatin1("kdenews.unixcode.org"), + TQString::fromLatin1("http://kdenews.unixcode.org/?node=news&action=rss"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("FreshPorts - the place for ports"), - TQString::tqfromLatin1("http://www.freshports.org/news.php"), - TQString::tqfromLatin1("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( - 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")), + 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( - 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")), + 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( - TQString::tqfromLatin1("zez.org - about code "), - TQString::tqfromLatin1("http://zez.org/article/rssheadlines"), + TQString::fromLatin1("zez.org - about code "), + TQString::fromLatin1("http://zez.org/article/rssheadlines"), TQString(), NewsSourceBase::Computers, 10, false, false), NewsSourceBase::Data( - TQString::tqfromLatin1("BSDatwork.com"), - TQString::tqfromLatin1("http://BSDatwork.com/backend.php"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("FreshSource - the place for source"), - TQString::tqfromLatin1("http://www.freshsource.org/news.php"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("The FreeBSD Diary"), - TQString::tqfromLatin1("http://www.freebsddiary.org/news.php"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("MaximumBSD"), - TQString::tqfromLatin1("http://www.maximumbsd.com/backend/mb.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("BR-Linux.org"), - TQString::tqfromLatin1("http://br-linux.org/noticias/index.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("OSNews.com"), - TQString::tqfromLatin1("http://www.osnews.com/files/recent.rdf"), - TQString::tqfromLatin1("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( - 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")), + 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( - 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")), + 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( - TQString::tqfromLatin1("CNN"), - TQString::tqfromLatin1("http://www.cnn.com/cnn.rss"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("CNN Europe"), - TQString::tqfromLatin1("http://europe.cnn.com/cnn.rss"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("HotWired"), - TQString::tqfromLatin1("http://www.hotwired.com/webmonkey/meta/headlines.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1("The Register"), - TQString::tqfromLatin1("http://www.theregister.co.uk/tonys/slashdot.rdf"), - TQString::tqfromLatin1("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( - TQString::tqfromLatin1( "Christian Science Monitor" ), - TQString::tqfromLatin1( "http://www.csmonitor.com/rss/csm.rss"), - TQString::tqfromLatin1( "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( - 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")*/ ), + 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( - 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")), + 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( - 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")), + 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( - TQString::tqfromLatin1("Segfault"), - TQString::tqfromLatin1("http://segfault.org/stories.xml"), - TQString::tqfromLatin1("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( - 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")), + 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( - 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" ) ), + 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( - 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" ) ) + 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 TQString &action, const TQString &newsSource, @@ -587,13 +587,13 @@ 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::tqfromLatin1("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 == TQString::tqfromLatin1("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(TQString::tqfromLatin1("Filter #%1").tqarg(filterNo))) { - m_cfg->setGroup(TQString::tqfromLatin1("Filter #%1").tqarg(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(TQString::tqfromLatin1("Filter #%1").tqarg(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 50f42cce..9416e4e4 100644 --- a/knewsticker/common/configaccess.h +++ b/knewsticker/common/configaccess.h @@ -32,9 +32,9 @@ class ArticleFilter { public: typedef TQValueList<int> List; - ArticleFilter(const TQString & = I18N_NOOP(TQString::tqfromLatin1("Show")), - const TQString & = I18N_NOOP(TQString::tqfromLatin1("all newssources")), - const TQString & = I18N_NOOP(TQString::tqfromLatin1("contain")), + 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(), bool = true); diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp index 398e2f40..911095d9 100644 --- a/knewsticker/common/newsengine.cpp +++ b/knewsticker/common/newsengine.cpp @@ -222,7 +222,7 @@ void ProgramNewsSource::slotProgramExited(KProcess *proc) } else { ErrorCode error = static_cast<ErrorCode>(proc->exitStatus()); if (error != NOERR) { - errorMsg = errorMessage(error).tqarg(m_data.sourceFile); + errorMsg = errorMessage(error).arg(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::tqfromLatin1("\"") + output + TQString::tqfromLatin1("\""); - errorMsg += i18n("<p>Program output:<br>%1<br>").tqarg(output); + output = TQString::fromLatin1("\"") + output + TQString::fromLatin1("\""); + errorMsg += i18n("<p>Program output:<br>%1<br>").arg(output); } KMessageBox::detailedError(0, i18n("An error occurred while updating the" - " news source '%1'.").tqarg(newsSourceName()), errorMsg, + " news source '%1'.").arg(newsSourceName()), errorMsg, i18n("KNewsTicker Error")); } diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h index 554b95fb..da3059fd 100644 --- a/knewsticker/common/newsengine.h +++ b/knewsticker/common/newsengine.h @@ -75,7 +75,7 @@ class KDE_EXPORT NewsSourceBase : public XMLNewsSource, public KShared const Subject _subject = Computers, unsigned int _maxArticles = 10, bool _enabled = true, bool _isProgram = false, - const TQString &_language = TQString::tqfromLatin1("C")) + const TQString &_language = TQString::fromLatin1("C")) { name = _name; sourceFile = _sourceFile; diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp index b4a8ab67..6e8e88d7 100644 --- a/knewsticker/common/newsiconmgr.cpp +++ b/knewsticker/common/newsiconmgr.cpp @@ -39,7 +39,7 @@ NewsIconMgr *NewsIconMgr::self() NewsIconMgr::NewsIconMgr(TQObject *parent, const char *name) : TQObject(parent, name), DCOPObject("NewsIconMgr"), - m_stdIcon(SmallIcon(TQString::tqfromLatin1("news"))) + m_stdIcon(SmallIcon(TQString::fromLatin1("news"))) { connectDCOPSignal("kded", "favicons", "iconChanged(bool, TQString, TQString)", @@ -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::tqfromLatin1("favicons/%1.png").tqarg(url.host())))); + TQString::fromLatin1("favicons/%1.png").arg(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::tqfromLatin1("http")); + url.setProtocol(TQString::fromLatin1("http")); if (iconName.isNull()) emit gotIcon(url, m_stdIcon); else emit gotIcon(url, TQPixmap(KGlobal::dirs()->findResource("cache", - TQString::tqfromLatin1("favicons/%1.png").tqarg(url.host())))); + TQString::fromLatin1("favicons/%1.png").arg(url.host())))); } TQString NewsIconMgr::favicon(const KURL &url) const diff --git a/knewsticker/common/xmlnewsaccess.cpp b/knewsticker/common/xmlnewsaccess.cpp index 3aff700b..96933414 100644 --- a/knewsticker/common/xmlnewsaccess.cpp +++ b/knewsticker/common/xmlnewsaccess.cpp @@ -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::tqfromLatin1("UserAgent"), - TQString::tqfromLatin1("KNewsTicker v0.2")); + 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 *))); @@ -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::tqfromLatin1("channel")); + TQDomNode channelNode = domDoc.documentElement().namedItem(TQString::fromLatin1("channel")); - m_name = channelNode.namedItem(TQString::tqfromLatin1("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(TQString::tqfromLatin1("link")).toElement().text().simplifyWhiteSpace(); - m_description = channelNode.namedItem(TQString::tqfromLatin1("description")).toElement().text().simplifyWhiteSpace(); + m_link = channelNode.namedItem(TQString::fromLatin1("link")).toElement().text().simplifyWhiteSpace(); + m_description = channelNode.namedItem(TQString::fromLatin1("description")).toElement().text().simplifyWhiteSpace(); - TQDomNodeList items = domDoc.elementsByTagName(TQString::tqfromLatin1("item")); + TQDomNodeList items = domDoc.elementsByTagName(TQString::fromLatin1("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::tqfromLatin1("title")).toElement().text().simplifyWhiteSpace()); - address = KCharsets::resolveEntities(itemNode.namedItem(TQString::tqfromLatin1("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/knewsticker.cpp b/knewsticker/knewsticker.cpp index a23696d5..90a05066 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -28,7 +28,7 @@ #include <kstartupinfo.h> #include <tqcursor.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> #include <tqtooltip.h> @@ -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 *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); m_contextMenu = new KNewsTickerMenu(this); connect(m_contextMenu, TQT_SIGNAL(aboutToHide()), @@ -59,10 +59,10 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget connect(m_arrowButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotArrowButtonPressed())); m_arrowButton->setFocusPolicy(TQ_NoFocus); setupArrowButton(); - tqlayout->addWidget(m_arrowButton); + layout->addWidget(m_arrowButton); m_scroller = new NewsScroller(this, m_cfg); - tqlayout->addWidget(m_scroller); + layout->addWidget(m_scroller); m_dcopClient->registerAs("knewsticker", false); @@ -95,12 +95,12 @@ KNewsTicker::~KNewsTicker() int KNewsTicker::heightForWidth(int) const { - return m_scroller->tqsizeHint().height() + m_arrowButton->height(); + return m_scroller->sizeHint().height() + m_arrowButton->height(); } int KNewsTicker::widthForHeight(int) const { - return m_scroller->tqsizeHint().width() + m_arrowButton->width(); + return m_scroller->sizeHint().width() + m_arrowButton->width(); } void KNewsTicker::preferences() @@ -119,7 +119,7 @@ void KNewsTicker::about() void KNewsTicker::help() { - kapp->invokeHelp(TQString(), TQString::tqfromLatin1("knewsticker")); + kapp->invokeHelp(TQString(), TQString::fromLatin1("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::tqfromLatin1("NewNews")); + KNotifyClient::event(winId(), TQString::fromLatin1("NewNews")); } } @@ -242,12 +242,12 @@ 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->tqsizeHint().height() - 2; + const int y = pos.y() - m_contextMenu->sizeHint().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->tqsizeHint().width() - 2; + const int x = pos.x() - m_contextMenu->sizeHint().width() - 2; pos.setX(TQMAX(0, x)); } @@ -257,21 +257,21 @@ void KNewsTicker::slotArrowButtonPressed() void KNewsTicker::positionChange(Position) { - delete tqlayout(); + delete layout(); - TQBoxLayout *tqlayout; + TQBoxLayout *layout; if (orientation() ==Qt::Horizontal) - tqlayout = new TQHBoxLayout(this); + layout = new TQHBoxLayout(this); else - tqlayout = new TQVBoxLayout(this); + layout = new TQVBoxLayout(this); if (m_arrowButton) { - tqlayout->addWidget(m_arrowButton); + layout->addWidget(m_arrowButton); setupArrowButton(); } - tqlayout->addWidget(m_scroller); + layout->addWidget(m_scroller); } void KNewsTicker::slotContextMenuAboutToHide() @@ -288,20 +288,20 @@ void KNewsTicker::slotNotifyOfFailures() if (m_failedNewsUpdates.count() == 1) notification = i18n("<qt>Could not update news site '%1'.<br>" "The supplied resource file is probably invalid or" - " broken.</qt>").tqarg(m_failedNewsUpdates.first()); + " broken.</qt>").arg(m_failedNewsUpdates.first()); else if (m_failedNewsUpdates.count() > 1 && m_failedNewsUpdates.count() < 8) { notification = i18n("<qt>The following news sites had problems. Their" " resource files are probably invalid or broken.<ul>"); TQStringList::ConstIterator it = m_failedNewsUpdates.begin(); TQStringList::ConstIterator end = m_failedNewsUpdates.end(); for (; it != end; ++it) - notification += TQString::tqfromLatin1("<li>%1</li>").tqarg(*it); - notification += TQString::tqfromLatin1("</ul></qt>"); + notification += TQString::fromLatin1("<li>%1</li>").arg(*it); + notification += TQString::fromLatin1("</ul></qt>"); } else notification = i18n("Failed to update several news" " sites. The Internet connection might be cut."); - KNotifyClient::event(winId(), TQString::tqfromLatin1("InvalidRDF"), notification); + KNotifyClient::event(winId(), TQString::fromLatin1("InvalidRDF"), notification); } void KNewsTicker::setInterval(const uint interval) @@ -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::tqfromLatin1("viewmag")); - const TQPixmap newArticleIcon = SmallIcon(TQString::tqfromLatin1("info")); - const TQPixmap oldArticleIcon = SmallIcon(TQString::tqfromLatin1("mime_empty")); - const TQPixmap noArticlesIcon = SmallIcon(TQString::tqfromLatin1("remove")); + 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")); unsigned int articleIdx = 0; const NewsSourceBase::List sources = m_parent->m_newsSources; @@ -467,9 +467,9 @@ void KNewsTickerMenu::populateMenu() if (m_fullMenu) { insertSeparator(); - const TQPixmap logoIcon = SmallIcon(TQString::tqfromLatin1("knewsticker")); - const TQPixmap helpIcon = SmallIcon(TQString::tqfromLatin1("help")); - const TQPixmap confIcon = SmallIcon(TQString::tqfromLatin1("configure")); + const TQPixmap logoIcon = SmallIcon(TQString::fromLatin1("knewsticker")); + const TQPixmap helpIcon = SmallIcon(TQString::fromLatin1("help")); + const TQPixmap confIcon = SmallIcon(TQString::fromLatin1("configure")); insertTitle(logoIcon, i18n("KNewsTicker"), 0, 0); @@ -535,7 +535,7 @@ extern "C" { KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString &configFile) { - KGlobal::locale()->insertCatalogue(TQString::tqfromLatin1("knewsticker")); + KGlobal::locale()->insertCatalogue(TQString::fromLatin1("knewsticker")); return new KNewsTicker(configFile, KPanelApplet::Stretch, KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help | KPanelApplet::ReportBug, diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp index eb07bcbd..aec193cb 100644 --- a/knewsticker/knewstickerconfig.cpp +++ b/knewsticker/knewstickerconfig.cpp @@ -42,9 +42,9 @@ CategoryItem::CategoryItem(TQListView *parent, const TQString &text) void CategoryItem::setOpen(bool open) { if (open) - setPixmap(0, SmallIcon(TQString::tqfromLatin1("folder_open"))); + setPixmap(0, SmallIcon(TQString::fromLatin1("folder_open"))); else - setPixmap(0, SmallIcon(TQString::tqfromLatin1("folder"))); + setPixmap(0, SmallIcon(TQString::fromLatin1("folder"))); TQListViewItem::setOpen(open); } @@ -251,7 +251,7 @@ bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e) } int i = 0; while (validName == false) { - name = i18n("Unknown %1").tqarg(i); + name = i18n("Unknown %1").arg(i); for (TQListViewItemIterator it(m_child->lvNewsSources); it.current(); it++) { if (it.current()->text(0) == name) { i++; @@ -356,17 +356,17 @@ void KNewsTickerConfig::slotNewsSourceContextMenu(KListView *, TQListViewItem *i KPopupMenu *menu = new KPopupMenu(); - 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")); + 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")); menu->insertTitle(logoIcon, i18n("Edit News Source")); menu->insertItem(addIcon, i18n("&Add News Source"), 0); if (item) { - menu->insertItem(modifyIcon, i18n("&Modify '%1'").tqarg(item->text(0)), 1); + menu->insertItem(modifyIcon, i18n("&Modify '%1'").arg(item->text(0)), 1); if (m_child->lvNewsSources->selectedItems().count() == 1) { - menu->insertItem(removeIcon, i18n("&Remove '%1'").tqarg(item->text(0)), 2); + menu->insertItem(removeIcon, i18n("&Remove '%1'").arg(item->text(0)), 2); } else { menu->insertItem(removeIcon, i18n("&Remove News Sources"), 2); } diff --git a/knewsticker/knewstickerconfigwidget.ui b/knewsticker/knewstickerconfigwidget.ui index 2ad24dd9..72f73171 100644 --- a/knewsticker/knewstickerconfigwidget.ui +++ b/knewsticker/knewstickerconfigwidget.ui @@ -218,7 +218,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -325,7 +325,7 @@ Note that you can also right-click on the list to open a menu which lets you add <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -480,7 +480,7 @@ Note that the filters are processed from the top to the bottom so that of two fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -566,7 +566,7 @@ Note that the filters are processed from the top to the bottom so that of two fi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -629,7 +629,7 @@ Note that the filters are processed from the top to the bottom so that of two fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1114,7 +1114,7 @@ Note that the filters are processed from the top to the bottom so that of two fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp index e992b118..ac4ddeeb 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::tqfromLatin1("knewsticker_panelappletrc"), false, false); + KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false); ConfigAccess configFrontend(&cfg); if (args->isSet("addrdf")) { @@ -59,8 +59,8 @@ int main(int argc, char **argv) TQString name = i18n("Unknown"); if (newsSources.contains(name)) for (unsigned int i = 0; ; i++) - if (!newsSources.contains(i18n("Unknown %1").tqarg(i))) { - name = i18n("Unknown %1").tqarg(i); + if (!newsSources.contains(i18n("Unknown %1").arg(i))) { + name = i18n("Unknown %1").arg(i); break; } diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp index 7d2a588b..a2de376e 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp @@ -58,8 +58,8 @@ KntSrcFilePropsDlg::KntSrcFilePropsDlg(KPropertiesDialog *props) TQT_SLOT(slotClickedArticle(TQListBoxItem *))); Loader *loader = Loader::create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, tqStatus)), - TQT_SLOT(slotConstructUI(Loader *, Document, tqStatus))); + connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + TQT_SLOT(slotConstructUI(Loader *, Document, Status))); 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, tqStatus status) +void KntSrcFilePropsDlg::slotConstructUI(Loader *, Document doc, Status status) { if (status != RSS::Success) return; KURL iconURL = doc.link(); - iconURL.setEncodedPathAndQuery(TQString::tqfromLatin1("/favicon.ico")); + iconURL.setEncodedPathAndQuery(TQString::fromLatin1("/favicon.ico")); NewsIconMgr::self()->getIcon(iconURL); m_child->urlName->setText(doc.title()); @@ -107,7 +107,7 @@ void KntSrcFilePropsDlg::slotClickedArticle(TQListBoxItem *item) TQObject *KntSrcFilePropsFactory::createObject(TQObject *parent, const char *, const char *classname, const TQStringList &) { - if (TQString::tqfromLatin1(classname) == "KPropsDlgPlugin") + if (TQString::fromLatin1(classname) == "KPropsDlgPlugin") { if (!parent->inherits("KPropertiesDialog")) return 0L; diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h index 8a06a7b4..eadd1a9b 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.h @@ -26,7 +26,7 @@ namespace RSS { using RSS::Loader; using RSS::Document; -using RSS::tqStatus; +using RSS::Status; class KntSrcFilePropsFactory : public KLibFactory { @@ -48,7 +48,7 @@ class KntSrcFilePropsDlg : public KPropsDlgPlugin protected slots: void slotOpenURL(const TQString &); - void slotConstructUI(Loader *loader, Document doc, tqStatus status); + void slotConstructUI(Loader *loader, Document doc, Status status); void slotGotIcon(const KURL &, const TQPixmap &); void slotClickedArticle(TQListBoxItem *); diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui index 1b589f5e..fa2f0751 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui @@ -38,7 +38,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>63</height> diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index e92529be..df824c4a 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -150,9 +150,9 @@ NewsScroller::NewsScroller(TQWidget *parent, ConfigAccess *cfg, const char *name reset(); } -TQSize NewsScroller::tqsizeHint() const +TQSize NewsScroller::sizeHint() const { - return TQSize(fontMetrics().width(TQString::tqfromLatin1("X")) * 20, fontMetrics().height() * 2); + return TQSize(fontMetrics().width(TQString::fromLatin1("X")) * 20, fontMetrics().height() * 2); } TQSizePolicy NewsScroller::sizePolicy() const @@ -178,22 +178,22 @@ void NewsScroller::dropEvent(TQDropEvent* event) // <HACK> // This is just for http://www.webreference.com/services/news/ newSourceUrl = newSourceUrl.replace(TQRegExp( - TQString::tqfromLatin1("^view-source:http%3A//")), - TQString::tqfromLatin1("http://")); + TQString::fromLatin1("^view-source:http%3A//")), + TQString::fromLatin1("http://")); // </HACK> newSourceUrl = newSourceUrl.stripWhiteSpace(); if (!isHeadline(newSourceUrl) && KMessageBox::questionYesNo(this, i18n("<p>Do you really want to add '%1' to" " the list of news sources?</p>") - .tqarg(newSourceUrl), TQString(), i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) { - KConfig cfg(TQString::tqfromLatin1("knewsticker_panelappletrc"), false, false); + .arg(newSourceUrl), TQString(), i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) { + KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false); ConfigAccess configFrontend(&cfg); TQStringList newsSources = configFrontend.newsSources(); TQString name = i18n("Unknown"); if (newsSources.contains(name)) for (unsigned int i = 0; ; i++) - if (!newsSources.contains(i18n("Unknown %1").tqarg(i))) { - name = i18n("Unknown %1").tqarg(i); + if (!newsSources.contains(i18n("Unknown %1").arg(i))) { + name = i18n("Unknown %1").arg(i); break; } @@ -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::tqfromLatin1(" +++ "); + TQString sep = m_headlines.isEmpty() ? i18n(" +++ No News Available +++") : TQString::fromLatin1(" +++ "); int w = fontMetrics().width(sep); int h = fontMetrics().height(); diff --git a/knewsticker/newsscroller.h b/knewsticker/newsscroller.h index b05d9d2e..d7800e39 100644 --- a/knewsticker/newsscroller.h +++ b/knewsticker/newsscroller.h @@ -36,7 +36,7 @@ class NewsScroller : public TQFrame public: NewsScroller(TQWidget *, ConfigAccess *, const char * = 0); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQSizePolicy sizePolicy() const; // Convenience stuff. Somehow ugly, no? diff --git a/knewsticker/newssourcedlgimpl.cpp b/knewsticker/newssourcedlgimpl.cpp index e78321c7..e5c50090 100644 --- a/knewsticker/newssourcedlgimpl.cpp +++ b/knewsticker/newssourcedlgimpl.cpp @@ -56,7 +56,7 @@ SuggestProgressDlg::SuggestProgressDlg(const KURL &url, TQWidget *parent, const if (url.isLocalFile()) u = TQString(); else - u.setEncodedPathAndQuery(TQString::tqfromLatin1("/favicon.ico")); + u.setEncodedPathAndQuery(TQString::fromLatin1("/favicon.ico")); NewsIconMgr::self()->getIcon(u); } @@ -138,12 +138,12 @@ void NewsSourceDlgImpl::slotOkClicked() KURL iconURL ( leIcon->text() ); if (iconURL.protocol().isEmpty()) - 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")); + 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")); else - iconURL.setProtocol(TQString::tqfromLatin1("file")); + iconURL.setProtocol(TQString::fromLatin1("file")); NewsSourceBase::Data nsd(leName->text(), url.url(), iconURL.url(), subject, sbMaxArticles->value(), true, cbProgram->isChecked()); @@ -191,7 +191,7 @@ 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::tqfromLatin1("file")) + if (iconURL.protocol() == TQString::fromLatin1("file")) iconURL.setProtocol(TQString()); leIcon->setText(iconURL.url()); NewsIconMgr::self()->getIcon(iconURL); @@ -205,10 +205,10 @@ KURL NewsSourceDlgImpl::polishedURL(const KURL &url) const KURL newURL = url; if (url.protocol().isEmpty()) - if (url.url().startsWith(TQString::tqfromLatin1("ftp"))) - newURL = TQString::tqfromLatin1("ftp://") + url.url(); + if (url.url().startsWith(TQString::fromLatin1("ftp"))) + newURL = TQString::fromLatin1("ftp://") + url.url(); else - newURL = TQString::tqfromLatin1("http://") + url.url(); + newURL = TQString::fromLatin1("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::tqfromLatin1("/")) { + if (!url.isValid() || !url.hasPath() || url.encodedPathAndQuery() == TQString::fromLatin1("/")) { 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")); |