5 files changed, 14 insertions, 57 deletions
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp
index 12161d90..44b3e324 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp
@@ -93,8 +93,8 @@ void ResourceTVAnytime::init()
 
   //setReadOnly( true );
 
-  connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
-           this, TQT_SLOT( slotEmitResourceChanged() ) );
+  connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ),
+           this, TQ_SLOT( slotEmitResourceChanged() ) );
 }
 
 TVAnytimePrefsBase *ResourceTVAnytime::prefs()
@@ -179,15 +179,15 @@ bool ResourceTVAnytime::doLoad()
 
   // TODO: find out if the file to download is fresh.  if not, just work with the cache.
   mDownloadJob = TDEIO::file_copy( url, destination, -1, true );
-  connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+  connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
 
   mProgress = KPIM::ProgressManager::instance()->createProgressItem(
     KPIM::ProgressManager::getUniqueID(), i18n("Downloading program schedule") );
 
   connect( mProgress,
-           TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
-           TQT_SLOT( cancelLoad() ) );
+           TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+           TQ_SLOT( cancelLoad() ) );
 
   return true;
 }
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h
index 1be0aa0e..093a175c 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.h
@@ -30,7 +30,7 @@
 #include <tdeabc/locknull.h>
 #include <tdeio/job.h>
 #include <tdeconfig.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include "service.h"
 
@@ -48,9 +48,9 @@ class TVAnytimePrefsBase;
 /**
   This class provides a resource for accessing a BBC TV and radio schedule as a calendar.
 */
-class KDE_EXPORT ResourceTVAnytime : public ResourceCached
+class TDE_EXPORT ResourceTVAnytime : public ResourceCached
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
index c99e86e0..3800d324 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -21,7 +21,7 @@
 #define KCALRESOURCETVANYTIMECONFIG_H
 
 #include <kurlrequester.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 #include <tderesources/resource.h>
 #include <tderesources/configwidget.h>
@@ -38,9 +38,9 @@ class ResourceCachedSaveConfig;
   Configuration widget for TVAnytime resource.
   @see KCal::ResourceTVAnytime
 */
-class KDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget
+class TDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
   public:
     ResourceTVAnytimeConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/tvanytime/kcal_tvanytime.desktop b/tderesources/tvanytime/kcal_tvanytime.desktop
index 3e06ca4d..fc75802c 100644
--- a/tderesources/tvanytime/kcal_tvanytime.desktop
+++ b/tderesources/tvanytime/kcal_tvanytime.desktop
@@ -1,49 +1,6 @@
 [Desktop Entry]
 Name=TV Schedules
-Name[af]=TV skedules
-Name[ar]=جداول التلفزة
-Name[bg]=Разписание на ТВ
-Name[ca]=Programació de la TV
-Name[cs]=TV programy
-Name[da]=Tv-oversigt
-Name[de]=Fernsehprogramm
-Name[el]=Προγράμματα τηλεόρασης
-Name[es]=Programación de TV
-Name[et]=Telekavad
-Name[eu]=TB planifikazioak
-Name[fa]=زمان‌بندیهای تلویزیون
-Name[fi]=TV-ohjelmat
-Name[fr]=Programmes TV
-Name[fy]=Televissjeprogrammearring
-Name[ga]=Sceidil Teilifíse
-Name[gl]=Programación de TV
-Name[hu]=TV-műsorok
-Name[is]=Sjónvarpsdagskrár
-Name[it]=Programmi TV
-Name[ja]=TV 番組予定
-Name[ka]=ტელეპროგრამა
-Name[kk]=TV кестелері
-Name[km]=កាលវិភាគទូរទស្សន៍
-Name[lt]=TV tvarkaraščiai
-Name[mk]=ТВ програми
-Name[nb]=TV-program
-Name[nds]=Feernsehprogramm
-Name[ne]=टीभी कार्यतालिका
-Name[nl]=Televisieprogrammering
-Name[nn]=TV-program
-Name[pl]=Program telewizyjny
-Name[pt]=Programação de TV
-Name[pt_BR]=Horários de TV
-Name[ru]=Программы телепередач
-Name[sk]=TV programy
-Name[sl]=TV spored
-Name[sr]=ТВ програм
-Name[sr@Latn]=TV program
-Name[sv]=Tv-tablåer
-Name[tr]=TV Programı
-Name[uk]=Програма телебачення
-Name[zh_CN]=电视日程安排
-Name[zh_TW]=電視時刻表
+
 X-TDE-Library=kcal_tvanytime
 Type=Service
 X-TDE-ServiceTypes=TDEResources/Plugin
diff --git a/tderesources/tvanytime/tvanytime.tdevelop b/tderesources/tvanytime/tvanytime.tdevelop
index 4359032f..479d2f50 100644
--- a/tderesources/tvanytime/tvanytime.tdevelop
+++ b/tderesources/tvanytime/tvanytime.tdevelop
@@ -67,7 +67,7 @@
   </kdevautoproject>
   <kdevfileview>
     <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
+      <group pattern="*.cpp;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
       <group pattern="*.png" name="Icons" />
       <group pattern="*.po;*.ts" name="Translations" />