diff options
Diffstat (limited to 'tderesources/kolab')
-rw-r--r-- | tderesources/kolab/kcal/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tderesources/kolab/kcal/kolab.desktop | 46 | ||||
-rw-r--r-- | tderesources/kolab/kcal/resourcekolab.cpp | 10 | ||||
-rw-r--r-- | tderesources/kolab/kcal/resourcekolab.h | 12 | ||||
-rw-r--r-- | tderesources/kolab/knotes/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tderesources/kolab/knotes/kolabresource.desktop | 46 | ||||
-rw-r--r-- | tderesources/kolab/knotes/resourcekolab.h | 6 | ||||
-rw-r--r-- | tderesources/kolab/shared/kmailconnection.cpp | 4 | ||||
-rw-r--r-- | tderesources/kolab/shared/kmailconnection.h | 2 | ||||
-rw-r--r-- | tderesources/kolab/shared/kolabbase.cpp | 10 | ||||
-rw-r--r-- | tderesources/kolab/tdeabc/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tderesources/kolab/tdeabc/contact.cpp | 1 | ||||
-rw-r--r-- | tderesources/kolab/tdeabc/kolab.desktop | 46 | ||||
-rw-r--r-- | tderesources/kolab/tdeabc/resourcekolab.h | 6 |
14 files changed, 44 insertions, 169 deletions
diff --git a/tderesources/kolab/kcal/CMakeLists.txt b/tderesources/kolab/kcal/CMakeLists.txt index 9f932b5e..a9491d4d 100644 --- a/tderesources/kolab/kcal/CMakeLists.txt +++ b/tderesources/kolab/kcal/CMakeLists.txt @@ -26,9 +26,11 @@ link_directories( ##### other data ################################ -install( - FILES kolab.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +tde_create_translated_desktop( + SOURCE kolab.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop diff --git a/tderesources/kolab/kcal/kolab.desktop b/tderesources/kolab/kcal/kolab.desktop index a2355a39..f5daa4b4 100644 --- a/tderesources/kolab/kcal/kolab.desktop +++ b/tderesources/kolab/kcal/kolab.desktop @@ -1,50 +1,6 @@ [Desktop Entry] Name=Calendar on IMAP Server via KMail -Name[af]=Kalender op IMAP bediener via KMail -Name[bg]=Календар на сървър IMAP през KMail -Name[br]=Deiziadur en ur servijer IMAP gant KMail -Name[ca]=Calendari sobre servidor IMAP mitjançant KMail -Name[cs]=Kalendář na IMAP serveru přes KMail -Name[da]=Kalender på IMAP-server via KMail -Name[de]=Kalender auf einem IMAP-Server via KMail -Name[el]=Ημερολόγιο σε εξυπηρετητή IMAP μέσω του KMail -Name[es]=Calendario en servidor IMAP por medio de KMail -Name[et]=Kalender IMAP-serveris (KMaili vahendusel) -Name[eu]=Egutegia IMAP zerbitzarian KMail-en bidez -Name[fa]=تقویم روی کارساز IMAP از طریق KMail -Name[fi]=Kalenteri IMAP-palvelimella KMailin avulla -Name[fr]=Agenda sur serveur IMAP (via KMail) -Name[fy]=Aginda op IMAP-tsjinner fia KMail -Name[ga]=Féilire ar Fhreastalaí IMAP via KMail -Name[gl]=Calendario no servidor IMAP mediante KMail -Name[hu]=IMAP-kiszolgálón tárolt naptár a KMailen keresztül -Name[is]=Dagatal á IMAP þjóni gegnum KMail -Name[it]=Calendario su server IMAP via KMail -Name[ja]=KMail 経由 IMAP サーバのカレンダー -Name[kk]=KMail арқылы IMAP серверіндегі күнтізбе -Name[km]=ប្រតិទិនលើម៉ាស៊ីនបម្រើ IMAP តាមរយៈ KMail -Name[lt]=Kalendorius IMAP serveryje per KMail -Name[mk]=Календар на IMAP-сервер преку КПошта -Name[ms]=Kalendar pada pelayan IMAP melalui KMail -Name[nb]=Kalender på IMAP-tjener via KMail -Name[nds]=Kalenner op IMAP-Server över KMail -Name[ne]=केडीई मेल मार्फत IMAP सर्भरमा क्यालेन्डर -Name[nl]=Agenda op IMAP-server via KMail -Name[nn]=Kalender på IMAP-tenar via KMail -Name[pl]=Kalendarz na serwerze IMAP za pośrednictwem KMail -Name[pt]=Calendário em Servidor IMAP via KMail -Name[pt_BR]=Calendário em Servidor IMAP via KMail -Name[ru]=Календарь на сервере IMAP через KMail -Name[sk]=Kalendár na IMAP serveri pomocou KMail -Name[sl]=Koledar na strežniku IMAP preko KMaila -Name[sr]=Календар на IMAP серверу преко KMail-а -Name[sr@Latn]=Kalendar na IMAP serveru preko KMail-a -Name[sv]=Kalender på IMAP-server via Kmail -Name[ta]=IMAP சேவையக வழியாக கேஅஞ்சலில் நாட்காட்டி -Name[tr]=KMail Aracılığı ile IMAP Sunucusunda Takvim -Name[uk]=Календар на сервері IMAP через KMail -Name[zh_CN]=通过 KMail 访问 IMAP 服务器上的日历 -Name[zh_TW]=透過 KMail 取得 IMAP 伺服器上的行事曆 + X-TDE-Library=kcal_kolab Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index 869ddca8..24f6efe0 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -77,8 +77,8 @@ ResourceKolab::ResourceKolab( const TDEConfig *config ) setResourceName( i18n( "Kolab Server" ) ); } setType( "imap" ); - connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitResourceChanged() ) ); + connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitResourceChanged() ) ); } ResourceKolab::~ResourceKolab() @@ -402,7 +402,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre KIncidenceChooser* ch = new KIncidenceChooser(); ch->setIncidence( local ,inc ); if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) { - connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) ); + connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT ( useGlobalMode() ) ); if ( ch->exec() ) { if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask ) { emit useGlobalMode() ; @@ -711,7 +711,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s /* Will be needed when kmail triggers a delete, so we don't delete the inocent * incidence that's sharing the uid with this one */ - mOriginalUID2fakeUID[tqMakePair( incidence->schedulingID(), subResource )] = uid; + mOriginalUID2fakeUID[qMakePair( incidence->schedulingID(), subResource )] = uid; } } /* Add to the cache if the add didn't come from KOrganizer, in which case @@ -1185,7 +1185,7 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v ) } mResourceChangedTimer.changeInterval( 100 ); } - TQTimer::singleShot( 0, this, TQT_SLOT(writeConfig()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(writeConfig()) ); } bool ResourceKolab::subresourceWritable( const TQString& subresource ) const diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h index 357c9804..b8670151 100644 --- a/tderesources/kolab/kcal/resourcekolab.h +++ b/tderesources/kolab/kcal/resourcekolab.h @@ -37,7 +37,7 @@ #include <tqtimer.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> @@ -47,11 +47,11 @@ namespace KCal { struct TemporarySilencer; -class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar, +class TDE_EXPORT ResourceKolab : public KCal::ResourceCalendar, public KCal::IncidenceBase::Observer, public Kolab::ResourceKolabBase { - Q_OBJECT + TQ_OBJECT friend struct TemporarySilencer; @@ -71,7 +71,7 @@ public: void doClose(); // The libkcal functions. See the resource for descriptions - KDE_DEPRECATED bool addEvent( KCal::Event *event ); + TDE_DEPRECATED bool addEvent( KCal::Event *event ); bool addEvent( KCal::Event *event, const TQString &subResource ); bool deleteEvent( KCal::Event * ); KCal::Event* event( const TQString &UniqueStr ); @@ -84,14 +84,14 @@ public: KCal::Event::List rawEvents( const TQDate& start, const TQDate& end, bool inclusive = false ); - KDE_DEPRECATED bool addTodo( KCal::Todo * todo ); + TDE_DEPRECATED bool addTodo( KCal::Todo * todo ); bool addTodo( KCal::Todo *todo, const TQString &subResource ); bool deleteTodo( KCal::Todo * ); KCal::Todo* todo( const TQString &uid ); KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending ); KCal::Todo::List rawTodosForDate( const TQDate& date ); - KDE_DEPRECATED bool addJournal( KCal::Journal * ); + TDE_DEPRECATED bool addJournal( KCal::Journal * ); bool addJournal( KCal::Journal *, const TQString &subResource ); bool deleteJournal( KCal::Journal * ); KCal::Journal* journal( const TQString &uid ); diff --git a/tderesources/kolab/knotes/CMakeLists.txt b/tderesources/kolab/knotes/CMakeLists.txt index 8e10f3e5..a9f42059 100644 --- a/tderesources/kolab/knotes/CMakeLists.txt +++ b/tderesources/kolab/knotes/CMakeLists.txt @@ -26,9 +26,11 @@ link_directories( ##### other data ################################ -install( - FILES kolabresource.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) +tde_create_translated_desktop( + SOURCE kolabresource.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes + PO_DIR tderesources-desktops +) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop diff --git a/tderesources/kolab/knotes/kolabresource.desktop b/tderesources/kolab/knotes/kolabresource.desktop index 8cdf00af..b35bc379 100644 --- a/tderesources/kolab/knotes/kolabresource.desktop +++ b/tderesources/kolab/knotes/kolabresource.desktop @@ -1,50 +1,6 @@ [Desktop Entry] Name=IMAP Server via KMail -Name[af]=IMAP bediener via KMail -Name[bg]=Сървър IMAP през KMail -Name[br]=Servijer IMAP gant KMail -Name[ca]=Servidor IMAP mitjançant KMail -Name[cs]=IMAP server přes KMail -Name[da]=IMAP-server via KMail -Name[de]=IMAP-Server via KMail -Name[el]=Εξυπηρετητής IMAP μέσω του KMail -Name[es]=Servidor IMAP por medio de KMail -Name[et]=IMAP-server (KMaili vahendusel) -Name[eu]=IMAP zerbitzaria KMail-en bidez -Name[fa]=کارساز IMAP از طریق KMail -Name[fi]=IMAP-palvelin KMailin avulla -Name[fr]=Serveur IMAP (via KMail) -Name[fy]=IMAP-tsjinner fia KMail -Name[ga]=Freastalaí IMAP via KMail -Name[gl]=Servidor MAP mediante KMail -Name[hu]=IMAP-kiszolgáló a KMailen keresztül -Name[is]=IMAP þjónn gegnum KMail -Name[it]=Server IMAP via KMail -Name[ja]=KMail 経由 IMAP サーバ -Name[kk]=KMail арқылы IMAP сервері -Name[km]=ម៉ាស៊ីនបម្រើ IMAP តាមរយៈ KMail -Name[lt]=IMAP serveris per KMail -Name[mk]=IMAP-сервер преку КПошта -Name[ms]=Pelayan IMAP melalui KMail -Name[nb]=IMAP-tjener via KMail -Name[nds]=IMAP-Server över KMail -Name[ne]=केडीई मेल मार्फत IMAP सर्भर -Name[nl]=IMAP-server via KMail -Name[nn]=IMAP-tenar via KMail -Name[pl]=Serwer IMAP za pośrednictwem KMail -Name[pt]=Servidor IMAP via KMail -Name[pt_BR]=Servidor IMAP via KMail -Name[ru]=Доступ к серверу IMAP через KMail -Name[sk]=IMAP-server pomocou KMail -Name[sl]=Strežnik IMAP preko KMaila -Name[sr]=IMAP сервер преко KMail-а -Name[sr@Latn]=IMAP server preko KMail-a -Name[sv]=IMAP-server via Kmail -Name[ta]=IMAP சேவகன் மூலாம் கேஅஞ்சல் -Name[tr]=KMail aracılığı ile IMAP Sunucu -Name[uk]=Сервер IMAP через KMail -Name[zh_CN]=通过 KMail 访问 IMAP 服务器 -Name[zh_TW]=透過 KMail 取得 IMAP 伺服器 + X-TDE-Library=knotes_kolab Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/kolab/knotes/resourcekolab.h b/tderesources/kolab/knotes/resourcekolab.h index fb0d191b..c28d6e22 100644 --- a/tderesources/kolab/knotes/resourcekolab.h +++ b/tderesources/kolab/knotes/resourcekolab.h @@ -39,7 +39,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kolab { @@ -49,11 +49,11 @@ namespace Kolab { * addresses in an IMAP folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceKolab : public ResourceNotes, +class TDE_EXPORT ResourceKolab : public ResourceNotes, public KCal::IncidenceBase::Observer, public ResourceKolabBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp index 8011c15d..ac4904a8 100644 --- a/tderesources/kolab/shared/kmailconnection.cpp +++ b/tderesources/kolab/shared/kmailconnection.cpp @@ -56,8 +56,8 @@ KMailConnection::KMailConnection( ResourceKolabBase* resource, mDCOPClient->registerAs( objId, true ); kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } KMailConnection::~KMailConnection() diff --git a/tderesources/kolab/shared/kmailconnection.h b/tderesources/kolab/shared/kmailconnection.h index 62003b5f..5497246a 100644 --- a/tderesources/kolab/shared/kmailconnection.h +++ b/tderesources/kolab/shared/kmailconnection.h @@ -49,7 +49,7 @@ class ResourceKolabBase; This class provides the kmail connectivity for IMAP resources. */ class KMailConnection : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/tderesources/kolab/shared/kolabbase.cpp b/tderesources/kolab/shared/kolabbase.cpp index 1dc5418b..5834fd1f 100644 --- a/tderesources/kolab/shared/kolabbase.cpp +++ b/tderesources/kolab/shared/kolabbase.cpp @@ -409,12 +409,12 @@ TQDomDocument KolabBase::domTree() TQString KolabBase::dateTimeToString( const TQDateTime& time ) { - return time.toString( Qt::ISODate ) + 'Z'; + return time.toString( TQt::ISODate ) + 'Z'; } TQString KolabBase::dateToString( const TQDate& date ) { - return date.toString( Qt::ISODate ); + return date.toString( TQt::ISODate ); } TQDateTime KolabBase::stringToDateTime( const TQString& _date ) @@ -423,15 +423,15 @@ TQDateTime KolabBase::stringToDateTime( const TQString& _date ) //Deal with data from some clients that always append a Z to dates. if ( date.endsWith( "ZZ" ) ) date.truncate( date.length() - 2 ); - //In TQt3, Qt::ISODate cannot handle a trailing Z for UTC, so remove if found. + //In TQt3, TQt::ISODate cannot handle a trailing Z for UTC, so remove if found. else if ( date.endsWith( "Z" ) ) date.truncate( date.length() - 1 ); - return TQDateTime::fromString( date, Qt::ISODate ); + return TQDateTime::fromString( date, TQt::ISODate ); } TQDate KolabBase::stringToDate( const TQString& date ) { - return TQDate::fromString( date, Qt::ISODate ); + return TQDate::fromString( date, TQt::ISODate ); } TQString KolabBase::sensitivityToString( Sensitivity s ) diff --git a/tderesources/kolab/tdeabc/CMakeLists.txt b/tderesources/kolab/tdeabc/CMakeLists.txt index 9a77705c..9c348031 100644 --- a/tderesources/kolab/tdeabc/CMakeLists.txt +++ b/tderesources/kolab/tdeabc/CMakeLists.txt @@ -25,9 +25,11 @@ link_directories( ##### other data ################################ -install( - FILES kolab.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +tde_create_translated_desktop( + SOURCE kolab.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc + PO_DIR tderesources-desktops +) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/../uninstall.desktop diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp index 21583eb3..7d594735 100644 --- a/tderesources/kolab/tdeabc/contact.cpp +++ b/tderesources/kolab/tdeabc/contact.cpp @@ -33,6 +33,7 @@ #include "contact.h" #include "resourcekolab.h" +#include <tdeversion.h> #include <tdeabc/addressee.h> #include <tdeabc/stdaddressbook.h> #include <libkcal/freebusyurlstore.h> diff --git a/tderesources/kolab/tdeabc/kolab.desktop b/tderesources/kolab/tdeabc/kolab.desktop index ca9713dc..61d05950 100644 --- a/tderesources/kolab/tdeabc/kolab.desktop +++ b/tderesources/kolab/tdeabc/kolab.desktop @@ -1,50 +1,6 @@ [Desktop Entry] Name=Addressbook on IMAP Server via KMail -Name[af]=Adresboek op IMAP bediener via KMail -Name[bg]=Адресник на сървър IMAP през KMail -Name[br]=Karned chomlec'hioù war ur servijer IMAP gant KMail -Name[ca]=Llibreta d'adreces sobre servidor IMAP mitjançant KMail -Name[cs]=Kniha adres na IMAP serveru přes KMail -Name[da]=Adressebog på IMAP-server via KMail -Name[de]=Adressbuch auf einem IMAP-Server via KMail -Name[el]=Ημερολόγιο σε εξυπηρετητή IMAP μέσω του KMail -Name[es]=Libreta de direcciones en servidor IMAP por medio de KMail -Name[et]=Aadressiraamat IMAP-serveris (KMaili vahendusel) -Name[eu]=Helbide-liburua IMAP zerbitzarian KMail-en bidez -Name[fa]=کتاب نشانی روی کارساز IMAP از طریق KMail -Name[fi]=Osoitekirja IMAP-palvelimella KMailin avulla -Name[fr]=Carnet d'adresse sur serveur IMAP (via KMail) -Name[fy]=Adresboek op IMAP-tsjinner fia KMail -Name[ga]=Leabhar Seoltaí ar Fhreastalaí IMAP via KMail -Name[gl]=Caderno de enderezos nun servidor IMAP mediante KMail -Name[hu]=IMAP-kiszolgálón tárolt címjegyzék a KMailen keresztül -Name[is]=Vistfangaskrá á IMAP þjóni gegnum KMail -Name[it]=Rubrica indirizzi su server IMAP via KMail -Name[ja]=KMail 経由 IMAP サーバのアドレス帳 -Name[kk]=KMail арқылы IMAP серверіндегі адрестік кітапша -Name[km]=សៀវភៅអាសយដ្ឋានលើម៉ាស៊ីនបម្រើ IMAP តាមរយៈ KMail -Name[lt]=Adresų knygelė IMAP serveryje per KMail -Name[mk]=Адресар на IMAP-сервер преку КПошта -Name[ms]=Buku alamat pada pelayan IMAP melalui KMail -Name[nb]=Adressebok på IMAP-tjener via KMail -Name[nds]=Adressbook op IMAP-Server över KMail -Name[ne]=केडीई मेल मार्फत IMAP सर्भरमा ठेगाना पुस्तिका -Name[nl]=Adresboek op IMAP-server via KMail -Name[nn]=Adressebok på IMAP-tenar via KMail -Name[pl]=Książka adresowa na serwerze IMAP za pośrednictwem KMail -Name[pt]=Livro de Endereços em Servidor IMAP via KMail -Name[pt_BR]=Livro de Endereços em servidor IMAP via KMail -Name[ru]=Адресная книга на сервере IMAP через KMail -Name[sk]=Adresár na IMAP-serveri pomocou KMail -Name[sl]=Adresar na strežniku IMAP preko KMaila -Name[sr]=Адресар на IMAP серверу преко KMail-а -Name[sr@Latn]=Adresar na IMAP serveru preko KMail-a -Name[sv]=Adressbok på IMAP-server via Kmail -Name[ta]=IMAP சேவகன் மூலம் கேஅஞ்சல் முகவரிப்புத்தகம் -Name[tr]=KMail Aracılığı ile IMAP Sunucusunda Adres Defteri -Name[uk]=Адресна книга на сервері IMAP через KMail -Name[zh_CN]=通过 KMail 访问 IMAP 服务器上的地址簿 -Name[zh_TW]=透過 KMail 取得 IMAP 伺服器上的通訊錄 + X-TDE-Library=tdeabc_kolab Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h index a19dfbaa..84bce5e6 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.h +++ b/tderesources/kolab/tdeabc/resourcekolab.h @@ -38,7 +38,7 @@ #include "../shared/resourcekolabbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { @@ -49,10 +49,10 @@ namespace TDEABC { * addresses in an Kolab folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceKolab : public KPIM::ResourceABC, +class TDE_EXPORT ResourceKolab : public KPIM::ResourceABC, public Kolab::ResourceKolabBase { - Q_OBJECT + TQ_OBJECT public: |