From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 13 Apr 2011 00:46:47 +0000
Subject: 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
---
 kresources/birthdays/resourcekabc.cpp       | 6 +++---
 kresources/birthdays/resourcekabc.h         | 1 +
 kresources/birthdays/resourcekabcconfig.cpp | 4 ++--
 kresources/birthdays/resourcekabcconfig.h   | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'kresources/birthdays')

diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index b52a09824..815df5ca9 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -220,7 +220,7 @@ bool ResourceKABC::doLoad()
     TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" );
     if (anniversary_string.isEmpty() )
       continue;
-    TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate );
+    TQDateTime anniversary = TQDate::fromString( anniversary_string, TQt::ISODate );
     if ( !anniversary.isValid() )
       continue;
 
@@ -232,7 +232,7 @@ bool ResourceKABC::doLoad()
       for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
         if ( name == (*addrIt).realName() ) {
           TQDate spouseAnniversary =
-            TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+            TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
           if ( anniversary == spouseAnniversary ) {
             found = true;
             break;
@@ -247,7 +247,7 @@ bool ResourceKABC::doLoad()
   }
 
   for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
-    TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+    TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
     kdDebug(5800) << "found a anniversary " << anniversary.toString() << endl;
     TQString name;
     TQString name_1 = (*addrIt).nickName();
diff --git a/kresources/birthdays/resourcekabc.h b/kresources/birthdays/resourcekabc.h
index 9dedd0ab6..1dce9cf07 100644
--- a/kresources/birthdays/resourcekabc.h
+++ b/kresources/birthdays/resourcekabc.h
@@ -48,6 +48,7 @@ namespace KCal {
 class KDE_EXPORT ResourceKABC : public ResourceCalendar
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class ResourceKABCConfig;
 
diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/kresources/birthdays/resourcekabcconfig.cpp
index ec33aaba6..20a9aaf48 100644
--- a/kresources/birthdays/resourcekabcconfig.cpp
+++ b/kresources/birthdays/resourcekabcconfig.cpp
@@ -33,8 +33,8 @@
 
 using namespace KCal;
 
-ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent,  const char* name )
-    : KRES::ConfigWidget( parent, name )
+ResourceKABCConfig::ResourceKABCConfig( TQWidget* tqparent,  const char* name )
+    : KRES::ConfigWidget( tqparent, name )
 {
   TQGridLayout *topLayout = new TQGridLayout( this, 5, 1, 11, 6 );
 
diff --git a/kresources/birthdays/resourcekabcconfig.h b/kresources/birthdays/resourcekabcconfig.h
index 7d3ddf098..81fbdf10a 100644
--- a/kresources/birthdays/resourcekabcconfig.h
+++ b/kresources/birthdays/resourcekabcconfig.h
@@ -41,8 +41,9 @@ namespace KCal {
 class ResourceKABCConfig : public KRES::ConfigWidget
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    ResourceKABCConfig( TQWidget* parent = 0, const char* name = 0 );
+    ResourceKABCConfig( TQWidget* tqparent = 0, const char* name = 0 );
 
   public slots:
     virtual void loadSettings( KRES::Resource *resource);
-- 
cgit v1.2.1