7 files changed, 23 insertions, 30 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/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 56d3cad2..1cbd01f8 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 <kdemacros.h>
+#include <tdemacros.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 d2062d76..ca387006 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 <kdemacros.h>
+#include <tdemacros.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 c03346a6..fbff25c9 100644
--- a/tderesources/blogging/xmlrpcjob.h
+++ b/tderesources/blogging/xmlrpcjob.h
@@ -44,7 +44,7 @@ namespace TDEIO {
  * @since 3.4
  */
 class XmlrpcJob : public TransferJob {
-Q_OBJECT
+TQ_OBJECT
   
 
   public: