Rename a number of old tq methods that are no longer tq specific

3 files changed, 160 insertions, 160 deletions

diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index fe2a20c6..4f0bbd38 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -23,7 +23,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqvaluevector.h>
 #include <tqspinbox.h>
@@ -60,22 +60,22 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi
                  Ok, parent, 0, true, true )
 {
   TQWidget *page = plainPage();
-  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(),
+  TQGridLayout *layout = new TQGridLayout( page, 2, 3, marginHint(),
                                          spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Name:" ), page );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   mTitle = new TQLineEdit( page );
   label->setBuddy( mTitle );
-  tqlayout->addMultiCellWidget( mTitle, 0, 0, 1, 2 );
+  layout->addMultiCellWidget( mTitle, 0, 0, 1, 2 );
 
   label = new TQLabel( i18n( "URL:" ), page );
-  tqlayout->addWidget( label, 1, 0 );
+  layout->addWidget( label, 1, 0 );
 
   mURL = new TQLineEdit( page );
   label->setBuddy( mURL );
-  tqlayout->addMultiCellWidget( mURL, 1, 1, 1, 2 );
+  layout->addMultiCellWidget( mURL, 1, 1, 1, 2 );
 
   mTitle->setText( title );
   mURL->setText( url );
@@ -331,16 +331,16 @@ void KCMKontactKNT::modified()
 
 void KCMKontactKNT::initGUI()
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mAllNews = new KListView( this );
   mAllNews->addColumn( i18n( "All" ) );
   mAllNews->setRootIsDecorated( true );
   mAllNews->setFullWidth( true );
-  tqlayout->addWidget( mAllNews, 0, 0 );
+  layout->addWidget( mAllNews, 0, 0 );
 
-  TQVBoxLayout *vbox = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  TQVBoxLayout *vbox = new TQVBoxLayout( layout, KDialog::spacingHint() );
 
   vbox->addStretch();
   mAddButton = new KPushButton( i18n( "Add" ), this );
@@ -354,12 +354,12 @@ void KCMKontactKNT::initGUI()
   mSelectedNews = new KListView( this );
   mSelectedNews->addColumn( i18n( "Selected" ) );
   mSelectedNews->setFullWidth( true );
-  tqlayout->addWidget( mSelectedNews, 0, 2 );
+  layout->addWidget( mSelectedNews, 0, 2 );
 
   TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
                                   i18n( "News Feed Settings" ), this );
 
-  TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3,
+  TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3,
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Refresh time:" ), box );
@@ -384,7 +384,7 @@ void KCMKontactKNT::initGUI()
   mDeleteButton->setEnabled( false );
   boxLayout->addWidget( mDeleteButton, 1, 2 );
 
-  tqlayout->addMultiCellWidget( box, 1, 1, 0, 2 );
+  layout->addMultiCellWidget( box, 1, 1, 0, 2 );
 }
 
 bool KCMKontactKNT::dcopActive() const
