diff options
Diffstat (limited to 'tderesources/blogging')
| -rw-r--r-- | tderesources/blogging/API_Blog.h | 2 | ||||
| -rw-r--r-- | tderesources/blogging/API_Blogger.cpp | 14 | ||||
| -rw-r--r-- | tderesources/blogging/API_Blogger.h | 2 | ||||
| -rw-r--r-- | tderesources/blogging/bloggingcalendaradaptor.cpp | 16 | ||||
| -rw-r--r-- | tderesources/blogging/bloggingcalendaradaptor.h | 2 | ||||
| -rw-r--r-- | tderesources/blogging/kcal_resourceblogging.h | 6 | ||||
| -rw-r--r-- | tderesources/blogging/kcal_resourcebloggingconfig.h | 6 | ||||
| -rw-r--r-- | tderesources/blogging/xmlrpcjob.cpp | 8 | ||||
| -rw-r--r-- | tderesources/blogging/xmlrpcjob.h | 2 |
9 files changed, 29 insertions, 29 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/API_Blogger.cpp b/tderesources/blogging/API_Blogger.cpp index 69a722e2..ead54dcd 100644 --- a/tderesources/blogging/API_Blogger.cpp +++ b/tderesources/blogging/API_Blogger.cpp @@ -100,7 +100,7 @@ TDEIO::TransferJob *APIBlogger::createUploadJob( const KURL &url, KBlog::BlogPos kdDebug() << "Uploading Posting with url " << url.url() << endl; TQValueList<TQVariant> args( defaultArgs( posting->postID() ) ); args << TQVariant( posting->content() ); - args << TQVariant( /*publish=*/true, 0 ); + args << TQVariant( /*publish=*/true ); return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerEditPost ), args, false ); // } else { // warningNotInitialized(); @@ -118,7 +118,7 @@ TDEIO::TransferJob *APIBlogger::createUploadNewJob( KBlog::BlogPosting *posting kdDebug() << "Creating new Posting with blogid " << posting->blogID() << " at url " << mServerURL << endl; TQValueList<TQVariant> args( defaultArgs( posting->blogID() ) ); args << TQVariant( posting->content() ); - args << TQVariant( /*publish=*/true, 0 ); + args << TQVariant( /*publish=*/true ); return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerNewPost ), args, false ); // } else { // warningNotInitialized(); @@ -131,7 +131,7 @@ TDEIO::Job *APIBlogger::createRemoveJob( const KURL &/*url*/, const TQString &po kdDebug() << "APIBlogger::createRemoveJob: postid=" << postid << endl; // if ( isValid() ){ TQValueList<TQVariant> args( defaultArgs( postid ) ); - args << TQVariant( /*publish=*/true, 0 ); + args << TQVariant( /*publish=*/true ); return TDEIO::xmlrpcCall( mServerURL, getFunctionName( bloggerDeletePost ), args, false ); // } else { // warningNotInitialized(); @@ -159,7 +159,7 @@ bool APIBlogger::interpretUserInfoJob( TDEIO::Job *job ) TQValueList<TQVariant>::ConstIterator end = posts.end(); for ( ; it != end; ++it ) { kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl; - const TQMap<TQString, TQVariant> postInfo = ( *it ).toMap(); + const TQStringVariantMap postInfo = ( *it ).toMap(); const TQString nickname = postInfo[ "nickname" ].toString(); const TQString userid = postInfo[ "userid" ].toString(); const TQString email = postInfo[ "email" ].toString(); @@ -188,7 +188,7 @@ kdDebug() << "APIBlogger::interpretListFoldersJob, no error!" << endl; TQValueList<TQVariant>::ConstIterator end = posts.end(); for ( ; it != end; ++it ) { kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl; - const TQMap<TQString, TQVariant> postInfo = ( *it ).toMap(); + const TQStringVariantMap postInfo = ( *it ).toMap(); const TQString id( postInfo[ "blogid" ].toString() ); const TQString name( postInfo[ "blogName" ].toString() ); @@ -230,7 +230,7 @@ bool APIBlogger::interpretDownloadItemsJob( TDEIO::Job *job ) for ( ; it != end; ++it ) { BlogPosting posting; kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl; - const TQMap<TQString, TQVariant> postInfo = ( *it ).toMap(); + const TQStringVariantMap postInfo = ( *it ).toMap(); if ( readPostingFromMap( &posting, postInfo ) ) { KCal::Journal *j = journalFromPosting( &posting ); // dumpBlog( &posting ); @@ -252,7 +252,7 @@ bool APIBlogger::interpretDownloadItemsJob( TDEIO::Job *job ) } -bool APIBlogger::readPostingFromMap( BlogPosting *post, const TQMap<TQString, TQVariant> &postInfo ) +bool APIBlogger::readPostingFromMap( BlogPosting *post, const TQStringVariantMap &postInfo ) { // FIXME: if ( !post ) return false; diff --git a/tderesources/blogging/API_Blogger.h b/tderesources/blogging/API_Blogger.h index d7d5f43b..4c78f01f 100644 --- a/tderesources/blogging/API_Blogger.h +++ b/tderesources/blogging/API_Blogger.h @@ -50,7 +50,7 @@ class APIBlogger : public APIBlog bool interpretListItemsJob( TDEIO::Job *job ); bool interpretDownloadItemsJob( TDEIO::Job *job ); protected: - bool readPostingFromMap( BlogPosting *post, const TQMap<TQString, TQVariant> &postInfo ); + bool readPostingFromMap( BlogPosting *post, const TQStringVariantMap &postInfo ); }; } 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/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp index 5f57f1f6..70eb1d8c 100644 --- a/tderesources/blogging/xmlrpcjob.cpp +++ b/tderesources/blogging/xmlrpcjob.cpp @@ -278,9 +278,9 @@ TQString XmlrpcJob::marshal( const TQVariant &arg ) case TQVariant::Map: { TQString markup = "<value><struct>\r\n"; - TQMap<TQString, TQVariant> map = arg.toMap(); - TQMap<TQString, TQVariant>::ConstIterator it = map.begin(); - TQMap<TQString, TQVariant>::ConstIterator end = map.end(); + TQStringVariantMap map = arg.toMap(); + TQStringVariantMap::ConstIterator it = map.begin(); + TQStringVariantMap::ConstIterator end = map.end(); for ( ; it != end; ++it ) { markup += "<member>\r\n"; @@ -357,7 +357,7 @@ kdDebug()<<"Demarshalling element \"" << elem.text() <<"\"" << endl; } else if ( typeName == "struct" ) { - TQMap<TQString, TQVariant> map; + TQStringVariantMap map; TQDomNode memberNode = typeElement.firstChild(); while ( !memberNode.isNull() ) { const TQString key = memberNode.toElement().elementsByTagName( "name" ).item( 0 ).toElement().text(); 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: |
