Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 58 insertions, 55 deletions

diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 0b0a98a33..07a8aebd0 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqgroupbox.h>
@@ -49,15 +49,15 @@
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_kontactknt( TQWidget *parent, const char * )
+  KDE_EXPORT KCModule *create_kontactknt( TQWidget *tqparent, const char * )
   {
-    return new KCMKontactKNT( parent, "kcmkontactknt" );
+    return new KCMKontactKNT( tqparent, "kcmkontactknt" );
   }
 }
 
-NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *parent )
+NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *tqparent )
   : KDialogBase( Plain, i18n( "New News Feed" ), Ok | Cancel,
-                 Ok, parent, 0, true, true )
+                 Ok, tqparent, 0, true, true )
 {
   TQWidget *page = plainPage();
   TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(),
@@ -103,17 +103,17 @@ TQString NewsEditDialog::url() const
   return mURL->text();
 }
 
-class NewsItem : public QListViewItem
+class NewsItem : public TQListViewItem
 {
   public:
-    NewsItem( TQListView *parent, const TQString& title, const TQString& url, bool custom )
-      : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom )
+    NewsItem( TQListView *tqparent, const TQString& title, const TQString& url, bool custom )
+      : TQListViewItem( tqparent ), mTitle( title ), mUrl( url ), mCustom( custom )
     {
       setText( 0, mTitle );
     }
 
-    NewsItem( TQListViewItem *parent, const TQString& title, const TQString& url, bool custom )
-      : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom )
+    NewsItem( TQListViewItem *tqparent, const TQString& title, const TQString& url, bool custom )
+      : TQListViewItem( tqparent ), mTitle( title ), mUrl( url ), mCustom( custom )
     {
       setText( 0, mTitle );
     }
@@ -128,8 +128,8 @@ class NewsItem : public QListViewItem
     bool mCustom;
 };
 
-KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
-  : KCModule( parent, name )
+KCMKontactKNT::KCMKontactKNT( TQWidget *tqparent, const char *name )
+  : KCModule( tqparent, name )
 {
   initGUI();
 
@@ -153,22 +153,22 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
 
 void KCMKontactKNT::loadNews()
 {
-  TQValueVector<TQListViewItem*> parents;
+  TQValueVector<TQListViewItem*> tqparents;
   TQValueVector<TQListViewItem*>::Iterator it;
 
-  parents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) );
-  parents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) );
-  parents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) );
-  parents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) );
-  parents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) );
-  parents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) );
+  tqparents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) );
 
-  for ( it = parents.begin(); it != parents.end(); ++it )
+  for ( it = tqparents.begin(); it != tqparents.end(); ++it )
     (*it)->setSelectable( false );
 
   for ( int i = 0; i < DEFAULT_NEWSSOURCES; ++i ) {
     NewsSourceData data = NewsSourceDefault[ i ];
-    new NewsItem( parents[ data.category() ], data.name(), data.url(), false );
+    new NewsItem( tqparents[ data.category() ], data.name(), data.url(), false );
     mFeedMap.insert( data.url(), data.name() );
   }
 }
@@ -271,7 +271,7 @@ void KCMKontactKNT::deleteFeed()
   if ( !item )
     return;
 
-  if ( mCustomFeeds.find( item ) == mCustomFeeds.end() )
+  if ( mCustomFeeds.tqfind( item ) == mCustomFeeds.end() )
     return;
 
   mCustomFeeds.remove( item );
@@ -317,7 +317,7 @@ void KCMKontactKNT::allCurrentChanged( TQListViewItem *item )
   bool delState = false;
   if ( newsItem && newsItem->isSelected() ) {
     addState = true;
-    delState = (mCustomFeeds.find( newsItem ) != mCustomFeeds.end());
+    delState = (mCustomFeeds.tqfind( newsItem ) != mCustomFeeds.end());
   }
 
   mAddButton->setEnabled( addState );
@@ -356,7 +356,7 @@ void KCMKontactKNT::initGUI()
   mSelectedNews->setFullWidth( true );
   tqlayout->addWidget( mSelectedNews, 0, 2 );
 
-  TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
+  TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical,
                                   i18n( "News Feed Settings" ), this );
 
   TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3,
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index a8572b8eb..2ec21f863 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KCMKONTACTKNT_H
@@ -27,7 +27,7 @@
 #include <kcmodule.h>
 
 class TQListViewItem;
-class QSpinxBox;
+class TQSpinxBox;
 
 class KAboutData;
 class KListView;
@@ -38,9 +38,10 @@ class NewsItem;
 class KCMKontactKNT : public KCModule
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KCMKontactKNT( TQWidget *parent = 0, const char *name = 0 );
+    KCMKontactKNT( TQWidget *tqparent = 0, const char *name = 0 );
 
     virtual void load();
     virtual void save();
@@ -85,9 +86,10 @@ class KCMKontactKNT : public KCModule
 class NewsEditDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    NewsEditDialog( const TQString&, const TQString&, TQWidget *parent );
+    NewsEditDialog( const TQString&, const TQString&, TQWidget *tqparent );
     TQString title() const;
     TQString url() const;
 
diff --git a/kontact/plugins/newsticker/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h
index 6f8e7fa48..b092469aa 100644
--- a/kontact/plugins/newsticker/newsfeeds.h
+++ b/kontact/plugins/newsticker/newsfeeds.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef NEWSFEEDS_H
@@ -37,8 +37,8 @@ class NewsSourceData
                     Recreation, Society };
 
     NewsSourceData( const TQString &name = I18N_NOOP( "Unknown" ),
-                    const TQString &url = TQString::null,
-                    const TQString &icon = TQString::null,
+                    const TQString &url = TQString(),
+                    const TQString &icon = TQString(),
                     const Category category= Computers )
       : mName( name ), mURL( url ), mIcon( icon ), mCategory( category )
     {
@@ -71,12 +71,12 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("Internet.com Business"),
     TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Business ),
     NewsSourceData(
     TQString::tqfromLatin1("TradeSims"),
     TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Business ),
   // Computers ----------
     NewsSourceData(
@@ -87,7 +87,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("KDE France"),
     TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("FreeBSD Project News"),
@@ -119,7 +119,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("GNOME News"),
     TQString::tqfromLatin1("http://www.gnomedesktop.org/node/feed"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("Slashdot"),
@@ -149,7 +149,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("Jabber News"),
     TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("Freshmeat"),
@@ -194,7 +194,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("Linux Game Tome"),
     TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("Mozilla"),
@@ -209,12 +209,12 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("Daemon News"),
     TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("use Perl;"),
     TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("Root prompt"),
@@ -249,7 +249,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
     NewsSourceData(
     TQString::tqfromLatin1("zez.org - about code "),
     TQString::tqfromLatin1("http://zez.org/article/rssheadlines"),
-    TQString::null,
+    TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
     TQString::tqfromLatin1("BSDatwork.com"),
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 5283d84d8..adfc65fb6 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqclipboard.h>
@@ -41,8 +41,8 @@
 
 #include "summarywidget.h"
 
-SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
-  : Kontact::Summary( parent, name ),
+SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name )
+  : Kontact::Summary( tqparent, name ),
     DCOPObject( "NewsTickerPlugin" ), mLayout( 0 ), mFeedCounter( 0 )
 {
   TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 );
@@ -60,7 +60,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   if ( !kapp->dcopClient()->isApplicationRegistered( "rssservice" ) ) {
     if ( KApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) {
       TQLabel *label = new TQLabel( i18n( "No rss dcop service available.\nYou need rssservice to use this plugin." ), this );
-      vlay->addWidget( label, Qt::AlignHCenter );
+      vlay->addWidget( label, TQt::AlignHCenter );
       dcopAvailable = false;
     }
   }
@@ -175,7 +175,7 @@ void SummaryWidget::documentUpdated( DCOPRef feedRef )
     artRef.call( "title()" ).get( title );
     artRef.call( "link()" ).get( url );
 
-    QPair<TQString, KURL> article(title, KURL( url ));
+    TQPair<TQString, KURL> article(title, KURL( url ));
     map.append( article );
   }
 
@@ -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->clipboard()->setText( url, QClipboard::Clipboard );
+    kapp->clipboard()->setText( url, TQClipboard::Clipboard );
 }
 
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
@@ -310,7 +310,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
     if ( e->type() == TQEvent::Enter )
       emit message( label->url() );
     if ( e->type() == TQEvent::Leave )
-      emit message( TQString::null );
+      emit message( TQString() );
   }
 
   return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h
index bfea340e1..7f30ca267 100644
--- a/kontact/plugins/newsticker/summarywidget.h
+++ b/kontact/plugins/newsticker/summarywidget.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef SUMMARYWIDGET_H
@@ -41,7 +41,7 @@ class TQLabel;
 class DCOPRef;
 class KURLLabel;
 
-typedef TQValueList< QPair<TQString, KURL> > ArticleMap;
+typedef TQValueList< TQPair<TQString, KURL> > ArticleMap;
 
 typedef struct {
   DCOPRef ref;
@@ -56,10 +56,11 @@ typedef TQValueList<Feed> FeedList;
 class SummaryWidget : public Kontact::Summary, public DCOPObject
 {
   Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
 
   public:
-    SummaryWidget( TQWidget *parent, const char *name = 0 );
+    SummaryWidget( TQWidget *tqparent, const char *name = 0 );
 
     int summaryHeight() const;
     TQStringList configModules() const;