diff --git a/kontact/plugins/newsticker/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h
index b092469a..0fe52d3b 100644
--- a/kontact/plugins/newsticker/newsfeeds.h
+++ b/kontact/plugins/newsticker/newsfeeds.h
@@ -58,257 +58,257 @@ class NewsSourceData
 static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
   // Arts ---------------
     NewsSourceData(
-    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"),
     NewsSourceData::Arts ),
     NewsSourceData(
-    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"),
     NewsSourceData::Arts ),
   // Business -----------
     NewsSourceData(
-    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(),
     NewsSourceData::Business ),
     NewsSourceData(
-    TQString::tqfromLatin1("TradeSims"),
-    TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"),
+    TQString::fromLatin1("TradeSims"),
+    TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"),
     TQString(),
     NewsSourceData::Business ),
   // Computers ----------
     NewsSourceData(
-    TQString::tqfromLatin1("KDE Deutschland"),
-    TQString::tqfromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"),
-    TQString::tqfromLatin1("http://www.kde.de/favicon.ico"),
+    TQString::fromLatin1("KDE Deutschland"),
+    TQString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"),
+    TQString::fromLatin1("http://www.kde.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
-    NewsSourceData( TQString::tqfromLatin1("KDE-Look.org"),
-                    TQString::tqfromLatin1("http://www.kde.org/kde-look-content.rdf"),
-                    TQString::tqfromLatin1("http://kde-look.org/img/favicon-1-1.ico"),
+    NewsSourceData( TQString::fromLatin1("KDE-Look.org"),
+                    TQString::fromLatin1("http://www.kde.org/kde-look-content.rdf"),
+                    TQString::fromLatin1("http://kde-look.org/img/favicon-1-1.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::tqfromLatin1("KDE-Apps.org"),
-                    TQString::tqfromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"),
-                    TQString::tqfromLatin1("http://kde-apps.org/img/favicon-1-1.ico"),
+    NewsSourceData( TQString::fromLatin1("KDE-Apps.org"),
+                    TQString::fromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"),
+                    TQString::fromLatin1("http://kde-apps.org/img/favicon-1-1.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::tqfromLatin1("DesktopLinux"),
-                    TQString::tqfromLatin1("http://www.desktoplinux.com/backend/index.html"),
-                    TQString::tqfromLatin1("http://www.desktoplinux.com/images/favicon.ico"),
+    NewsSourceData( TQString::fromLatin1("DesktopLinux"),
+                    TQString::fromLatin1("http://www.desktoplinux.com/backend/index.html"),
+                    TQString::fromLatin1("http://www.desktoplinux.com/images/favicon.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::tqfromLatin1("DistroWatch"),
-                    TQString::tqfromLatin1("http://distrowatch.com/news/dw.xml"),
-                    TQString::tqfromLatin1("http://distrowatch.com/favicon.ico"),
+    NewsSourceData( TQString::fromLatin1("DistroWatch"),
+                    TQString::fromLatin1("http://distrowatch.com/news/dw.xml"),
+                    TQString::fromLatin1("http://distrowatch.com/favicon.ico"),
                     NewsSourceData::Computers ),
     /*URL changed*/
     NewsSourceData(
-    TQString::tqfromLatin1("GNOME News"),
-    TQString::tqfromLatin1("http://www.gnomedesktop.org/node/feed"),
+    TQString::fromLatin1("GNOME News"),
+    TQString::fromLatin1("http://www.gnomedesktop.org/node/feed"),
     TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::tqfromLatin1("heise online news"),
-    TQString::tqfromLatin1("http://www.heise.de/newsticker/heise.rdf"),
-    TQString::tqfromLatin1("http://www.heise.de/favicon.ico"),
+    TQString::fromLatin1("heise online news"),
+    TQString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"),
+    TQString::fromLatin1("http://www.heise.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
+    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
+    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::tqfromLatin1("Prolinux"),
-    TQString::tqfromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"),
-    TQString::tqfromLatin1("http://www.prolinux.de/favicon.ico"),
+    TQString::fromLatin1("Prolinux"),
+    TQString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"),
+    TQString::fromLatin1("http://www.prolinux.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::tqfromLatin1("LinuxSecurity.com"),
-    TQString::tqfromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"),
-    TQString::tqfromLatin1("http://www.linuxsecurity.com/favicon.ico"),
+    TQString::fromLatin1("LinuxSecurity.com"),
+    TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"),
+    TQString::fromLatin1("http://www.linuxsecurity.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::tqfromLatin1("SecurityFocus"),
-    TQString::tqfromLatin1("http://www.securityfocus.com/topnews-rdf.html"),
-    TQString::tqfromLatin1("http://www.securityfocus.com/favicon.ico"),
+    TQString::fromLatin1("SecurityFocus"),
+    TQString::fromLatin1("http://www.securityfocus.com/topnews-rdf.html"),
+    TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
+    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::tqfromLatin1("FreshPorts - the place for ports"),
-    TQString::tqfromLatin1("http://www.freshports.org/news.php3"),
-    TQString::tqfromLatin1("http://www.freshports.org/favicon.ico"),
+    TQString::fromLatin1("FreshPorts - the place for ports"),
+    TQString::fromLatin1("http://www.freshports.org/news.php3"),
+    TQString::fromLatin1("http://www.freshports.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    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"),
     NewsSourceData::Computers ),
   // Miscellaneous ------
     NewsSourceData(
-    TQString::tqfromLatin1("tagesschau.de"),
-    TQString::tqfromLatin1("http://www.tagesschau.de/newsticker.rdf"),
-    TQString::tqfromLatin1("http://www.tagesschau.de/favicon.ico"),
+    TQString::fromLatin1("tagesschau.de"),
+    TQString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"),
+    TQString::fromLatin1("http://www.tagesschau.de/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::tqfromLatin1("CNN Top Stories"),
-    TQString::tqfromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"),
-    TQString::tqfromLatin1("http://www.cnn.com/favicon.ico"),
+    TQString::fromLatin1("CNN Top Stories"),
+    TQString::fromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"),
+    TQString::fromLatin1("http://www.cnn.com/favicon.ico"),
     NewsSourceData::Misc ),
     /*feed URL changed*/
     NewsSourceData(
-    TQString::tqfromLatin1("HotWired"),
-    TQString::tqfromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"),
-    TQString::tqfromLatin1("http://www.hotwired.com/favicon.ico"),
+    TQString::fromLatin1("HotWired"),
+    TQString::fromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"),
+    TQString::fromLatin1("http://www.hotwired.com/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::tqfromLatin1("The Register"),
-    TQString::tqfromLatin1("http://www.theregister.co.uk/headlines.rss"),
-    TQString::tqfromLatin1("http://www.theregister.co.uk/favicon.ico"),
+    TQString::fromLatin1("The Register"),
+    TQString::fromLatin1("http://www.theregister.co.uk/headlines.rss"),
+    TQString::fromLatin1("http://www.theregister.co.uk/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    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"),
     NewsSourceData::Misc ),
   // Recreation
    // Society
     NewsSourceData(
-    TQString::tqfromLatin1("nippon.it"),
-    TQString::tqfromLatin1("http://www.nippon.it/backend.it.php"),
-    TQString::tqfromLatin1("http://www.nippon.it/favicon.ico"),
+    TQString::fromLatin1("nippon.it"),
+    TQString::fromLatin1("http://www.nippon.it/backend.it.php"),
+    TQString::fromLatin1("http://www.nippon.it/favicon.ico"),
     NewsSourceData::Society ),
     NewsSourceData(
-    TQString::tqfromLatin1( "gflash" ),
-    TQString::tqfromLatin1( "http://www.gflash.de/backend.php"),
-    TQString::tqfromLatin1( "http://www.gflash.de/favicon.ico"),
+    TQString::fromLatin1( "gflash" ),
+    TQString::fromLatin1( "http://www.gflash.de/backend.php"),
+    TQString::fromLatin1( "http://www.gflash.de/favicon.ico"),
     NewsSourceData::Society ),
     NewsSourceData(
-    TQString::tqfromLatin1( "Quintessenz" ),
-    TQString::tqfromLatin1( "http://quintessenz.at/cgi-bin/rdf"),
-    TQString::tqfromLatin1( "http://quintessenz.at/favicon.ico"),
+    TQString::fromLatin1( "Quintessenz" ),
+    TQString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"),
+    TQString::fromLatin1( "http://quintessenz.at/favicon.ico"),
     NewsSourceData::Society )
 };
 
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 2ba0dfcf..40eddd2f 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -21,10 +21,10 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqeventloop.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
@@ -220,7 +220,7 @@ void SummaryWidget::updateView()
     KURLLabel *urlLabel = new KURLLabel( hbox );
     urlLabel->setURL( (*it).url );
     urlLabel->setPixmap( (*it).logo );
-    urlLabel->setMaximumSize( urlLabel->tqminimumSizeHint() );
+    urlLabel->setMaximumSize( urlLabel->minimumSizeHint() );
     mLabels.append( urlLabel );
 
     connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
@@ -231,13 +231,13 @@ void SummaryWidget::updateView()
     // header
     TQLabel *label = new TQLabel( hbox );
     label->setText( KCharsets::resolveEntities( (*it).title ) );
-    label->tqsetAlignment( AlignLeft|AlignVCenter );
+    label->setAlignment( AlignLeft|AlignVCenter );
     label->setFont( boldFont );
     label->setIndent( 6 );
-    label->setMaximumSize( label->tqminimumSizeHint() );
+    label->setMaximumSize( label->minimumSizeHint() );
     mLabels.append( label );
 
-    hbox->setMaximumWidth( hbox->tqminimumSizeHint().width() );
+    hbox->setMaximumWidth( hbox->minimumSizeHint().width() );
     hbox->show();
 
     // articles
@@ -300,7 +300,7 @@ void SummaryWidget::rmbMenu( const TQString& url )
   menu.insertItem( i18n( "Copy URL to Clipboard" ) );
   int id = menu.exec( TQCursor::pos() );
   if ( id != -1 )
-    kapp->tqclipboard()->setText( url, TQClipboard::Clipboard );
+    kapp->clipboard()->setText( url, TQClipboard::Clipboard );
 }
 
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )