8 files changed, 24 insertions, 73 deletions
diff --git a/tderesources/blogging/API_Blog.h b/tderesources/blogging/API_Blog.h
index 5ad5b478..91f6e623 100644
--- a/tderesources/blogging/API_Blog.h
+++ b/tderesources/blogging/API_Blog.h
@@ -83,7 +83,7 @@ protected:
 
 class APIBlog : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     APIBlog( const KURL &server, TQObject *parent = 0L, const char *name = 0L );
diff --git a/tderesources/blogging/blogging.desktop b/tderesources/blogging/blogging.desktop
index e2192733..531ec5a6 100644
--- a/tderesources/blogging/blogging.desktop
+++ b/tderesources/blogging/blogging.desktop
@@ -1,47 +1,6 @@
 [Desktop Entry]
 Name=Journals as Blogs on a Server
-Name[af]=Joernale as Blogs op 'n bediener
-Name[bg]=Дневници и блогове
-Name[ca]=Diaris com a blocs en un servidor
-Name[cs]=Deníky jako blogy na serveru
-Name[da]=Journaler som www-blogger på en server
-Name[de]=Journaleinträge als Blogs auf einem Server
-Name[el]=Εφημερίδες ως Blogs σε έναν εξυπηρετητή
-Name[es]=Diarios, como bitácoras en un servidor
-Name[et]=Päevik veebipäevikuna serveris
-Name[eu]=Egunkariak blog moduan zerbitzarian
-Name[fa]=نشریه‌ها به عنوان وب‌نوشتها روی یک کارساز
-Name[fi]=Päiväkirjat blogeina palvelimella
-Name[fr]=Journaux (blogs) sur un serveur
-Name[fy]=Journalen as blochs op in tsjinner
-Name[gl]=Xornais como Bitácoras nun Servidor
-Name[hu]=Naplók blogként tárolása a kiszolgálón
-Name[is]=Dagbækur sem blogg á þjóni
-Name[it]=Diari come blog su un server
-Name[ja]=サーバ上のブログとしてのジャーナル
-Name[kk]=Сервердегі күнделік блог ретінде
-Name[km]=ទិនានុប្បវត្តិជាកំណត់ហេតុបណ្ដាញនៅលើម៉ាស៊ីនបម្រើ
-Name[lt]=Dienynai kaip Blog'ai serveryje
-Name[ms]=Jurnal sebagai Blog pada pelayan
-Name[nb]=Dagbok som blogg på en tjener
-Name[nds]=Daagbookindräag as Blog op en Server
-Name[ne]=सर्भरमा बल्गका रुपका पत्रिका
-Name[nl]=Journalen als blogs op een server
-Name[nn]=Dagbøker som bloggar på ein tenar
-Name[pl]=Dzienniki jako blogi na serwerze
-Name[pt]=Diários como 'Blogs' num Servidor
-Name[pt_BR]=Diários como Blogs em um Servidor
-Name[ru]=Журналы (блоги) на сервере
-Name[sk]=Žurnály ako blogy na serveri
-Name[sl]=Dnevniki kot spletni dnevniki (blogi) na strežniku
-Name[sr]=Дневници као блогови на серверу
-Name[sr@Latn]=Dnevnici kao blogovi na serveru
-Name[sv]=Journaler som webbloggar på en server
-Name[ta]=சேவகனில் பேச்சுரைகள் பத்திரிககளாக உள்ளன
-Name[tr]=Web Günlüğü gibi, bir Sunucuya yazar
-Name[uk]=Журнали як веб-щоденники на сервері
-Name[zh_CN]=日记作为服务器上的博客日志
-Name[zh_TW]=日誌做為伺服器上的部落格
+
 X-TDE-Library=kcal_blogging
 Type=Service
 X-TDE-ServiceTypes=TDEResources/Plugin
diff --git a/tderesources/blogging/bloggingcalendaradaptor.cpp b/tderesources/blogging/bloggingcalendaradaptor.cpp
index 2ed925a8..9c899e5c 100644
--- a/tderesources/blogging/bloggingcalendaradaptor.cpp
+++ b/tderesources/blogging/bloggingcalendaradaptor.cpp
@@ -102,17 +102,17 @@ void BloggingCalendarAdaptor::setAPI( KBlog::APIBlog *api )
   delete mAPI;
   mAPI = api;
   mAuthenticated = false;
-  connect( api, TQT_SIGNAL( userInfoRetrieved( const TQString &, const TQString &,
+  connect( api, TQ_SIGNAL( userInfoRetrieved( const TQString &, const TQString &,
                                            const TQString & ) ),
-           TQT_SLOT( slotUserInfoRetrieved( const TQString &, const TQString &,
+           TQ_SLOT( slotUserInfoRetrieved( const TQString &, const TQString &,
                                     const TQString & ) ) );
-  connect( api, TQT_SIGNAL( folderInfoRetrieved( const TQString &, const TQString & ) ),
-           TQT_SLOT( slotFolderInfoRetrieved( const TQString&, const TQString & ) ) );
-  connect( api, TQT_SIGNAL( itemOnServer( const KURL & ) ),
-           TQT_SIGNAL( itemOnServer( const KURL & ) ) );
-  connect( api, TQT_SIGNAL( itemDownloaded( KCal::Incidence *, const TQString &,
+  connect( api, TQ_SIGNAL( folderInfoRetrieved( const TQString &, const TQString & ) ),
+           TQ_SLOT( slotFolderInfoRetrieved( const TQString&, const TQString & ) ) );
+  connect( api, TQ_SIGNAL( itemOnServer( const KURL & ) ),
+           TQ_SIGNAL( itemOnServer( const KURL & ) ) );
+  connect( api, TQ_SIGNAL( itemDownloaded( KCal::Incidence *, const TQString &,
                                         const KURL &, const TQString &, const TQString & ) ),
-           TQT_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &,
+           TQ_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &,
                                          const KURL &, const TQString &, const TQString & ) ) );
 
 }
diff --git a/tderesources/blogging/bloggingcalendaradaptor.h b/tderesources/blogging/bloggingcalendaradaptor.h
index ee6d292a..527955fb 100644
--- a/tderesources/blogging/bloggingcalendaradaptor.h
+++ b/tderesources/blogging/bloggingcalendaradaptor.h
@@ -50,7 +50,7 @@ class BloggingUploadItem : public KPIM::GroupwareUploadItem
 
 class BloggingCalendarAdaptor : public CalendarAdaptor
 {
-Q_OBJECT
+TQ_OBJECT
   
   public:
     BloggingCalendarAdaptor();
diff --git a/tderesources/blogging/kcal_resourceblogging.h b/tderesources/blogging/kcal_resourceblogging.h
index 4e850d14..109d9ccf 100644
--- a/tderesources/blogging/kcal_resourceblogging.h
+++ b/tderesources/blogging/kcal_resourceblogging.h
@@ -22,7 +22,7 @@
 #define KCAL_RESOURCEBLOGGING_H
 
 #include <kcal_resourcegroupwarebase.h>
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 
 namespace KBlog {
 class APIBlog;
@@ -33,9 +33,9 @@ namespace KCal {
 /**
   This class provides a resource for accessing blogs on a blogging server as journals
 */
-class KDE_EXPORT ResourceBlogging : public ResourceGroupwareBase
+class TDE_EXPORT ResourceBlogging : public ResourceGroupwareBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     ResourceBlogging();
diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.h b/tderesources/blogging/kcal_resourcebloggingconfig.h
index b7584167..d78042b3 100644
--- a/tderesources/blogging/kcal_resourcebloggingconfig.h
+++ b/tderesources/blogging/kcal_resourcebloggingconfig.h
@@ -20,14 +20,14 @@
 #ifndef KCAL_RESOURCEBLOGGINGCONFIG_H
 #define KCAL_RESOURCEBLOGGINGCONFIG_H
 
-#include <tdepimmacros.h>
+#include <kdemacros.h>
 #include <kcal_resourcegroupwarebaseconfig.h>
 
 namespace KCal {
 
-class KDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig
+class TDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     ResourceBloggingConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/blogging/resourcebloggingsettings.ui b/tderesources/blogging/resourcebloggingsettings.ui
index 7d7e0227..ce5b7a25 100644
--- a/tderesources/blogging/resourcebloggingsettings.ui
+++ b/tderesources/blogging/resourcebloggingsettings.ui
@@ -314,17 +314,10 @@
     <tabstop>mCloseCategory</tabstop>
 </tabstops>
 <layoutdefaults spacing="5" margin="5"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/tderesources/blogging/xmlrpcjob.h b/tderesources/blogging/xmlrpcjob.h
index d5838448..fbff25c9 100644
--- a/tderesources/blogging/xmlrpcjob.h
+++ b/tderesources/blogging/xmlrpcjob.h
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 /* This file is part of the KDE libraries
     Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
     Based on the davjob:
@@ -45,7 +44,7 @@ namespace TDEIO {
  * @since 3.4
  */
 class XmlrpcJob : public TransferJob {
-Q_OBJECT
+TQ_OBJECT
   
 
   public: