diff options
Diffstat (limited to 'tderesources')
220 files changed, 744 insertions, 2002 deletions
diff --git a/tderesources/CMakeL10n.txt b/tderesources/CMakeL10n.txt index b585ce4a..39b74f0d 100644 --- a/tderesources/CMakeL10n.txt +++ b/tderesources/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_auto_add_subdirectories( ) + +tde_l10n_create_template( + CATALOG "desktop_files/tderesources-desktops/" + SOURCES *.desktop *.protocol + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/tderesources/birthdays/CMakeLists.txt b/tderesources/birthdays/CMakeLists.txt index 7ac1be77..720204d2 100644 --- a/tderesources/birthdays/CMakeLists.txt +++ b/tderesources/birthdays/CMakeLists.txt @@ -33,7 +33,11 @@ install( FILES ##### other data ################################ -install( FILES tdeabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +tde_create_translated_desktop( + SOURCE tdeabc.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) ##### kcal_tdeabc (module) ####################### diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp index d36ebddd..2e937a7d 100644 --- a/tderesources/birthdays/resourcetdeabc.cpp +++ b/tderesources/birthdays/resourcetdeabc.cpp @@ -125,7 +125,7 @@ bool ResourceTDEABC::doOpen() kdDebug(5800) << "ResourceTDEABC::doOpen()" << endl; mAddressbook = TDEABC::StdAddressBook::self( true ); - connect( mAddressbook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT( reload() ) ); + connect( mAddressbook, TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT( reload() ) ); return true; } @@ -220,7 +220,7 @@ bool ResourceTDEABC::doLoad() TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" ); if (anniversary_string.isEmpty() ) continue; - TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate ); + TQDateTime anniversary = TQDate::fromString( anniversary_string, TQt::ISODate ); if ( !anniversary.isValid() ) continue; @@ -232,7 +232,7 @@ bool ResourceTDEABC::doLoad() for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) { if ( name == (*addrIt).realName() ) { TQDate spouseAnniversary = - TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate ); + TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate ); if ( anniversary == TQDateTime(spouseAnniversary) ) { found = true; break; @@ -247,7 +247,7 @@ bool ResourceTDEABC::doLoad() } for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) { - TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate ); + TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate ); kdDebug(5800) << "found a anniversary " << TQString(anniversary.toString()) << endl; TQString name; TQString name_1 = (*addrIt).nickName(); diff --git a/tderesources/birthdays/resourcetdeabc.h b/tderesources/birthdays/resourcetdeabc.h index 5ba80ca1..93c15d94 100644 --- a/tderesources/birthdays/resourcetdeabc.h +++ b/tderesources/birthdays/resourcetdeabc.h @@ -33,7 +33,7 @@ #include "libkcal/resourcecalendar.h" -#include "libtdepim/tdepimmacros.h" +#include <kdemacros.h> namespace TDEIO { class FileCopyJob; @@ -47,7 +47,7 @@ namespace KCal { */ class KDE_EXPORT ResourceTDEABC : public ResourceCalendar { - Q_OBJECT + TQ_OBJECT friend class ResourceTDEABCConfig; diff --git a/tderesources/birthdays/resourcetdeabcconfig.cpp b/tderesources/birthdays/resourcetdeabcconfig.cpp index 0f9b3279..4b3b0a1d 100644 --- a/tderesources/birthdays/resourcetdeabcconfig.cpp +++ b/tderesources/birthdays/resourcetdeabcconfig.cpp @@ -61,13 +61,13 @@ ResourceTDEABCConfig::ResourceTDEABCConfig( TQWidget* parent, const char* name mCategoryView->setEnabled( false ); topLayout->addMultiCellWidget( mCategoryView, 4, 4, 0, 1 ); - connect( mUseCategories, TQT_SIGNAL( toggled( bool ) ), - mCategoryView, TQT_SLOT( setEnabled( bool ) ) ); + connect( mUseCategories, TQ_SIGNAL( toggled( bool ) ), + mCategoryView, TQ_SLOT( setEnabled( bool ) ) ); mAlarmTimeEdit->setDisabled(true); mALabel->setDisabled(true); - connect(mAlarm, TQT_SIGNAL(clicked()), TQT_SLOT(alarmClicked())); + connect(mAlarm, TQ_SIGNAL(clicked()), TQ_SLOT(alarmClicked())); setReadOnly( true ); diff --git a/tderesources/birthdays/resourcetdeabcconfig.h b/tderesources/birthdays/resourcetdeabcconfig.h index 80efd02b..88ade268 100644 --- a/tderesources/birthdays/resourcetdeabcconfig.h +++ b/tderesources/birthdays/resourcetdeabcconfig.h @@ -40,7 +40,7 @@ namespace KCal { */ class ResourceTDEABCConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceTDEABCConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tderesources/birthdays/tdeabc.desktop b/tderesources/birthdays/tdeabc.desktop index aafbce9c..44c6c369 100644 --- a/tderesources/birthdays/tdeabc.desktop +++ b/tderesources/birthdays/tdeabc.desktop @@ -1,59 +1,6 @@ [Desktop Entry] Name=Birthdays From KAddressBook -Name[af]=Verjaarsdae uit KAddressBook -Name[ar]=تواريخ الميلد من KAddressBook -Name[be]=Дні нараджэння з K Адраснай кнігі -Name[bg]=Рождени дни от адресника -Name[br]=Deizioù-ha-bloazioù eus KAddressBook -Name[bs]=Rođendani iz KAddressBook adresara -Name[ca]=Aniversaris des de KAddressBook -Name[cs]=Narozeniny z Knihy adres -Name[cy]=Penblwyddi o KLlyfrCyfeiriadau -Name[da]=Fødselsdage fra KAddressBook -Name[de]=Geburtstage aus dem Adressbuch -Name[el]=Γενέθλια από το KAddressBook -Name[eo]=Naskiĝdatoj de KAdresaro -Name[es]=Cumpleaños desde KAddressBook -Name[et]=Sünnipäevad TDE aadressiraamatust -Name[eu]=Urtebetetzeak KAddressBook-etik -Name[fa]=تولدها از KAddressBook -Name[fi]=Syntymäpäivät TDE:n osoitekirjasta -Name[fr]=Dates de naissance de KAddressBook -Name[fy]=Jierddagen út KAddressBook -Name[ga]=Breithlaethanta ó KAddressBook -Name[gl]=Cumpreanos de KAddressBook -Name[he]=ימי הולדת מתוך KAddressBook -Name[hi]=के-एड्रेस-बुक से जन्मतिथि -Name[hu]=Születésnapok a KAddressBookból -Name[is]=Afmælisdagar úr KAddressBook -Name[it]=Compleanni da KAddessBook -Name[ja]=アドレス帳の誕生日 -Name[kk]=KAddressBook-тағы туған күндер -Name[km]=ថ្ងៃខួបកំណើតពី KAddressBook -Name[lt]=Gimtadieniai iš KAddressBook -Name[mk]=Родендени од КАдресар -Name[ms]=Tarikh Lahir dari KAddressBook -Name[nb]=Bursdagsimport fra KAddressbook -Name[nds]=Geboortsdaag ut KAdressbook -Name[ne]=केडीई ठेगाना पुस्तिकामा भएका जन्मदिन -Name[nl]=Verjaardagen uit KAddressBook -Name[nn]=Fødselsdagar frå TDE-adresseboka -Name[pl]=Urodziny z Książki adresowej -Name[pt]=Aniversários do KAddressBook -Name[pt_BR]=Datas de Nascimento do KAddressBook -Name[ro]=Date de naştere din KAddressBook -Name[ru]=Дни рождения из адресной книги TDE -Name[sk]=Dátumy narodenia z adresára TDE -Name[sl]=Rojstni dnevi iz Adresarja -Name[sr]=Рођендани из KAddressBook-а -Name[sr@Latn]=Rođendani iz KAddressBook-a -Name[sv]=Födelsedagar från adressboken -Name[ta]=கேமுகவரிபுத்தகத்தில் இருந்து பிறந்ததேதிகள் -Name[tg]=Рӯзҳои таваллуд аз китоби адресии TDE -Name[tr]=TDE Adres Defterinden Doğum Günleri -Name[uk]=Дні народження з KAddressBook -Name[zh_CN]=KAddressBook 中的生日 -Name[zh_TW]=自 KaddressBook 匯入生日 + X-TDE-Library=kcal_tdeabc Type=Service X-TDE-ServiceTypes=TDEResources/Plugin 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..2e401d8f 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; @@ -35,7 +35,7 @@ namespace KCal { */ class KDE_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..7d69f830 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 { - 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: diff --git a/tderesources/caldav/CMakeLists.txt b/tderesources/caldav/CMakeLists.txt index b43b5461..33471c22 100644 --- a/tderesources/caldav/CMakeLists.txt +++ b/tderesources/caldav/CMakeLists.txt @@ -28,9 +28,11 @@ link_directories( ##### other data ################################ -install( - FILES kcal_caldav.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +tde_create_translated_desktop( + SOURCE kcal_caldav.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) ##### kcal_caldav (module) ###################### diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp index b83660f8..4a9888ea 100644 --- a/tderesources/caldav/config.cpp +++ b/tderesources/caldav/config.cpp @@ -167,12 +167,12 @@ void ResourceCalDavConfig::setupUI() { mainLayout->addWidget(mRememberPassword, 8, 1); mTasksUrl->setEnabled(mUseSTasks->isChecked()); - connect( mUseSTasks, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotSTasksToggled( bool ) ) ); + connect( mUseSTasks, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotSTasksToggled( bool ) ) ); mJournalsUrl->setEnabled(mUseSJournals->isChecked()); - connect( mUseSJournals, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotSJournalsToggled( bool ) ) ); + connect( mUseSJournals, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotSJournalsToggled( bool ) ) ); // configs TQHBoxLayout* horizontal = new TQHBoxLayout(this); diff --git a/tderesources/caldav/config.h b/tderesources/caldav/config.h index fe03114c..4dec65f3 100644 --- a/tderesources/caldav/config.h +++ b/tderesources/caldav/config.h @@ -39,7 +39,7 @@ class CalDavSaveConfig; */ class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp index db620741..9f4f1e11 100644 --- a/tderesources/caldav/configwidgets.cpp +++ b/tderesources/caldav/configwidgets.cpp @@ -103,8 +103,8 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) d->mGroup->insert( automaticReloadOnStartup, 1 ); d->mGroup->insert( noAutomaticReload, 0 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); @@ -113,7 +113,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setRange( 1, 900 ); d->mIntervalSpin->setEnabled( false ); - groupBox->setColumnLayout(1, Qt::Vertical); + groupBox->setColumnLayout(1, TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); @@ -179,8 +179,8 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) d->mGroup->insert( onExit, 1 ); d->mGroup->insert( intervalRadio, 2 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); @@ -206,7 +206,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) intervalRadio->hide(); intervalBox->hide(); - groupBox->setColumnLayout(1, Qt::Vertical); + groupBox->setColumnLayout(1, TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(delay); vbox->addWidget(every); diff --git a/tderesources/caldav/configwidgets.h b/tderesources/caldav/configwidgets.h index 1e524844..5bee6aa9 100644 --- a/tderesources/caldav/configwidgets.h +++ b/tderesources/caldav/configwidgets.h @@ -49,7 +49,7 @@ class ResourceCached; */ class KDE_EXPORT CalDavReloadConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: explicit CalDavReloadConfig( TQWidget *parent = 0 ); @@ -76,7 +76,7 @@ class KDE_EXPORT CalDavReloadConfig : public TQWidget */ class KDE_EXPORT CalDavSaveConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: explicit CalDavSaveConfig( TQWidget *parent = 0 ); diff --git a/tderesources/caldav/kcal_caldav.desktop b/tderesources/caldav/kcal_caldav.desktop index ffdbd4d4..02d06ea3 100644 --- a/tderesources/caldav/kcal_caldav.desktop +++ b/tderesources/caldav/kcal_caldav.desktop @@ -1,50 +1,6 @@ [Desktop Entry] Name=CalDAV Server (e.g. Google Calendar) -Name[af]=CalDAV bediener (bv. Google Calendar) -Name[bg]=Сървър CalDAV (e.g. Google Calendar) -Name[br]=Servijer CalDAV (e.g. Google Calendar) -Name[ca]=Servidor CalDAV (p.ex. Google Calendar) -Name[cs]=CalDAV server (např. Google Calendar) -Name[da]=CalDAV-server (f.eks. Google Calendar) -Name[de]=CalDAV-Server (z. B. Google Calendar) -Name[el]=Εξυπηρετητής CalDAV (π.χ. Google Calendar) -Name[es]=Servidor CalDAV (por ejemplo, Google Calendar) -Name[et]=CalDAV server (nt. Google Calendar) -Name[eu]=CalDAV zerbitzaria (adib. Google Calendar) -Name[fa]=کارساز CalDAV (مثلاً Google Calendar) -Name[fi]=CalDAV-palvelin (esim. Google Calendar) -Name[fr]=CalDAV Serveur (ex. Google Calendar) -Name[fy]=CalDAV-tsjinner (Google Calendar) -Name[ga]=Freastalaí CalDAV (m.sh. Google Calendar) -Name[gl]=Servidor CalDAV (e.g. Google Calendar) -Name[hu]=CalDAV-kiszolgáló (pl. Google Calendar) -Name[is]=CalDAV þjónn (t.d. Google Calendar) -Name[it]=Server CalDAV (per es. Google Calendar) -Name[ja]=CalDAV サーバ (例 Google Calendar) -Name[ka]=სერვერი CalDAV (მაგ., Google Calendar) -Name[kk]=CalDAV сервері (мысалы Google Calendar) -Name[km]=ម៉ាស៊ីនបម្រើ CalDAV (ឧ. Google Calendar) -Name[lt]=CalDAV serveris (pvz.: Google Calendar) -Name[ms]=Pelayan CalDAV (misalnya Google Calendar) -Name[nb]=CalDAV-tjener (f.eks. Google Calendar) -Name[nds]=CalDAV-Server (t.B. Google Calendar) -Name[ne]=समूह DAV सर्भर (जस्तै: खुला ग्रुपवेयर) -Name[nl]=CalDAV-server (Google Calendar) -Name[nn]=CalDAV-tenar (t.d. Google Calendar) -Name[pl]=Serwer CalDAV (np. Google Calendar) -Name[pt]=Servidor CalDAV (por exemplo Google Calendar) -Name[pt_BR]=Servidor GroupDav (p. ex. Google Calendar) -Name[ru]=Сервер CalDAV (например, Google Calendar) -Name[sk]=CalDAV Server (napr. Google Calendar) -Name[sl]=Strežnik CalDAV (npr. Google Calendar) -Name[sr]=CalDAV сервер (нпр. Google Calendar) -Name[sr@Latn]=CalDAV server (npr. Google Calendar) -Name[sv]=CalDAV-server (t.ex. Google Calendar) -Name[ta]=CalDAV சேவகன் (e.g. Google Calendar) -Name[tr]=CalDAV Sunucusu (ör. Google Calendar) -Name[uk]=Сервер CalDAV (напр., Google Calendar) -Name[zh_CN]=CalDAV 服务器(如 Google Calendar) -Name[zh_TW]=CalDAV 伺服器 (如: Google Calendar) + X-TDE-Library=kcal_caldav Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp index 8fae5c98..2c63da22 100644 --- a/tderesources/caldav/resource.cpp +++ b/tderesources/caldav/resource.cpp @@ -197,7 +197,7 @@ bool ResourceCalDav::doSave() { clearChanges(); if (mWriteRetryTimer != NULL) { if (mWriteRetryTimer->isActive() == false) { - disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) ); + disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) ); delete mWriteRetryTimer; mWriteRetryTimer = NULL; } @@ -249,8 +249,8 @@ void ResourceCalDav::init() { // creating jobs // TQt4 handles this quite differently, as shown below, // whereas TQt3 needs events (see ::event()) -// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished())); -// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished())); +// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished())); +// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished())); setType("ResourceCalDav"); } @@ -850,7 +850,7 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl, if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) { if (mWriteRetryTimer == NULL) { mWriteRetryTimer = new TQTimer(this); - connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) ); + connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) ); } mWriteRetryTimer->start(1000, TRUE); return false; @@ -995,7 +995,7 @@ void ResourceCalDav::writingFinished() { } // Give the remote system a few seconds to process the data before we allow any read operations - TQTimer::singleShot( 3000, this, TQT_SLOT(releaseReadLockout()) ); + TQTimer::singleShot( 3000, this, TQ_SLOT(releaseReadLockout()) ); // Writing queue and mWritingQueueReady flag are not shared resources, i.e. only one thread has an access to them. // That's why no mutexes are required. diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h index 2d0c3ec0..7e4bbdc5 100644 --- a/tderesources/caldav/resource.h +++ b/tderesources/caldav/resource.h @@ -26,7 +26,7 @@ #include <tdeabc/locknull.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeconfig.h> namespace KCal { @@ -43,7 +43,7 @@ class CalDavWriter; */ class KDE_EXPORT ResourceCalDav : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/carddav/CMakeLists.txt b/tderesources/carddav/CMakeLists.txt index 11e139a2..4d821af0 100644 --- a/tderesources/carddav/CMakeLists.txt +++ b/tderesources/carddav/CMakeLists.txt @@ -28,9 +28,11 @@ link_directories( ##### other data ################################ -install( - FILES tdeabc_carddav.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +tde_create_translated_desktop( + SOURCE tdeabc_carddav.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc + PO_DIR tderesources-desktops +) ##### tdeabc_carddav (module) ##################### diff --git a/tderesources/carddav/config.h b/tderesources/carddav/config.h index e9919723..027dc069 100644 --- a/tderesources/carddav/config.h +++ b/tderesources/carddav/config.h @@ -38,7 +38,7 @@ class CardDavSaveConfig; */ class KDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp index d0e55a5f..60fc5ed2 100644 --- a/tderesources/carddav/configwidgets.cpp +++ b/tderesources/carddav/configwidgets.cpp @@ -102,8 +102,8 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent ) d->mGroup->insert( automaticReloadOnStartup, 1 ); d->mGroup->insert( noAutomaticReload, 0 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); @@ -112,7 +112,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setRange( 1, 900 ); d->mIntervalSpin->setEnabled( false ); - groupBox->setColumnLayout(1, Qt::Vertical); + groupBox->setColumnLayout(1, TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); @@ -178,8 +178,8 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent ) d->mGroup->insert( onExit, 1 ); d->mGroup->insert( intervalRadio, 2 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); @@ -205,7 +205,7 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent ) intervalRadio->hide(); intervalBox->hide(); - groupBox->setColumnLayout(1, Qt::Vertical); + groupBox->setColumnLayout(1, TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(delay); vbox->addWidget(every); diff --git a/tderesources/carddav/configwidgets.h b/tderesources/carddav/configwidgets.h index f63535c9..3fcb10f8 100644 --- a/tderesources/carddav/configwidgets.h +++ b/tderesources/carddav/configwidgets.h @@ -48,7 +48,7 @@ class ResourceCached; */ class KDE_EXPORT CardDavReloadConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: explicit CardDavReloadConfig( TQWidget *parent = 0 ); @@ -75,7 +75,7 @@ class KDE_EXPORT CardDavReloadConfig : public TQWidget */ class KDE_EXPORT CardDavSaveConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: explicit CardDavSaveConfig( TQWidget *parent = 0 ); diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp index 69eb98e4..ddd6928e 100644 --- a/tderesources/carddav/resource.cpp +++ b/tderesources/carddav/resource.cpp @@ -197,7 +197,7 @@ bool ResourceCardDav::doSave() { clearChanges(); if (mWriteRetryTimer != NULL) { if (mWriteRetryTimer->isActive() == false) { - disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) ); + disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) ); delete mWriteRetryTimer; mWriteRetryTimer = NULL; } @@ -256,8 +256,8 @@ void ResourceCardDav::init() { // creating jobs // TQt4 handles this quite differently, as shown below, // whereas TQt3 needs events (see ::event()) -// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished())); -// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished())); +// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished())); +// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished())); setType("ResourceCardDav"); } @@ -609,7 +609,7 @@ bool ResourceCardDav::startWriting(const TQString& url) { if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) { if (mWriteRetryTimer == NULL) { mWriteRetryTimer = new TQTimer(this); - connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) ); + connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) ); } mWriteRetryTimer->start(1000, TRUE); return false; diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h index caec0d07..e255714a 100644 --- a/tderesources/carddav/resource.h +++ b/tderesources/carddav/resource.h @@ -25,7 +25,7 @@ #include <tdeabc/locknull.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeconfig.h> namespace TDEABC { @@ -42,7 +42,7 @@ class CardDavWriter; */ class KDE_EXPORT ResourceCardDav : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/carddav/tdeabc_carddav.desktop b/tderesources/carddav/tdeabc_carddav.desktop index a1efd4ab..fed13fe3 100644 --- a/tderesources/carddav/tdeabc_carddav.desktop +++ b/tderesources/carddav/tdeabc_carddav.desktop @@ -1,50 +1,6 @@ [Desktop Entry] Name=CardDAV Server (e.g. Zimbra Contacts) -Name[af]=CardDAV bediener (bv. Zimbra Contacts) -Name[bg]=Сървър CardDAV (e.g. Zimbra Contacts) -Name[br]=Servijer CardDAV (e.g. Zimbra Contacts) -Name[ca]=Servidor CardDAV (p.ex. Zimbra Contacts) -Name[cs]=CardDAV server (např. Zimbra Contacts) -Name[da]=CardDAV-server (f.eks. Zimbra Contacts) -Name[de]=CardDAV-Server (z. B. Zimbra Contacts) -Name[el]=Εξυπηρετητής CardDAV (π.χ. Zimbra Contacts) -Name[es]=Servidor CardDAV (por ejemplo, Zimbra Contacts) -Name[et]=CardDAV server (nt. Zimbra Contacts) -Name[eu]=CardDAV zerbitzaria (adib. Zimbra Contacts) -Name[fa]=کارساز CardDAV (مثلاً Zimbra Contacts) -Name[fi]=CardDAV-palvelin (esim. Zimbra Contacts) -Name[fr]=CardDAV Serveur (ex. Zimbra Contacts) -Name[fy]=CardDAV-tsjinner (Zimbra Contacts) -Name[ga]=Freastalaí CardDAV (m.sh. Zimbra Contacts) -Name[gl]=Servidor CardDAV (e.g. Zimbra Contacts) -Name[hu]=CardDAV-kiszolgáló (pl. Zimbra Contacts) -Name[is]=CardDAV þjónn (t.d. Zimbra Contacts) -Name[it]=Server CardDAV (per es. Zimbra Contacts) -Name[ja]=CardDAV サーバ (例 Zimbra Contacts) -Name[ka]=სერვერი CardDAV (მაგ., Zimbra Contacts) -Name[kk]=CardDAV сервері (мысалы Zimbra Contacts) -Name[km]=ម៉ាស៊ីនបម្រើ CardDAV (ឧ. Zimbra Contacts) -Name[lt]=CardDAV serveris (pvz.: Zimbra Contacts) -Name[ms]=Pelayan CardDAV (misalnya Zimbra Contacts) -Name[nb]=CardDAV-tjener (f.eks. Zimbra Contacts) -Name[nds]=CardDAV-Server (t.B. Zimbra Contacts) -Name[ne]=समूह DAV सर्भर (जस्तै: खुला ग्रुपवेयर) -Name[nl]=CardDAV-server (Zimbra Contacts) -Name[nn]=CardDAV-tenar (t.d. Zimbra Contacts) -Name[pl]=Serwer CardDAV (np. Zimbra Contacts) -Name[pt]=Servidor CardDAV (por exemplo Zimbra Contacts) -Name[pt_BR]=Servidor GroupDav (p. ex. Zimbra Contacts) -Name[ru]=Сервер CardDAV (например, Zimbra Contacts) -Name[sk]=CardDAV Server (napr. Zimbra Contacts) -Name[sl]=Strežnik CardDAV (npr. Zimbra Contacts) -Name[sr]=CardDAV сервер (нпр. Zimbra Contacts) -Name[sr@Latn]=CardDAV server (npr. Zimbra Contacts) -Name[sv]=CardDAV-server (t.ex. Zimbra Contacts) -Name[ta]=CardDAV சேவகன் (e.g. Zimbra Contacts) -Name[tr]=CardDAV Sunucusu (ör. Zimbra Contacts) -Name[uk]=Сервер CardDAV (напр., Zimbra Contacts) -Name[zh_CN]=CardDAV 服务器(如 Zimbra Contacts) -Name[zh_TW]=CardDAV 伺服器 (如: Zimbra Contacts) + X-TDE-Library=tdeabc_carddav Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/egroupware/CMakeLists.txt b/tderesources/egroupware/CMakeLists.txt index 11fe32a8..99d12624 100644 --- a/tderesources/egroupware/CMakeLists.txt +++ b/tderesources/egroupware/CMakeLists.txt @@ -33,9 +33,23 @@ install( FILES ##### other data ################################ -install( FILES tdeabc_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) -install( FILES kcal_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -install( FILES knotes_xmlrpc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) +tde_create_translated_desktop( + SOURCE tdeabc_xmlrpc.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc + PO_DIR tderesources-desktops +) + +tde_create_translated_desktop( + SOURCE kcal_xmlrpc.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) + +tde_create_translated_desktop( + SOURCE knotes_xmlrpc.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes + PO_DIR tderesources-desktops +) ##### egwcommon (static) ######################## diff --git a/tderesources/egroupware/debugdialog.h b/tderesources/egroupware/debugdialog.h index bde17988..008e881e 100644 --- a/tderesources/egroupware/debugdialog.h +++ b/tderesources/egroupware/debugdialog.h @@ -31,7 +31,7 @@ class KTextBrowser; */ class DebugDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp index 676770ed..9ccc24b5 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp @@ -197,8 +197,8 @@ bool ResourceXMLRPC::doOpen() args.insert( "password", mPrefs->password() ); mServer->call( "system.login", TQVariant( args ), - this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -214,8 +214,8 @@ void ResourceXMLRPC::doClose() args.insert( "kp3", mKp3 ); mServer->call( "system.logout", TQVariant( args ), - this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); } @@ -243,8 +243,8 @@ bool ResourceXMLRPC::doLoad() args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) ); mServer->call( SearchEventsCommand, args, - this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); args.clear(); columns.insert( "type", "task" ); @@ -253,16 +253,16 @@ bool ResourceXMLRPC::doLoad() args.insert( "order", "id_parent" ); mServer->call( SearchTodosCommand, args, - this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadEventCategoriesCommand, TQVariant( TQStringVariantMap() ), - this, TQT_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadTodoCategoriesCommand, TQVariant( false ), - this, TQT_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); return true; } @@ -286,8 +286,8 @@ bool ResourceXMLRPC::doSave() args.insert( "id", idMapper().remoteId( (*evIt)->uid() ).toInt() ); mServer->call( AddEventCommand, TQVariant( args ), - this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); counter++; } } @@ -302,8 +302,8 @@ bool ResourceXMLRPC::doSave() args.insert( "id", idMapper().remoteId( (*todoIt)->uid() ).toInt() ); mServer->call( AddTodoCommand, TQVariant( args ), - this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); counter++; } } @@ -340,8 +340,8 @@ bool ResourceXMLRPC::addEvent( Event* ev ) writeEvent( ev, args ); args.insert( "id", idMapper().remoteId( ev->uid() ).toInt() ); mServer->call( AddEventCommand, TQVariant( args ), - this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mCalendar.deleteIncidence( oldEvent ); mCalendar.addIncidence( ev ); @@ -350,8 +350,8 @@ bool ResourceXMLRPC::addEvent( Event* ev ) } else { // new event writeEvent( ev, args ); mServer->call( AddEventCommand, TQVariant( args ), - this, TQT_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( ev->uid() ) ); mCalendar.addEvent( ev ); @@ -369,9 +369,9 @@ bool ResourceXMLRPC::deleteEvent( Event* ev ) return false; mServer->call( DeleteEventCommand, idMapper().remoteId( ev->uid() ).toInt(), - this, TQT_SLOT( deleteEventFinished( const TQValueList<TQVariant>&, + this, TQ_SLOT( deleteEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( ev->uid() ) ); return true; } @@ -420,8 +420,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo ) writeTodo( todo, args ); args.insert( "id", idMapper().remoteId( todo->uid() ).toInt() ); mServer->call( AddTodoCommand, TQVariant( args ), - this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mCalendar.deleteIncidence( oldTodo ); mCalendar.addIncidence( todo ); @@ -430,8 +430,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo ) } else { // new todo writeTodo( todo, args ); mServer->call( AddTodoCommand, TQVariant( args ), - this, TQT_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( todo->uid() ) ); mCalendar.addTodo( todo ); @@ -449,9 +449,9 @@ bool ResourceXMLRPC::deleteTodo( Todo *todo ) return false; mServer->call( DeleteTodoCommand, idMapper().remoteId( todo->uid() ).toInt(), - this, TQT_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&, + this, TQ_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( todo->uid() ) ); return true; } diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h index 776bc68b..b3eef632 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.h +++ b/tderesources/egroupware/kcal_resourcexmlrpc.h @@ -29,7 +29,7 @@ #include <tdeconfig.h> #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libkcal/calendarlocal.h" #include "libkcal/incidence.h" @@ -52,7 +52,7 @@ class EGroupwarePrefs; */ class KDE_EXPORT ResourceXMLRPC : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h index 2790717f..0cd619c0 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KIntSpinBox; class KLineEdit; @@ -32,7 +32,7 @@ namespace KCal { class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/egroupware/kcal_xmlrpc.desktop b/tderesources/egroupware/kcal_xmlrpc.desktop index 99aa303e..65be66e5 100644 --- a/tderesources/egroupware/kcal_xmlrpc.desktop +++ b/tderesources/egroupware/kcal_xmlrpc.desktop @@ -1,48 +1,6 @@ [Desktop Entry] Name=eGroupware Server (via XML-RPC) -Name[af]=eGroupware Bediener (via XML-RPC) -Name[bg]=Сървър eGroupware (чрез XML-RPC) -Name[br]=Servijer eGroupware (gant XML-RPC) -Name[ca]=Servidor eGroupware (via XML-RPC) -Name[cs]=eGroupware Server (přes XML-RPC) -Name[da]=eGroupware server (via XML-RPC) -Name[el]=Εξυπηρετητής eGroupware (μέσω XML-RPC) -Name[es]=Servidor de eGroupware (por medio de XML-RPC) -Name[et]=eGroupware server (XML-RPC vahendusel) -Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) -Name[fa]=کارساز eGroupware (از طریق XML-RPC) -Name[fi]=eGroupware-palvelin (XML-RPC kautta) -Name[fr]=Serveur eGroupware (via XML-RPC) -Name[fy]=eGroupware-tsjinner (fia XML-RPC) -Name[ga]=Freastalaí eGroupware (via XML-RPC) -Name[gl]=Servidor eGroupware (mediante XML-RPC) -Name[hu]=eGroupware-kiszolgáló (XML-RPC-n keresztül) -Name[is]=eGroupware þjónn (gegnum XML-RPC) -Name[it]=Server eGroupware (via XML-RPC) -Name[ja]=eGroupware サーバ (XML-RPC 経由) -Name[kk]=eGroupware сервері (XML-RPC арқылы) -Name[km]=ម៉ាស៊ីនបម្រើ eGroupware (តាមរយៈ XML-RPC) -Name[lt]=eGroupware serveris (per XML-RPC) -Name[ms]=Pelayan eGroupware (melalui XML-RPC) -Name[nb]=eGroupware-tjener (via XML-RPPC) -Name[nds]=eGroupware-Server (över XML-RPC) -Name[ne]=(XML-RPC मार्फत) eGroupware सर्भर -Name[nl]=eGroupware-server (via XML-RPC) -Name[nn]=eGroupware-tenar (via XML-RPC) -Name[pl]=Serwer eGroupware (poprzez XML-RPC) -Name[pt]=Servidor eGroupware (via XML-RPC) -Name[pt_BR]=Servidor eGroupware (via XML-RPC) -Name[ru]=Сервер eGroupware (через XML-RPC) -Name[sk]=eGroupware Server (cez XML-RPC) -Name[sl]=Strežnik eGroupware (preko XML-RPC) -Name[sr]=eGroupware сервер (преко XML-RPC) -Name[sr@Latn]=eGroupware server (preko XML-RPC) -Name[sv]=eGroupware-server (via XML-RPC) -Name[ta]=eGroupware சேவகன் (via XML-RPC) -Name[tr]=eGroupware Sunucusu (XML-RPC ile) -Name[uk]=Сервер eGroupware (через XML-RPC) -Name[zh_CN]=eGroupware 服务器(通过 XML-RPC) -Name[zh_TW]=eGroupware 伺服器(透過 XML-RPC) + X-TDE-Library=kcal_xmlrpc Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp index 9a477076..05306c87 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp @@ -123,8 +123,8 @@ bool ResourceXMLRPC::load() args.insert( "password", mPrefs->password() ); mServer->call( "system.login", TQVariant( args ), - this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -135,8 +135,8 @@ bool ResourceXMLRPC::load() args.insert( "order", "id_parent" ); mServer->call( SearchNotesCommand, args, - this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -163,15 +163,15 @@ bool ResourceXMLRPC::addNote( KCal::Journal *journal ) writeNote( journal, args ); args.insert( "id", mUidMap[ journal->uid() ].toInt() ); mServer->call( AddNoteCommand, TQVariant( args ), - this, TQT_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mCalendar.addJournal( journal ); added = true; } } else { mServer->call( AddNoteCommand, TQVariant( args ), - this, TQT_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( journal->uid() ) ); mCalendar.addJournal( journal ); @@ -189,8 +189,8 @@ bool ResourceXMLRPC::deleteNote( KCal::Journal *journal ) int id = mUidMap[ journal->uid() ].toInt(); mServer->call( DeleteNoteCommand, id, - this, TQT_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( journal->uid() ) ); mSynchronizer->start(); diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h index 2e91d66f..e0b19cfc 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.h +++ b/tderesources/egroupware/knotes_resourcexmlrpc.h @@ -27,7 +27,7 @@ #include <tdeconfig.h> #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libkcal/calendarlocal.h" #include "libkcal/journal.h" @@ -48,7 +48,7 @@ class EGroupwarePrefs; */ class KDE_EXPORT ResourceXMLRPC : public ResourceNotes { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h index e087dbe2..25557d4f 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KIntSpinBox; class KLineEdit; @@ -32,7 +32,7 @@ namespace KNotes { class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/egroupware/knotes_xmlrpc.desktop b/tderesources/egroupware/knotes_xmlrpc.desktop index b2dc070b..925852e7 100644 --- a/tderesources/egroupware/knotes_xmlrpc.desktop +++ b/tderesources/egroupware/knotes_xmlrpc.desktop @@ -1,48 +1,6 @@ [Desktop Entry] Name=eGroupware Server (via XML-RPC) -Name[af]=eGroupware Bediener (via XML-RPC) -Name[bg]=Сървър eGroupware (чрез XML-RPC) -Name[br]=Servijer eGroupware (gant XML-RPC) -Name[ca]=Servidor eGroupware (via XML-RPC) -Name[cs]=eGroupware Server (přes XML-RPC) -Name[da]=eGroupware server (via XML-RPC) -Name[el]=Εξυπηρετητής eGroupware (μέσω XML-RPC) -Name[es]=Servidor de eGroupware (por medio de XML-RPC) -Name[et]=eGroupware server (XML-RPC vahendusel) -Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) -Name[fa]=کارساز eGroupware (از طریق XML-RPC) -Name[fi]=eGroupware-palvelin (XML-RPC kautta) -Name[fr]=Serveur eGroupware (via XML-RPC) -Name[fy]=eGroupware-tsjinner (fia XML-RPC) -Name[ga]=Freastalaí eGroupware (via XML-RPC) -Name[gl]=Servidor eGroupware (mediante XML-RPC) -Name[hu]=eGroupware-kiszolgáló (XML-RPC-n keresztül) -Name[is]=eGroupware þjónn (gegnum XML-RPC) -Name[it]=Server eGroupware (via XML-RPC) -Name[ja]=eGroupware サーバ (XML-RPC 経由) -Name[kk]=eGroupware сервері (XML-RPC арқылы) -Name[km]=ម៉ាស៊ីនបម្រើ eGroupware (តាមរយៈ XML-RPC) -Name[lt]=eGroupware serveris (per XML-RPC) -Name[ms]=Pelayan eGroupware (melalui XML-RPC) -Name[nb]=eGroupware-tjener (via XML-RPPC) -Name[nds]=eGroupware-Server (över XML-RPC) -Name[ne]=(XML-RPC मार्फत) eGroupware सर्भर -Name[nl]=eGroupware-server (via XML-RPC) -Name[nn]=eGroupware-tenar (via XML-RPC) -Name[pl]=Serwer eGroupware (poprzez XML-RPC) -Name[pt]=Servidor eGroupware (via XML-RPC) -Name[pt_BR]=Servidor eGroupware (via XML-RPC) -Name[ru]=Сервер eGroupware (через XML-RPC) -Name[sk]=eGroupware Server (cez XML-RPC) -Name[sl]=Strežnik eGroupware (preko XML-RPC) -Name[sr]=eGroupware сервер (преко XML-RPC) -Name[sr@Latn]=eGroupware server (preko XML-RPC) -Name[sv]=eGroupware-server (via XML-RPC) -Name[ta]=eGroupware சேவகன் (via XML-RPC) -Name[tr]=eGroupware Sunucusu (XML-RPC ile) -Name[uk]=Сервер eGroupware (через XML-RPC) -Name[zh_CN]=eGroupware 服务器(通过 XML-RPC) -Name[zh_TW]=eGroupware 伺服器(透過 XML-RPC) + X-TDE-Library=knotes_xmlrpc Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/egroupware/synchronizer.h b/tderesources/egroupware/synchronizer.h index ed9fd135..9e14fd93 100644 --- a/tderesources/egroupware/synchronizer.h +++ b/tderesources/egroupware/synchronizer.h @@ -37,8 +37,8 @@ ... job = TDEIO::file_copy( url, file, -1, true ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); mSynchronizer.start(); // will block here until the slot was called ... diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp index dd791cd8..4e95f792 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp @@ -159,8 +159,8 @@ bool ResourceXMLRPC::doOpen() args.insert( "password", mPrefs->password() ); mServer->call( "system.login", TQVariant( args ), - this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -174,8 +174,8 @@ void ResourceXMLRPC::doClose() args.insert( "kp3", mKp3 ); mServer->call( "system.logout", TQVariant( args ), - this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); } @@ -205,16 +205,16 @@ bool ResourceXMLRPC::asyncLoad() args.insert( "include_users", "calendar" ); mServer->call( SearchContactsCommand, args, - this, TQT_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadCategoriesCommand, TQVariant( false ), - this, TQT_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadCustomFieldsCommand, TQVariant( TQValueList<TQVariant>() ), - this, TQT_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); return true; } @@ -253,8 +253,8 @@ void ResourceXMLRPC::addContact( const Addressee& addr ) writeContact( addr, args ); mServer->call( AddContactCommand, args, - this, TQT_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } @@ -270,8 +270,8 @@ void ResourceXMLRPC::updateContact( const Addressee& addr ) args.insert( "id", idMapper().remoteId( addr.uid() ) ); mServer->call( AddContactCommand, args, - this, TQT_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } @@ -284,8 +284,8 @@ void ResourceXMLRPC::deleteContact( const Addressee& addr ) } mServer->call( DeleteContactCommand, idMapper().remoteId( addr.uid() ), - this, TQT_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h index 6458b809..d671912a 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h @@ -22,7 +22,7 @@ #define TDEABC_RESOURCEXMLRPC_H #include <tqmap.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "libtdepim/tdeabcresourcecached.h" @@ -39,7 +39,7 @@ class EGroupwarePrefs; class KDE_EXPORT ResourceXMLRPC : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h index f4893c84..6208f684 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h +++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h @@ -22,7 +22,7 @@ #define RESOURCEXMLRPCCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class KURLRequester; @@ -31,7 +31,7 @@ namespace TDEABC { class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/egroupware/tdeabc_xmlrpc.desktop b/tderesources/egroupware/tdeabc_xmlrpc.desktop index cfd5bbcb..a723056c 100644 --- a/tderesources/egroupware/tdeabc_xmlrpc.desktop +++ b/tderesources/egroupware/tdeabc_xmlrpc.desktop @@ -1,48 +1,6 @@ [Desktop Entry] Name=eGroupware Server (via XML-RPC) -Name[af]=eGroupware Bediener (via XML-RPC) -Name[bg]=Сървър eGroupware (чрез XML-RPC) -Name[br]=Servijer eGroupware (gant XML-RPC) -Name[ca]=Servidor eGroupware (via XML-RPC) -Name[cs]=eGroupware Server (přes XML-RPC) -Name[da]=eGroupware server (via XML-RPC) -Name[el]=Εξυπηρετητής eGroupware (μέσω XML-RPC) -Name[es]=Servidor de eGroupware (por medio de XML-RPC) -Name[et]=eGroupware server (XML-RPC vahendusel) -Name[eu]=eGroupware zerbitzaria (XML-RPC bidez) -Name[fa]=کارساز eGroupware (از طریق XML-RPC) -Name[fi]=eGroupware-palvelin (XML-RPC kautta) -Name[fr]=Serveur eGroupware (via XML-RPC) -Name[fy]=eGroupware-tsjinner (fia XML-RPC) -Name[ga]=Freastalaí eGroupware (via XML-RPC) -Name[gl]=Servidor eGroupware (mediante XML-RPC) -Name[hu]=eGroupware-kiszolgáló (XML-RPC-n keresztül) -Name[is]=eGroupware þjónn (gegnum XML-RPC) -Name[it]=Server eGroupware (via XML-RPC) -Name[ja]=eGroupware サーバ (XML-RPC 経由) -Name[kk]=eGroupware сервері (XML-RPC арқылы) -Name[km]=ម៉ាស៊ីនបម្រើ eGroupware (តាមរយៈ XML-RPC) -Name[lt]=eGroupware serveris (per XML-RPC) -Name[ms]=Pelayan eGroupware (melalui XML-RPC) -Name[nb]=eGroupware-tjener (via XML-RPPC) -Name[nds]=eGroupware-Server (över XML-RPC) -Name[ne]=(XML-RPC मार्फत) eGroupware सर्भर -Name[nl]=eGroupware-server (via XML-RPC) -Name[nn]=eGroupware-tenar (via XML-RPC) -Name[pl]=Serwer eGroupware (poprzez XML-RPC) -Name[pt]=Servidor eGroupware (via XML-RPC) -Name[pt_BR]=Servidor eGroupware (via XML-RPC) -Name[ru]=Сервер eGroupware (через XML-RPC) -Name[sk]=eGroupware Server (cez XML-RPC) -Name[sl]=Strežnik eGroupware (preko XML-RPC) -Name[sr]=eGroupware сервер (преко XML-RPC) -Name[sr@Latn]=eGroupware server (preko XML-RPC) -Name[sv]=eGroupware-server (via XML-RPC) -Name[ta]=eGroupware சேவகன் (via XML-RPC) -Name[tr]=eGroupware Sunucusu (XML-RPC ile) -Name[uk]=Сервер eGroupware (через XML-RPC) -Name[zh_CN]=eGroupware 服务器(通过 XML-RPC) -Name[zh_TW]=eGroupware 伺服器(透過 XML-RPC) + X-TDE-Library=tdeabc_xmlrpc Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp index 4afb0b84..29d5563e 100644 --- a/tderesources/egroupware/xmlrpciface.cpp +++ b/tderesources/egroupware/xmlrpciface.cpp @@ -78,10 +78,10 @@ void Query::call( const TQString &server, const TQString &method, job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); job->addMetaData( "ConnectTimeout", "50" ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); m_pendingJobs.append( job ); } @@ -222,7 +222,7 @@ TQString Query::marshal( const TQVariant &arg ) const case TQVariant::ByteArray: return "<value><base64>" + KCodecs::base64Encode( arg.toByteArray() ) + "</base64></value>\r\n"; case TQVariant::DateTime: - return "<value><datetime.iso8601>" + arg.toDateTime().toString( Qt::ISODate ) + "</datetime.iso8601></value>\r\n"; + return "<value><datetime.iso8601>" + arg.toDateTime().toString( TQt::ISODate ) + "</datetime.iso8601></value>\r\n"; case TQVariant::List: { TQString markup = "<value><array><data>\r\n"; @@ -279,7 +279,7 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const else if ( typeName == "base64" ) return TQVariant( KCodecs::base64Decode( TQCString(typeElement.text().latin1()) ) ); else if ( typeName == "datetime" || typeName == "datetime.iso8601" ) - return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) ); + return TQVariant( TQDateTime::fromString( typeElement.text(), TQt::ISODate ) ); else if ( typeName == "array" ) { TQValueList<TQVariant> values; @@ -360,9 +360,9 @@ void Server::call( const TQString &method, const TQValueList<TQVariant> &args, kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl; Query *query = Query::create( id, this ); - connect( query, TQT_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot ); - connect( query, TQT_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot ); - connect( query, TQT_SIGNAL( finished( Query* ) ), this, TQT_SLOT( queryFinished( Query* ) ) ); + connect( query, TQ_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot ); + connect( query, TQ_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot ); + connect( query, TQ_SIGNAL( finished( Query* ) ), this, TQ_SLOT( queryFinished( Query* ) ) ); mPendingQueries.append( query ); query->call( m_url.url(), method, args, m_userAgent ); diff --git a/tderesources/egroupware/xmlrpciface.h b/tderesources/egroupware/xmlrpciface.h index df2f3a6d..fb2f23df 100644 --- a/tderesources/egroupware/xmlrpciface.h +++ b/tderesources/egroupware/xmlrpciface.h @@ -32,7 +32,7 @@ namespace KXMLRPC class Query : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -77,7 +77,7 @@ namespace KXMLRPC class Server : public TQObject { - Q_OBJECT + TQ_OBJECT public: Server( const KURL &url = KURL(), diff --git a/tderesources/exchange/CMakeLists.txt b/tderesources/exchange/CMakeLists.txt index fc2f9cc3..b3e107f7 100644 --- a/tderesources/exchange/CMakeLists.txt +++ b/tderesources/exchange/CMakeLists.txt @@ -27,7 +27,11 @@ link_directories( ##### other data ################################ -install( FILES exchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +tde_create_translated_desktop( + SOURCE exchange.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) ##### resourcecalendarexchange (module) ######### diff --git a/tderesources/exchange/exchange.desktop b/tderesources/exchange/exchange.desktop index 96f57cda..945c09b6 100644 --- a/tderesources/exchange/exchange.desktop +++ b/tderesources/exchange/exchange.desktop @@ -1,53 +1,8 @@ [Desktop Entry] +Name=Exchange 2000 Server + Type=Service X-TDE-Library=resourcecalendarexchange X-TDE-ResourceFamily=calendar X-TDE-ResourceType=exchange X-TDE-ServiceTypes=TDEResources/Plugin -Name=Exchange 2000 Server -Name[af]=Exchange 2000 Bediener -Name[be]=Сэрвэр Exchange 2000 -Name[bg]=Сървър Exchange 2000 -Name[br]=Servijer Exchange 2000 -Name[ca]=Servidor Exchange 2000 -Name[cs]=Exchange 2000 server -Name[da]=Exchange 2000 server -Name[el]=Εξυπηρετητής Exchange2000 -Name[es]=Servidor Exchange 2000 -Name[et]=Exchange 2000 server -Name[eu]=Exchange 2000 zerbitzaria -Name[fa]=کارساز Exchange ۲۰۰۰ -Name[fi]=Exchange 2000 -palvelin -Name[fr]=Serveur Exchange2000 -Name[fy]=Exchange2000-tsjinner -Name[ga]=Freastalaí Exchange 2000 -Name[gl]=Servidor Exchange 2000 -Name[hu]=Exchange 2000-kiszolgáló -Name[is]=Exchange 2000 þjónn -Name[it]=Server Exchange 2000 -Name[ja]=Exchange 2000 サーバ -Name[kk]=MS Exchange 2000 сервері -Name[km]=ម៉ាស៊ីនបម្រើ Exchange ២០០០ -Name[lt]=Exchange 2000 serveris -Name[mk]=Exchange 2000-сервер -Name[ms]=Pelayan Exchange 2000 -Name[nb]=Exchange 2000-tjener -Name[nds]=Exchange2000-Server -Name[ne]=एक्सचेन्ज 2000 सर्भर -Name[nl]=Exchange2000-server -Name[nn]=Exchange 2000-tenar -Name[pl]=Serwer Exchange 2000 -Name[pt]=Servidor Exchange 2000 -Name[pt_BR]=Servidor Exchange2000 -Name[ru]=Сервер Microsoft Exchange 2000 -Name[sk]=Exchange 2000 server -Name[sl]=Strežnik Exchange 2000 -Name[sr]=Exchange 2000 сервер -Name[sr@Latn]=Exchange 2000 server -Name[sv]=Exchange 2000-server -Name[ta]=பரிமாற்ற 2000 சேவகன் -Name[tr]=Exchange 2000 Sunucusu -Name[uk]=Сервер Exchange 2000 -Name[zh_CN]=Exchange 2000 服务器 -Name[zh_TW]=Exchange 2000 伺服器 - diff --git a/tderesources/exchange/exchange_deprecated.desktop b/tderesources/exchange/exchange_deprecated.desktop index eba22eed..69cb86cb 100644 --- a/tderesources/exchange/exchange_deprecated.desktop +++ b/tderesources/exchange/exchange_deprecated.desktop @@ -1,48 +1,4 @@ [Desktop Entry] Hidden=true -Name=Exchange 2000 Server (deprecated) -Name[af]=Exchange 2000 Bediener (nie verder ondersteun) -Name[bg]=Сървър Exchange 2000 (остаряло) -Name[ca]=Servidor Exchange 2000 (desaconsellat) -Name[cs]=Exchange 2000 server (zastaralé) -Name[da]=Exchange 2000 server (forældet) -Name[de]=Exchange 2000 Server (veraltet) -Name[el]=Εξυπηρετητής Exchange2000 (ξεπερασμένος) -Name[es]=Servidor Exchange 2000 (obsoleto) -Name[et]=Exchange 2000 server (iganenud) -Name[eu]=Exchange 2000 zerbitzaria (zaharkituta) -Name[fa]=کارسازExchange ۲۰۰۰ (محکوم) -Name[fi]=Exchange 2000 -palvelin (vanhentunut) -Name[fr]=Serveur Exchange2000 (désuet) -Name[fy]=Exchange 2000-tsjinner (ôfrieden) -Name[ga]=Freastalaí Exchange 2000 (as dáta) -Name[gl]=Servidor Exchange 2000 (desaprobado) -Name[hu]=Exchange 2000-kiszolgáló (elavult) -Name[is]=Exchange 2000 þjónn (úrelt) -Name[it]=Server Exchange 2000 (deprecato) -Name[ja]=Exchange 2000 サーバ (廃止予定) -Name[kk]=MS Exchange 2000 сервері (ескірген) -Name[km]=ម៉ាស៊ីនបម្រើ Exchange ២០០០ (មិនសូវល្អ) -Name[lt]=Exchange 2000 serveris (deprecated) -Name[mk]=Exchange 2000-сервер (застарено) -Name[ms]=Pelayan Exchange 2000 (tidak disetujui) -Name[nb]=Exchange 2000-tjener (frarådet) -Name[nds]=Exchange2000-Server (utlopen Ünnerstütten) -Name[ne]=एक्सचेन्ज २००० सर्भर (अनुचित ठानिएको) -Name[nl]=Exchange 2000-server (afgeraden) -Name[nn]=Exchange 2000-tenar (frårådd) -Name[pl]=Serwer Exchange 2000 (przestarzałe) -Name[pt]=Servidor Exchange 2000 (depreciado) -Name[pt_BR]=Servidor Exchange2000 (versão de compatibilidade) -Name[ru]=Сервер Microsoft Exchange 2000 (устаревший) -Name[sk]=Exchange 2000 server (deprecated) -Name[sl]=Strežnik Exchange 2000 (opuščeno) -Name[sr]=Exchange 2000 сервер (неодобраван) -Name[sr@Latn]=Exchange 2000 server (neodobravan) -Name[sv]=Exchange 2000-server (avråds från) -Name[ta]=பரிமாற்ற 2000 சேவகன் (மாறுபாடானது) -Name[tr]=Exchange 2000 Sunucusu -Name[uk]=Сервер Exchange 2000 (застаріле) -Name[zh_CN]=Exchange 2000 服务器(不推荐使用) -Name[zh_TW]=Exchange 2000 伺服器(已廢除) +Name=Exchange 2000 Server (deprecated) diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp index ae65f9cd..a2cbbed0 100644 --- a/tderesources/exchange/resourceexchange.cpp +++ b/tderesources/exchange/resourceexchange.cpp @@ -123,18 +123,18 @@ bool ResourceExchange::doOpen() kdDebug() << "ResourceExchange::doOpen()" << endl; mClient = new ExchangeClient( mAccount, mTimeZoneId ); - connect( mClient, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), - TQT_SLOT( slotDownloadFinished( int, const TQString & ) ) ); - connect( mClient, TQT_SIGNAL( event( KCal::Event *, const KURL & ) ), - TQT_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) ); + connect( mClient, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), + TQ_SLOT( slotDownloadFinished( int, const TQString & ) ) ); + connect( mClient, TQ_SIGNAL( event( KCal::Event *, const KURL & ) ), + TQ_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) ); #if 0 kdDebug() << "Creating monitor" << endl; TQHostAddress ip; ip.setAddress( mAccount->host() ); mMonitor = new ExchangeMonitor( mAccount, ExchangeMonitor::CallBack, ip ); - connect( mMonitor, TQT_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQT_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) ); - connect( mMonitor, TQT_SIGNAL(error(int , const TQString&)), this, TQT_SLOT(slotMonitorError(int , const TQString&)) ); + connect( mMonitor, TQ_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQ_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) ); + connect( mMonitor, TQ_SIGNAL(error(int , const TQString&)), this, TQ_SLOT(slotMonitorError(int , const TQString&)) ); mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 ); #endif diff --git a/tderesources/exchange/resourceexchange.h b/tderesources/exchange/resourceexchange.h index 120a4de9..23113dad 100644 --- a/tderesources/exchange/resourceexchange.h +++ b/tderesources/exchange/resourceexchange.h @@ -47,7 +47,7 @@ class CalFormat; // FIXME: Use ResourceCached class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp index 3b3bf14f..57ad9d0f 100644 --- a/tderesources/exchange/resourceexchangeconfig.cpp +++ b/tderesources/exchange/resourceexchangeconfig.cpp @@ -62,7 +62,7 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* n mAutoMailbox = new TQCheckBox( i18n( "Determine mailbox &automatically" ), this ); mainLayout->addMultiCellWidget( mAutoMailbox, 5, 5, 0, 1 ); - connect( mAutoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) ); + connect( mAutoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) ); mMailboxEdit = new KLineEdit( this ); mainLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), this ), 6, 0 ); @@ -70,11 +70,11 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* n mTryFindMailbox = new TQPushButton( i18n( "&Find" ), this ); mainLayout->addWidget( mTryFindMailbox, 6, 2 ); - connect( mTryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) ); + connect( mTryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) ); label = new TQLabel( i18n( "Cache timeout:" ), this ); mCacheEdit = new KIntNumInput( this ); - connect(mCacheEdit, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(slotCacheEditChanged( int ))); + connect(mCacheEdit, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(slotCacheEditChanged( int ))); mCacheEdit->setMinValue( 0 ); mainLayout->addWidget( label, 7, 0 ); mainLayout->addWidget( mCacheEdit, 7, 1 ); diff --git a/tderesources/exchange/resourceexchangeconfig.h b/tderesources/exchange/resourceexchangeconfig.h index c008c2ce..f9332bad 100644 --- a/tderesources/exchange/resourceexchangeconfig.h +++ b/tderesources/exchange/resourceexchangeconfig.h @@ -36,7 +36,7 @@ namespace KCal { class ResourceExchangeConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/featureplan/CMakeLists.txt b/tderesources/featureplan/CMakeLists.txt index 76e279c8..c5229c62 100644 --- a/tderesources/featureplan/CMakeLists.txt +++ b/tderesources/featureplan/CMakeLists.txt @@ -36,9 +36,11 @@ link_directories( ##### other data ################################ -install( FILES - kcal_resourcefeatureplan.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +tde_create_translated_desktop( + SOURCE kcal_resourcefeatureplan.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) ##### kcal_resourcefeatureplan (module) ######### diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.desktop b/tderesources/featureplan/kcal_resourcefeatureplan.desktop index c43a0c6b..69d648b4 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.desktop +++ b/tderesources/featureplan/kcal_resourcefeatureplan.desktop @@ -1,39 +1,6 @@ [Desktop Entry] Name=XML Feature Plan -Name[af]=XML eienskappe plan -Name[ca]=Pla de característiques XML -Name[cs]=XML plán vlastností -Name[da]=XML Funktionsplan -Name[el]=Σχέδιο χαρακτηριστικών XML -Name[eo]=XML-Trajtplano -Name[es]=Plan de características XML -Name[et]=XML võimaluste plaan -Name[eu]=XML eginbide plana -Name[fa]=نقشۀ ویژگی XML -Name[fi]=XML-ominaisuussuunnitelma -Name[fr]=Plan de fonctionnalités XML -Name[fy]=Funksjonaliteitsplanning yn XML -Name[gl]=Plan de Características en XML -Name[hu]=XML FeaturePlan -Name[is]=XML fídusa áætlun -Name[it]=Piano caratteristiche XML -Name[km]=គ្រោងលក្ខណៈពិសេស XML -Name[lt]=XML bruožų planas -Name[ms]=Pelan Cirian XML -Name[nds]=XML-Funkschonenplaan -Name[ne]=एक्सएमएल विशेषता योजना -Name[nl]=Functionaliteitsplanning in XML -Name[pl]=Plan funkcjonalności XML -Name[pt]=Plano de Funcionalidades em XML -Name[pt_BR]=Plano de Funcionalidades XML -Name[sk]=XML plán vlastností -Name[sl]=Načrt zmožnosti v XML -Name[sr]=XML план могућности -Name[sr@Latn]=XML plan mogućnosti -Name[ta]=XML பண்பு திட்டம் -Name[tr]=XML Özellik Planı -Name[zh_CN]=XML 特性计划 -Name[zh_TW]=XML 功能計畫 + X-TDE-Library=kcal_resourcefeatureplan Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h index 2d492897..7b64e12a 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.h +++ b/tderesources/featureplan/kcal_resourcefeatureplan.h @@ -29,7 +29,7 @@ #include <tdeabc/locknull.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeconfig.h> namespace KCal { @@ -39,7 +39,7 @@ namespace KCal { */ class KDE_EXPORT ResourceFeaturePlan : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: ResourceFeaturePlan( const TDEConfig * ); diff --git a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h index aa00123f..23809cea 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplanconfig.h +++ b/tderesources/featureplan/kcal_resourcefeatureplanconfig.h @@ -23,7 +23,7 @@ #define RESOURCEFEATUREPLANCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class KURLRequester; @@ -33,7 +33,7 @@ namespace KCal { class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupdav/CMakeLists.txt b/tderesources/groupdav/CMakeLists.txt index 13e314b9..8ee6f674 100644 --- a/tderesources/groupdav/CMakeLists.txt +++ b/tderesources/groupdav/CMakeLists.txt @@ -26,9 +26,20 @@ link_directories( ##### other data ################################ -install( FILES kcal_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +tde_create_translated_desktop( + SOURCE kcal_groupdav.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) + install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal RENAME kcal_opengroupware.desktop ) -install( FILES tdeabc_groupdav.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) + +tde_create_translated_desktop( + SOURCE tdeabc_groupdav.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc + PO_DIR tderesources-desktops +) + install( FILES uninstall.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc RENAME tdeabc_opengroupware.desktop) diff --git a/tderesources/groupdav/kcal_groupdav.desktop b/tderesources/groupdav/kcal_groupdav.desktop index 99d2c4ff..2de0a148 100644 --- a/tderesources/groupdav/kcal_groupdav.desktop +++ b/tderesources/groupdav/kcal_groupdav.desktop @@ -1,50 +1,6 @@ [Desktop Entry] Name=GroupDAV Server (e.g. OpenGroupware) -Name[af]=GroupDAV bediener (bv. OpenGroupware) -Name[bg]=Сървър GroupDAV (e.g. OpenGroupware) -Name[br]=Servijer GroupDAV (e.g. OpenGroupware) -Name[ca]=Servidor GroupDAV (p.ex. OpenGroupware) -Name[cs]=GroupDAV server (např. OpenGroupware) -Name[da]=GroupDAV-server (f.eks. OpenGroupware) -Name[de]=GroupDAV-Server (z. B. OpenGroupware) -Name[el]=Εξυπηρετητής GroupDAV (π.χ. OpenGroupware) -Name[es]=Servidor GroupDAV (por ejemplo, OpenGroupware) -Name[et]=GroupDAV server (nt. OpenGroupware) -Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware) -Name[fa]=کارساز GroupDAV (مثلاً OpenGroupware) -Name[fi]=GroupDAV-palvelin (esim. OpenGroupware) -Name[fr]=GroupDAV Serveur (ex. OpenGroupware) -Name[fy]=GroupDAV-tsjinner (OpenGroupware) -Name[ga]=Freastalaí GroupDAV (m.sh. OpenGroupware) -Name[gl]=Servidor GroupDAV (e.g. OpenGroupware) -Name[hu]=GroupDAV-kiszolgáló (pl. OpenGroupware) -Name[is]=GroupDAV þjónn (t.d. OpenGroupware) -Name[it]=Server GroupDAV (per es. OpenGroupware) -Name[ja]=GroupDAV サーバ (例 OpenGroupware) -Name[ka]=სერვერი GroupDAV (მაგ., OpenGroupware) -Name[kk]=GroupDAV сервері (мысалы OpenGroupware) -Name[km]=ម៉ាស៊ីនបម្រើ GroupDAV (ឧ. OpenGroupware) -Name[lt]=GroupDAV serveris (pvz.: OpenGroupware) -Name[ms]=Pelayan GroupDAV (misalnya OpenGroupware) -Name[nb]=GroupDAV-tjener (f.eks. OpenGroupware) -Name[nds]=GroupDAV-Server (t.B. OpenGroupware) -Name[ne]=समूह DAV सर्भर (जस्तै: खुला ग्रुपवेयर) -Name[nl]=GroupDAV-server (OpenGroupware) -Name[nn]=GroupDAV-tenar (t.d. OpenGroupware) -Name[pl]=Serwer GroupDAV (np. OpenGroupware) -Name[pt]=Servidor GroupDAV (por exemplo OpenGroupware) -Name[pt_BR]=Servidor GroupDav (p. ex. OpenGroupware) -Name[ru]=Сервер GroupDAV (например, OpenGroupware) -Name[sk]=GroupDAV Server (napr. OpenGroupware) -Name[sl]=Strežnik GroupDAV (npr. OpenGroupware) -Name[sr]=GroupDAV сервер (нпр. OpenGroupware) -Name[sr@Latn]=GroupDAV server (npr. OpenGroupware) -Name[sv]=GroupDAV-server (t.ex. OpenGroupware) -Name[ta]=GroupDAV சேவகன் (e.g. OpenGroupware) -Name[tr]=GroupDAV Sunucusu (ör. OpenGroupware) -Name[uk]=Сервер GroupDAV (напр., OpenGroupware) -Name[zh_CN]=GroupDAV 服务器(如 OpenGroupware) -Name[zh_TW]=GroupDAV 伺服器 (如: OpenGroupware) + X-TDE-Library=kcal_groupdav Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/groupdav/kcal_resourcegroupdav.h b/tderesources/groupdav/kcal_resourcegroupdav.h index dba9bd27..68aa44a6 100644 --- a/tderesources/groupdav/kcal_resourcegroupdav.h +++ b/tderesources/groupdav/kcal_resourcegroupdav.h @@ -33,7 +33,7 @@ namespace KCal { */ class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase { - Q_OBJECT + TQ_OBJECT public: ResourceGroupDav(); diff --git a/tderesources/groupdav/tdeabc_groupdav.desktop b/tderesources/groupdav/tdeabc_groupdav.desktop index c7db0ac6..0cf3f672 100644 --- a/tderesources/groupdav/tdeabc_groupdav.desktop +++ b/tderesources/groupdav/tdeabc_groupdav.desktop @@ -1,50 +1,6 @@ [Desktop Entry] Name=GroupDAV Server (e.g. OpenGroupware) -Name[af]=GroupDAV bediener (bv. OpenGroupware) -Name[bg]=Сървър GroupDAV (e.g. OpenGroupware) -Name[br]=Servijer GroupDAV (e.g. OpenGroupware) -Name[ca]=Servidor GroupDAV (p.ex. OpenGroupware) -Name[cs]=GroupDAV server (např. OpenGroupware) -Name[da]=GroupDAV-server (f.eks. OpenGroupware) -Name[de]=GroupDAV-Server (z. B. OpenGroupware) -Name[el]=Εξυπηρετητής GroupDAV (π.χ. OpenGroupware) -Name[es]=Servidor GroupDAV (por ejemplo, OpenGroupware) -Name[et]=GroupDAV server (nt. OpenGroupware) -Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware) -Name[fa]=کارساز GroupDAV (مثلاً OpenGroupware) -Name[fi]=GroupDAV-palvelin (esim. OpenGroupware) -Name[fr]=GroupDAV Serveur (ex. OpenGroupware) -Name[fy]=GroupDAV-tsjinner (OpenGroupware) -Name[ga]=Freastalaí GroupDAV (m.sh. OpenGroupware) -Name[gl]=Servidor GroupDAV (e.g. OpenGroupware) -Name[hu]=GroupDAV-kiszolgáló (pl. OpenGroupware) -Name[is]=GroupDAV þjónn (t.d. OpenGroupware) -Name[it]=Server GroupDAV (per es. OpenGroupware) -Name[ja]=GroupDAV サーバ (例 OpenGroupware) -Name[ka]=სერვერი GroupDAV (მაგ., OpenGroupware) -Name[kk]=GroupDAV сервері (мысалы OpenGroupware) -Name[km]=ម៉ាស៊ីនបម្រើ GroupDAV (ឧ. OpenGroupware) -Name[lt]=GroupDAV serveris (pvz.: OpenGroupware) -Name[ms]=Pelayan GroupDAV (misalnya OpenGroupware) -Name[nb]=GroupDAV-tjener (f.eks. OpenGroupware) -Name[nds]=GroupDAV-Server (t.B. OpenGroupware) -Name[ne]=समूह DAV सर्भर (जस्तै: खुला ग्रुपवेयर) -Name[nl]=GroupDAV-server (OpenGroupware) -Name[nn]=GroupDAV-tenar (t.d. OpenGroupware) -Name[pl]=Serwer GroupDAV (np. OpenGroupware) -Name[pt]=Servidor GroupDAV (por exemplo OpenGroupware) -Name[pt_BR]=Servidor GroupDav (p. ex. OpenGroupware) -Name[ru]=Сервер GroupDAV (например, OpenGroupware) -Name[sk]=GroupDAV Server (napr. OpenGroupware) -Name[sl]=Strežnik GroupDAV (npr. OpenGroupware) -Name[sr]=GroupDAV сервер (нпр. OpenGroupware) -Name[sr@Latn]=GroupDAV server (npr. OpenGroupware) -Name[sv]=GroupDAV-server (t.ex. OpenGroupware) -Name[ta]=GroupDAV சேவகன் (e.g. OpenGroupware) -Name[tr]=GroupDAV Sunucusu (ör. OpenGroupware) -Name[uk]=Сервер GroupDAV (напр., OpenGroupware) -Name[zh_CN]=GroupDAV 服务器(如 OpenGroupware) -Name[zh_TW]=GroupDAV 伺服器 (如: OpenGroupware) + X-TDE-Library=tdeabc_groupdav Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h index 36b0456c..9057a8d8 100644 --- a/tderesources/groupdav/tdeabc_resourcegroupdav.h +++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h @@ -23,13 +23,13 @@ #define TDEABC_RESOURCEGROUPDAV_H #include "tdeabc_resourcegroupwarebase.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupware/kcal_groupware.desktop b/tderesources/groupware/kcal_groupware.desktop index 55145035..12b71705 100644 --- a/tderesources/groupware/kcal_groupware.desktop +++ b/tderesources/groupware/kcal_groupware.desktop @@ -1,47 +1,6 @@ [Desktop Entry] Name=Groupware Server -Name[af]=Groupware bediener -Name[ar]=خادم البرمجيات الجماعية -Name[bg]=Сървър Groupware -Name[br]=Servijer strollant -Name[ca]=Servidor Groupware -Name[cs]=Groupware server -Name[el]=Εξυπηρετητής Groupware -Name[es]=Servidor de Groupware -Name[et]=Grupitöö server -Name[eu]=Groupware zerbitzaria -Name[fa]=کارساز Groupware -Name[fi]=Groupware-palvelin -Name[fr]=Serveur de travail collaboratif -Name[fy]=Groupware-tsjinner -Name[ga]=Freastalaí Groupware -Name[gl]=Servidor de Traballo en Grupo -Name[hu]=Groupware kiszolgáló -Name[is]=Groupware þjónn -Name[it]=Server Groupware -Name[ja]=グループウェアサーバ -Name[kk]=Groupware сервері -Name[km]=ម៉ាស៊ីនបម្រើកម្មវិធីពហុអ្នកប្រើ -Name[lt]=Grupinio darbo serveris -Name[ms]=Pelayan Groupware -Name[nb]=Groupware-tjener -Name[nds]=Groupware-Server -Name[ne]=ग्रुपवेयर सर्भर -Name[nl]=Groupware-server -Name[nn]=Groupware-tenar -Name[pl]=Serwer Groupware -Name[pt]=Servidor de Groupware -Name[pt_BR]=Servidor Groupware -Name[ru]=Сервер Groupware -Name[sl]=Strežnik za skupinsko delo -Name[sr]=Groupware сервер -Name[sr@Latn]=Groupware server -Name[sv]=Grupprogramserver -Name[ta]=குழுவாரி சேவகன் -Name[tr]=Grupyazılımı(Groupware) Sunucusu -Name[uk]=Сервер Groupware -Name[zh_CN]=群件服务器 -Name[zh_TW]=群組伺服器 + X-TDE-Library=kcal_groupware Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp index 6200773b..f3897d79 100644 --- a/tderesources/groupware/kcal_resourcegroupware.cpp +++ b/tderesources/groupware/kcal_resourcegroupware.cpp @@ -159,16 +159,16 @@ bool ResourceGroupware::doLoad() mJobData = TQString(); mDownloadJob = KPIM::GroupwareJob::getCalendar( url ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/groupware/kcal_resourcegroupware.h b/tderesources/groupware/kcal_resourcegroupware.h index 323f6ade..56ad9ce6 100644 --- a/tderesources/groupware/kcal_resourcegroupware.h +++ b/tderesources/groupware/kcal_resourcegroupware.h @@ -41,7 +41,7 @@ namespace KCal { */ class ResourceGroupware : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: ResourceGroupware(); diff --git a/tderesources/groupware/kcal_resourcegroupwareconfig.h b/tderesources/groupware/kcal_resourcegroupwareconfig.h index 7bfa34d4..53dcff7a 100644 --- a/tderesources/groupware/kcal_resourcegroupwareconfig.h +++ b/tderesources/groupware/kcal_resourcegroupwareconfig.h @@ -40,7 +40,7 @@ class ResourceCachedSaveConfig; */ class ResourceGroupwareConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceGroupwareConfig( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tderesources/groupware/tdeabc_groupware.desktop b/tderesources/groupware/tdeabc_groupware.desktop index 30721fa0..8533e85b 100644 --- a/tderesources/groupware/tdeabc_groupware.desktop +++ b/tderesources/groupware/tdeabc_groupware.desktop @@ -1,47 +1,6 @@ [Desktop Entry] Name=Groupware Server -Name[af]=Groupware bediener -Name[ar]=خادم البرمجيات الجماعية -Name[bg]=Сървър Groupware -Name[br]=Servijer strollant -Name[ca]=Servidor Groupware -Name[cs]=Groupware server -Name[el]=Εξυπηρετητής Groupware -Name[es]=Servidor de Groupware -Name[et]=Grupitöö server -Name[eu]=Groupware zerbitzaria -Name[fa]=کارساز Groupware -Name[fi]=Groupware-palvelin -Name[fr]=Serveur de travail collaboratif -Name[fy]=Groupware-tsjinner -Name[ga]=Freastalaí Groupware -Name[gl]=Servidor de Traballo en Grupo -Name[hu]=Groupware kiszolgáló -Name[is]=Groupware þjónn -Name[it]=Server Groupware -Name[ja]=グループウェアサーバ -Name[kk]=Groupware сервері -Name[km]=ម៉ាស៊ីនបម្រើកម្មវិធីពហុអ្នកប្រើ -Name[lt]=Grupinio darbo serveris -Name[ms]=Pelayan Groupware -Name[nb]=Groupware-tjener -Name[nds]=Groupware-Server -Name[ne]=ग्रुपवेयर सर्भर -Name[nl]=Groupware-server -Name[nn]=Groupware-tenar -Name[pl]=Serwer Groupware -Name[pt]=Servidor de Groupware -Name[pt_BR]=Servidor Groupware -Name[ru]=Сервер Groupware -Name[sl]=Strežnik za skupinsko delo -Name[sr]=Groupware сервер -Name[sr@Latn]=Groupware server -Name[sv]=Grupprogramserver -Name[ta]=குழுவாரி சேவகன் -Name[tr]=Grupyazılımı(Groupware) Sunucusu -Name[uk]=Сервер Groupware -Name[zh_CN]=群件服务器 -Name[zh_TW]=群組伺服器 + X-TDE-Library=tdeabc_groupware Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/groupware/tdeabc_resourcegroupware.cpp b/tderesources/groupware/tdeabc_resourcegroupware.cpp index e8f0c0a2..b6b25911 100644 --- a/tderesources/groupware/tdeabc_resourcegroupware.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupware.cpp @@ -244,18 +244,18 @@ bool ResourceGroupware::asyncLoad() mJobData = TQString(); mDownloadJob = KPIM::GroupwareJob::getAddressBook( url ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading addressbook") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/groupware/tdeabc_resourcegroupware.h b/tderesources/groupware/tdeabc_resourcegroupware.h index 59bbc9a4..47d4a5fd 100644 --- a/tderesources/groupware/tdeabc_resourcegroupware.h +++ b/tderesources/groupware/tdeabc_resourcegroupware.h @@ -34,7 +34,7 @@ class GroupwarePrefs; class ResourceGroupware : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp index e171c7e7..74e86600 100644 --- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp @@ -106,7 +106,7 @@ ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* mainLayout->addWidget( label, 6, 0 ); mainLayout->addWidget( mAddressBookBox, 6, 1 ); - connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) ); + connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) ); } void ResourceGroupwareConfig::loadSettings( KRES::Resource *res ) diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.h b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h index 86825bbf..7cf839d9 100644 --- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.h +++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h @@ -35,7 +35,7 @@ class ResourceGroupware; class ResourceGroupwareConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupwise/CMakeLists.txt b/tderesources/groupwise/CMakeLists.txt index 5efc6153..f175e1db 100644 --- a/tderesources/groupwise/CMakeLists.txt +++ b/tderesources/groupwise/CMakeLists.txt @@ -28,8 +28,17 @@ link_directories( ##### other data ################################ -install( FILES kcal_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -install( FILES tdeabc_groupwise.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +tde_create_translated_desktop( + SOURCE kcal_groupwise.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) + +tde_create_translated_desktop( + SOURCE tdeabc_groupwise.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc + PO_DIR tderesources-desktops +) ##### kcal_groupwise (module) ################### diff --git a/tderesources/groupwise/groupwisesettingswidget.cpp b/tderesources/groupwise/groupwisesettingswidget.cpp index 48de8143..cbff52ac 100644 --- a/tderesources/groupwise/groupwisesettingswidget.cpp +++ b/tderesources/groupwise/groupwisesettingswidget.cpp @@ -27,8 +27,8 @@ GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent ) : GroupWiseSettingsWidgetBase( parent ) { - connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ), - this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) ); + connect( m_settingsList, TQ_SIGNAL( itemRenamed( TQListViewItem *, int ) ), + this, TQ_SLOT( slotItemRenamed( TQListViewItem *, int ) ) ); } void GroupWiseSettingsWidget::slotItemRenamed( TQListViewItem * item, int ) diff --git a/tderesources/groupwise/groupwisesettingswidget.h b/tderesources/groupwise/groupwisesettingswidget.h index 9fff6aa7..9e81533d 100644 --- a/tderesources/groupwise/groupwisesettingswidget.h +++ b/tderesources/groupwise/groupwisesettingswidget.h @@ -30,7 +30,7 @@ class TQListViewItem; class GroupWiseSettingsWidget : public GroupWiseSettingsWidgetBase { -Q_OBJECT +TQ_OBJECT public: GroupWiseSettingsWidget( TQWidget * parent ); diff --git a/tderesources/groupwise/kcal_groupwise.desktop b/tderesources/groupwise/kcal_groupwise.desktop index 4e006e2f..fbbbfbec 100644 --- a/tderesources/groupwise/kcal_groupwise.desktop +++ b/tderesources/groupwise/kcal_groupwise.desktop @@ -1,48 +1,6 @@ [Desktop Entry] Name=Novell GroupWise Server -Name[af]=Novell GroupWise bediener -Name[bg]=Сървър Novell GroupWise -Name[br]=Servijer Novell GroupWise -Name[ca]=Servidor Novell GroupWise -Name[cs]=Novell GroupWise server -Name[da]=Novell GroupWise server -Name[el]=Εξυπηρετητής Novell GroupWise -Name[es]=Servidor de Novell GroupWise -Name[et]=Novelli GroupWise server -Name[eu]=Novell GroupWise zerbitzaria -Name[fa]=کارساز Novell GroupWise -Name[fi]=Novell GroupWise -palvelin -Name[fr]=Serveur de travail collaboratif GroupWise de Novell -Name[fy]=Novell GroupWise-tsjinner -Name[ga]=Freastalaí Novell GroupWise -Name[gl]=Servidor Novell GroupWise -Name[hu]=Novell GroupWise kiszolgáló -Name[is]=Novell GroupWise þjónn -Name[it]=Server Novell GroupWise -Name[ja]=Novell GroupWise サーバ -Name[ka]=სერვერი Novell GroupWise -Name[kk]=Novell GroupWise сервері -Name[km]=ម៉ាស៊ីនបម្រើ GroupWise របស់ណូវែល -Name[lt]=Novell GroupWise serveris -Name[ms]=Pelayan Novell GroupWise -Name[nb]=Novell GroupWise-tjener -Name[nds]=Novell-GroupWise-Server -Name[ne]=नोभेल समूहगत सर्भर -Name[nl]=Novell GroupWise-server -Name[nn]=Novell GroupWise-tenar -Name[pl]=Serwer Novell GroupWise -Name[pt]=Servidor Novell GroupWise -Name[pt_BR]=Servidor GroupWise da Novell -Name[ru]=Сервер Novell GroupWise -Name[sl]=Strežnik Novell GroupWise -Name[sr]=Novell-ов GroupWise сервер -Name[sr@Latn]=Novell-ov GroupWise server -Name[sv]=Novell Groupwise-server -Name[ta]=Novell குழுவாரிச் சேவகன் -Name[tr]=Novell GroupWise Sunucusu -Name[uk]=Сервер Novell GroupWise -Name[zh_CN]=Novell GroupWise 服务器 -Name[zh_TW]=Novell 群組伺服器 + X-TDE-Library=kcal_groupwise Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp index a8a0727e..6c3db3a8 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp @@ -158,16 +158,16 @@ bool ResourceGroupwise::doLoad() mJobData = TQString(); mDownloadJob = TDEIO::get( url, false, false ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h index c4b330df..1bf1a5dc 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.h +++ b/tderesources/groupwise/kcal_resourcegroupwise.h @@ -30,7 +30,7 @@ #include <tdeabc/locknull.h> #include <tdeio/job.h> #include <tdeconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class ngwt__Settings; @@ -43,7 +43,7 @@ class GroupwisePrefsBase; */ class KDE_EXPORT ResourceGroupwise : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index cb9f4493..bd081f5e 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -73,7 +73,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* mainLayout->addMultiCellWidget( mSaveConfig, 6, 6, 0, 1 ); settingsButton->hide(); - // connect( settingsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotViewUserSettings() ) ); + // connect( settingsButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotViewUserSettings() ) ); } @@ -123,7 +123,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings() if ( s ) { - KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) ); + KDialogBase * dialog = new KDialogBase( ::tqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) ); // TQVBoxLayout * layout = new TQVBoxLayout( dialog ); GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog ); dialog->setMainWidget( settingsWidget ); diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h index cea6ad69..e982b819 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCEGROUPWISECONFIG_H #include <kurlrequester.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> @@ -41,7 +41,7 @@ class ResourceCachedSaveConfig; */ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceGroupwiseConfig( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp index 07342ec4..3ba461b9 100644 --- a/tderesources/groupwise/soap/groupwiseserver.cpp +++ b/tderesources/groupwise/soap/groupwiseserver.cpp @@ -114,7 +114,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, // kdDebug() << "Creating KSSLSocket()" << endl; m_sock = new KSSLSocket(); m_sock->setTimeout( KProtocolManager::connectTimeout() ); - connect( m_sock, TQT_SIGNAL( sslFailure() ), TQT_SLOT( slotSslError() ) ); + connect( m_sock, TQ_SIGNAL( sslFailure() ), TQ_SLOT( slotSslError() ) ); } else { m_sock = new KExtendedSocket(); } diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h index 0a0f70e0..31cd8f14 100644 --- a/tderesources/groupwise/soap/groupwiseserver.h +++ b/tderesources/groupwise/soap/groupwiseserver.h @@ -93,7 +93,7 @@ class DeltaInfo class GroupwiseServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupwise/soap/gwconverter.cpp b/tderesources/groupwise/soap/gwconverter.cpp index bda455f7..b842f15b 100644 --- a/tderesources/groupwise/soap/gwconverter.cpp +++ b/tderesources/groupwise/soap/gwconverter.cpp @@ -67,8 +67,8 @@ char* GWConverter::qStringToChar( const TQString &string ) TQDate GWConverter::charToTQDate( const char *str ) { - if ( !str ) return TQDate(); // FIXME: Qt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd - return TQDate::fromString( TQString::fromUtf8( str ), Qt::ISODate ); + if ( !str ) return TQDate(); // FIXME: TQt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd + return TQDate::fromString( TQString::fromUtf8( str ), TQt::ISODate ); } char *GWConverter::qDateTimeToChar( const TQDateTime &dt, @@ -94,7 +94,7 @@ std::string* GWConverter::qDateTimeToString( const TQDateTime &dt ) TQDateTime GWConverter::stringToTQDateTime( const std::string* str ) { - TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), Qt::ISODate ); + TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), TQt::ISODate ); return dt; } @@ -111,15 +111,15 @@ std::string* GWConverter::qDateToString( const TQDate &date ) TQDate GWConverter::stringToTQDate( std::string* str ) { //NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again - return TQDate::fromString( TQString::fromLatin1( str->c_str() ), Qt::ISODate ); + return TQDate::fromString( TQString::fromLatin1( str->c_str() ), TQt::ISODate ); } TQDateTime GWConverter::charToTQDateTime( const char *str ) { if ( !str ) return TQDateTime(); // kdDebug() << "charToTQDateTime(): " << str << endl; - // as above re Qt::ISODate - TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), Qt::ISODate ); + // as above re TQt::ISODate + TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), TQt::ISODate ); // kdDebug() << " " << dt.toString() << endl; return dt; } diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp index 84e28e69..5491f3db 100644 --- a/tderesources/groupwise/soap/incidenceconverter.cpp +++ b/tderesources/groupwise/soap/incidenceconverter.cpp @@ -543,7 +543,7 @@ bool IncidenceConverter::convertFromCalendarItem( ngwt__CalendarItem* item, std::vector<xsd__date>::const_iterator it; for ( it = dateList->begin(); it != dateList->end(); ++it ) { - TQDate date = TQDate::fromString( s2q( *it ), Qt::ISODate ); + TQDate date = TQDate::fromString( s2q( *it ), TQt::ISODate ); if ( date.isValid() ) } } @@ -689,7 +689,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen // recurrence date - try setting it using the recurrence start date - didn't help /* std::string startDate; - startDate.append( recur->recurStart().date().toString( Qt::ISODate ).utf8() ); + startDate.append( recur->recurStart().date().toString( TQt::ISODate ).utf8() ); item->rdate = soap_new_ngwt__RecurrenceDateType( soap(), -1 ); item->rdate->date.push_back( startDate );*/ // exceptions list - try sending empty list even if no exceptions @@ -704,7 +704,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen for ( KCal::DateList::ConstIterator it = exceptions.begin(); it != exceptions.end(); ++it ) { std::string startDate; - startDate.append( TQString((*it).toString( Qt::ISODate )).utf8() ); + startDate.append( TQString((*it).toString( TQt::ISODate )).utf8() ); item->exdate->date.push_back( startDate ); } } diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index 6bf74da5..b753249d 100644 --- a/tderesources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp @@ -57,9 +57,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket() setBlockingMode(false); //Connect internal slots - TQObject::connect( this, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotConnected()) ); - TQObject::connect( this, TQT_SIGNAL(closed(int)), this, TQT_SLOT(slotDisconnected()) ); - TQObject::connect( this, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotDisconnected())); + TQObject::connect( this, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotConnected()) ); + TQObject::connect( this, TQ_SIGNAL(closed(int)), this, TQ_SLOT(slotDisconnected()) ); + TQObject::connect( this, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotDisconnected())); } KSSLSocket::~KSSLSocket() @@ -161,7 +161,7 @@ TQString KSSLSocket::metaData( const TQString &key ) } /* -I basically copied the below from tcpTDEIO::SlaveBase.hpp, with some modificaions and formatting. +I basically copied the below from tcpTDEIO::SlaveBase.h, with some modificaions and formatting. * Copyright (C) 2000 Alex Zepeda <zipzippy@sonic.net * Copyright (C) 2001-2003 George Staikos <staikos@kde.org> diff --git a/tderesources/groupwise/soap/ksslsocket.h b/tderesources/groupwise/soap/ksslsocket.h index 42545948..aa4225b8 100644 --- a/tderesources/groupwise/soap/ksslsocket.h +++ b/tderesources/groupwise/soap/ksslsocket.h @@ -27,7 +27,7 @@ class KSSLSocketPrivate; class KSSLSocket : public KExtendedSocket { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp index b83b2bb4..e3d42998 100644 --- a/tderesources/groupwise/soap/stdsoap2.cpp +++ b/tderesources/groupwise/soap/stdsoap2.cpp @@ -3827,9 +3827,6 @@ soap_accept(struct soap *soap) #elif defined(PALM) fcntl((SOAP_SOCKET)soap->master, F_SETFL, fcntl((SOAP_SOCKET)soap->master, F_GETFL,0)&~O_NONBLOCK); fcntl((SOAP_SOCKET)soap->socket, F_SETFL, fcntl((SOAP_SOCKET)soap->socket, F_GETFL,0)&~O_NONBLOCK); -#elif defined(SYMBIAN) - long blocking = 0; - ioctl((SOAP_SOCKET)soap->master, 0/*FIONBIO*/, &blocking); #else fcntl((SOAP_SOCKET)soap->master, F_SETFL, fcntl((SOAP_SOCKET)soap->master, F_GETFL)&~O_NONBLOCK); fcntl((SOAP_SOCKET)soap->socket, F_SETFL, fcntl((SOAP_SOCKET)soap->socket, F_GETFL)&~O_NONBLOCK); diff --git a/tderesources/groupwise/soap/stdsoap2.h b/tderesources/groupwise/soap/stdsoap2.h index b68c2407..adb5037b 100644 --- a/tderesources/groupwise/soap/stdsoap2.h +++ b/tderesources/groupwise/soap/stdsoap2.h @@ -153,11 +153,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # endif #endif -#ifdef __SYMBIAN32__ -# define SYMBIAN -# undef WIN32 -#endif - #if defined(__palmos__) || defined(PALM_GCC) || defined(__PALMOS_TRAPS__) # ifndef PALM # define PALM @@ -333,12 +328,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # define O_NONBLOCK FNONBIO # include <sys_socket.h> # include "palmFunctions.h" -# elif defined(SYMBIAN) -# define WITH_LEAN -# define WITH_NONAMESPACES -# define HAVE_STRTOD /* use STRTOD since sscanf doesn't seem to work */ -# include <e32def.h> -# include <sys/ioctl.h> # elif defined(VXWORKS) # define HAVE_STRRCHR # define HAVE_STRTOD @@ -445,9 +434,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com # include <sockLib.h> # endif # ifndef VXWORKS -# ifndef SYMBIAN -# include <strings.h> -# endif +# include <strings.h> # endif # ifdef SUN_OS # include <sys/stream.h> /* SUN */ @@ -565,10 +552,7 @@ extern "C" { #define SOAP_INVALID_SOCKET (-1) #define soap_valid_socket(n) ((n) != SOAP_INVALID_SOCKET) -#if defined(SYMBIAN) -# define LONG64 long -# define ULONG64 unsigned LONG64 -#elif !defined(WIN32) || defined(__GLIBC__) || defined(__GNU__) +#if !defined(WIN32) || defined(__GLIBC__) || defined(__GNU__) # ifndef LONG64 # define LONG64 long long # define ULONG64 unsigned LONG64 @@ -583,8 +567,6 @@ extern "C" { #if defined(WIN32) # define soap_int32 __int32 -#elif defined(SYMBIAN) -# define soap_int32 long #elif defined(PALM) # define soap_int32 Int32 #else @@ -601,13 +583,8 @@ extern "C" { # define SOAP_ERANGE ERANGE # define SOAP_EINTR EINTR # define SOAP_EAGAIN EAGAIN -# ifdef SYMBIAN -# define SOAP_EWOULDBLOCK 9898 -# define SOAP_EINPROGRESS 9899 -# else -# define SOAP_EWOULDBLOCK EWOULDBLOCK -# define SOAP_EINPROGRESS EINPROGRESS -# endif +# define SOAP_EWOULDBLOCK EWOULDBLOCK +# define SOAP_EINPROGRESS EINPROGRESS #endif #ifdef WIN32 diff --git a/tderesources/groupwise/tdeabc_groupwise.desktop b/tderesources/groupwise/tdeabc_groupwise.desktop index 2f982324..7b72c451 100644 --- a/tderesources/groupwise/tdeabc_groupwise.desktop +++ b/tderesources/groupwise/tdeabc_groupwise.desktop @@ -1,48 +1,6 @@ [Desktop Entry] Name=Novell GroupWise Server -Name[af]=Novell GroupWise bediener -Name[bg]=Сървър Novell GroupWise -Name[br]=Servijer Novell GroupWise -Name[ca]=Servidor Novell GroupWise -Name[cs]=Novell GroupWise server -Name[da]=Novell GroupWise server -Name[el]=Εξυπηρετητής Novell GroupWise -Name[es]=Servidor de Novell GroupWise -Name[et]=Novelli GroupWise server -Name[eu]=Novell GroupWise zerbitzaria -Name[fa]=کارساز Novell GroupWise -Name[fi]=Novell GroupWise -palvelin -Name[fr]=Serveur de travail collaboratif GroupWise de Novell -Name[fy]=Novell GroupWise-tsjinner -Name[ga]=Freastalaí Novell GroupWise -Name[gl]=Servidor Novell GroupWise -Name[hu]=Novell GroupWise kiszolgáló -Name[is]=Novell GroupWise þjónn -Name[it]=Server Novell GroupWise -Name[ja]=Novell GroupWise サーバ -Name[ka]=სერვერი Novell GroupWise -Name[kk]=Novell GroupWise сервері -Name[km]=ម៉ាស៊ីនបម្រើ GroupWise របស់ណូវែល -Name[lt]=Novell GroupWise serveris -Name[ms]=Pelayan Novell GroupWise -Name[nb]=Novell GroupWise-tjener -Name[nds]=Novell-GroupWise-Server -Name[ne]=नोभेल समूहगत सर्भर -Name[nl]=Novell GroupWise-server -Name[nn]=Novell GroupWise-tenar -Name[pl]=Serwer Novell GroupWise -Name[pt]=Servidor Novell GroupWise -Name[pt_BR]=Servidor GroupWise da Novell -Name[ru]=Сервер Novell GroupWise -Name[sl]=Strežnik Novell GroupWise -Name[sr]=Novell-ов GroupWise сервер -Name[sr@Latn]=Novell-ov GroupWise server -Name[sv]=Novell Groupwise-server -Name[ta]=Novell குழுவாரிச் சேவகன் -Name[tr]=Novell GroupWise Sunucusu -Name[uk]=Сервер Novell GroupWise -Name[zh_CN]=Novell GroupWise 服务器 -Name[zh_TW]=Novell 群組伺服器 + X-TDE-Library=tdeabc_groupwise Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp index 7c3ed791..04ecc769 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp @@ -288,8 +288,8 @@ bool ResourceGroupwise::asyncLoad() { mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) ); - connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + connect( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); } if ( addressBooks().isEmpty() ) { @@ -349,15 +349,15 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) mJob = TDEIO::get( url, false, false ); // TODO: make the GW jobs call finished if the URL // contains no address book IDs kdDebug() << " Job address: " << mJob << endl; - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); if ( bookType == System ) { - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( fetchSABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( fetchSABResult( TDEIO::Job * ) ) ); mSABProgress = KPIM::ProgressManager::instance()->createProgressItem( mProgress, KPIM::ProgressManager::getUniqueID(), i18n( "Fetching System Address Book" ), TQString(), @@ -366,8 +366,8 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) } else { - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( fetchUABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( fetchUABResult( TDEIO::Job * ) ) ); mUABProgress = KPIM::ProgressManager::instance()->createProgressItem( mProgress, KPIM::ProgressManager::getUniqueID(), i18n( "Fetching User Address Books" ), TQString(), @@ -446,12 +446,12 @@ void ResourceGroupwise::updateSystemAddressBook() mJob = TDEIO::get( url, false, false ); mJob->setInteractive( false ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( updateSABResult( TDEIO::Job * ) ) ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( updateSABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); return; } diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h index fb1d075a..ccf74403 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <tdeabcresourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libtdepim/progressmanager.h> @@ -41,7 +41,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached { friend class ResourceGroupwiseConfig; - Q_OBJECT + TQ_OBJECT public: @@ -143,7 +143,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached /** DATA PROCESSING SLOTS **/ void slotReadJobData( TDEIO::Job *, const TQByteArray & ); void slotUpdateJobData( TDEIO::Job *, const TQByteArray & ); - /** HELPER TQT_SLOT **/ + /** HELPER TQ_SLOT **/ void slotJobPercent( TDEIO::Job *job, unsigned long percent ); void cancelLoad(); diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp index 49016cdd..69dd7a6f 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp @@ -102,7 +102,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* mainLayout->addWidget( label, 6, 0 ); mainLayout->addWidget( mAddressBookBox, 6, 1 ); - connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) ); + connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) ); } void ResourceGroupwiseConfig::loadSettings( KRES::Resource *res ) diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h index df62753a..2e3ccea4 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h @@ -23,7 +23,7 @@ #include "soap/groupwiseserver.h" #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqmap.h> @@ -38,7 +38,7 @@ class ResourceGroupwise; class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/groupwise/tdeioslave/CMakeLists.txt b/tderesources/groupwise/tdeioslave/CMakeLists.txt index aec2c35d..20e6d525 100644 --- a/tderesources/groupwise/tdeioslave/CMakeLists.txt +++ b/tderesources/groupwise/tdeioslave/CMakeLists.txt @@ -25,9 +25,11 @@ link_directories( ##### other data ################################ -install( FILES - groupwise.protocol groupwises.protocol - DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE groupwise.protocol groupwises.protocol + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tderesources-desktops +) ##### tdeio_groupwise (module) #################### diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index 56021e68..1c68d654 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -44,7 +44,7 @@ #include <unistd.h> #include <stdlib.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include "groupwise.h" @@ -295,14 +295,14 @@ void Groupwise::getAddressbook( const KURL &url ) GroupwiseServer server( u, user, pass, 0 ); - connect( &server, TQT_SIGNAL( readAddressBookTotalSize( int ) ), - TQT_SLOT( slotReadAddressBookTotalSize( int ) ) ); - connect( &server, TQT_SIGNAL( readAddressBookProcessedSize( int ) ), - TQT_SLOT( slotReadAddressBookProcessedSize( int ) ) ); - connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ), - TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); - connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), - TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); + connect( &server, TQ_SIGNAL( readAddressBookTotalSize( int ) ), + TQ_SLOT( slotReadAddressBookTotalSize( int ) ) ); + connect( &server, TQ_SIGNAL( readAddressBookProcessedSize( int ) ), + TQ_SLOT( slotReadAddressBookProcessedSize( int ) ) ); + connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ), + TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); + connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), + TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); kdDebug() << "Login" << endl; if ( !server.login() ) { @@ -369,10 +369,10 @@ void Groupwise::updateAddressbook( const KURL &url ) debugMessage( "update IDs: " + ids.join( "," ) ); GroupwiseServer server( u, user, pass, 0 ); - connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ), - TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); - connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), - TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); + connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ), + TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); + connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), + TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); kdDebug() << " Login" << endl; if ( !server.login() ) { diff --git a/tderesources/groupwise/tdeioslave/groupwise.h b/tderesources/groupwise/tdeioslave/groupwise.h index 5004682d..73fb48bb 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.h +++ b/tderesources/groupwise/tdeioslave/groupwise.h @@ -26,7 +26,7 @@ class Groupwise : public TQObject, public TDEIO::SlaveBase { - Q_OBJECT + TQ_OBJECT public: void get( const KURL &url ); 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..a8404cd3 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> @@ -51,7 +51,7 @@ class KDE_EXPORT ResourceKolab : public KCal::ResourceCalendar, public KCal::IncidenceBase::Observer, public Kolab::ResourceKolabBase { - Q_OBJECT + TQ_OBJECT friend struct TemporarySilencer; 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..5f1023b4 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 { @@ -53,7 +53,7 @@ class KDE_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..3347a177 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 { @@ -52,7 +52,7 @@ namespace TDEABC { class KDE_EXPORT ResourceKolab : public KPIM::ResourceABC, public Kolab::ResourceKolabBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h index a1a43f0e..5a754bc6 100644 --- a/tderesources/lib/addressbookadaptor.h +++ b/tderesources/lib/addressbookadaptor.h @@ -26,7 +26,7 @@ #include "groupwaredataadaptor.h" #include <tdeabc/addressee.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> namespace TDEABC { diff --git a/tderesources/lib/calendaradaptor.h b/tderesources/lib/calendaradaptor.h index 354a2795..dc203440 100644 --- a/tderesources/lib/calendaradaptor.h +++ b/tderesources/lib/calendaradaptor.h @@ -27,7 +27,7 @@ #include <libkcal/incidence.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> namespace KPIM { @@ -51,7 +51,7 @@ class CalendarUploadItem : public KPIM::GroupwareUploadItem class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor { - Q_OBJECT + TQ_OBJECT public: CalendarAdaptor(); diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h index 883d1510..fcb16afa 100644 --- a/tderesources/lib/davaddressbookadaptor.h +++ b/tderesources/lib/davaddressbookadaptor.h @@ -24,7 +24,7 @@ #include "addressbookadaptor.h" #include "folderlister.h" #include <tqdom.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { diff --git a/tderesources/lib/davcalendaradaptor.h b/tderesources/lib/davcalendaradaptor.h index 998a9cc7..ab1c9757 100644 --- a/tderesources/lib/davcalendaradaptor.h +++ b/tderesources/lib/davcalendaradaptor.h @@ -24,7 +24,7 @@ #include "calendaradaptor.h" #include "folderlister.h" #include <tqdom.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp index e400c02f..facdf13b 100644 --- a/tderesources/lib/folderconfig.cpp +++ b/tderesources/lib/folderconfig.cpp @@ -47,12 +47,12 @@ FolderConfig::FolderConfig( TQWidget *parent ) TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->addSpacing( KDialog::spacingHint() ); - TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Folder Selection"), + TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Folder Selection"), this ); topLayout->addWidget( topBox ); TQPushButton *button = new TQPushButton( i18n("Update Folder List"), topBox ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( updateFoldersClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SIGNAL( updateFoldersClicked() ) ); mFolderList = new FolderListView( topBox ); @@ -81,7 +81,7 @@ void FolderConfig::setFolderLister( FolderLister *f ) if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown; mFolderList->setEnabledTypes( types ); - connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) ); + connect( mFolderLister, TQ_SIGNAL( foldersRead() ), TQ_SLOT( updateFolderList() ) ); } void FolderConfig::retrieveFolderList( const KURL &url ) diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h index a9b4c714..892128a4 100644 --- a/tderesources/lib/folderconfig.h +++ b/tderesources/lib/folderconfig.h @@ -24,7 +24,7 @@ #define KPIM_FOLDERCONFIG_H #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqwidget.h> // class TDEListView; @@ -37,7 +37,7 @@ class FolderLister; class KDE_EXPORT FolderConfig : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FolderConfig( TQWidget *parent ); diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp index c12d3ae6..ec40e8cc 100644 --- a/tderesources/lib/folderlister.cpp +++ b/tderesources/lib/folderlister.cpp @@ -216,12 +216,12 @@ void FolderLister::setAdaptor( KPIM::GroupwareDataAdaptor *adaptor ) disconnect( mAdaptor, 0, this, 0 ); } mAdaptor = adaptor; - connect( mAdaptor, TQT_SIGNAL( folderInfoRetrieved( const KURL &, + connect( mAdaptor, TQ_SIGNAL( folderInfoRetrieved( const KURL &, const TQString &, KPIM::FolderLister::ContentType ) ), - this, TQT_SLOT( processFolderResult( const KURL &, const TQString &, + this, TQ_SLOT( processFolderResult( const KURL &, const TQString &, KPIM::FolderLister::ContentType ) ) ); - connect( mAdaptor, TQT_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ), - this, TQT_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) ); + connect( mAdaptor, TQ_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ), + this, TQ_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) ); } void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder ) @@ -272,8 +272,8 @@ void FolderLister::doRetrieveFolder( const KURL &u ) kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL=" << url.prettyURL() << endl; - connect( listjob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotListJobResult( TDEIO::Job * ) ) ); + connect( listjob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotListJobResult( TDEIO::Job * ) ) ); } else { // TODO: Indicate a problem to the user! kdWarning() << "Unable to create the folder list job for the url " diff --git a/tderesources/lib/folderlister.h b/tderesources/lib/folderlister.h index a1d3f2eb..8a5ba529 100644 --- a/tderesources/lib/folderlister.h +++ b/tderesources/lib/folderlister.h @@ -26,7 +26,7 @@ // #include "tderesources_groupwareprefs.h" /*#include "groupwareresourcejob.h"*/ #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqvaluelist.h> #include <tqstring.h> @@ -47,7 +47,7 @@ class GroupwarePrefsBase; class KDE_EXPORT FolderLister : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Type { AddressBook, Calendar }; diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index 4659bd46..f2427c48 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -43,10 +43,10 @@ FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &t { setEnabledTypes( types ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL(spacePressed(TQListViewItem*)), - this, TQT_SLOT(showPopupMenu(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL(spacePressed(TQListViewItem*)), + this, TQ_SLOT(showPopupMenu(TQListViewItem*)) ); } void FolderListView::setEnabledTypes( const TQValueList<Property> &types ) @@ -99,32 +99,32 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos int id; m.insertTitle( folder.name, 9999 ); - id = m.insertItem( i18n("&Enabled"), this, TQT_SLOT(slotPopupHandler(int)), 0, FolderName ); + id = m.insertItem( i18n("&Enabled"), this, TQ_SLOT(slotPopupHandler(int)), 0, FolderName ); m.setItemChecked( id, i->isOn() ); m.insertSeparator(); if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) { - id = m.insertItem( i18n("Default for New &Events"), this, TQT_SLOT(slotPopupHandler(int)), 0, Event ); + id = m.insertItem( i18n("Default for New &Events"), this, TQ_SLOT(slotPopupHandler(int)), 0, Event ); m.setItemChecked( id, i->isDefault( Event ) ); } if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.contains( Todo ) ) ) { - id = m.insertItem( i18n("Default for New &Todos"), this, TQT_SLOT(slotPopupHandler(int)), 0, Todo ); + id = m.insertItem( i18n("Default for New &Todos"), this, TQ_SLOT(slotPopupHandler(int)), 0, Todo ); m.setItemChecked( id, i->isDefault( Todo ) ); } if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.contains( Journal ) ) ) { - id = m.insertItem( i18n("Default for New &Journals"), this, TQT_SLOT(slotPopupHandler(int)), 0, Journal ); + id = m.insertItem( i18n("Default for New &Journals"), this, TQ_SLOT(slotPopupHandler(int)), 0, Journal ); m.setItemChecked( id, i->isDefault( Journal ) ); } if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.contains( Contact ) ) ) { - id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_SLOT(slotPopupHandler(int)), 0, Contact ); + id = m.insertItem( i18n("Default for New &Contacts"), this, TQ_SLOT(slotPopupHandler(int)), 0, Contact ); m.setItemChecked( id, i->isDefault( Contact ) ); } if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.contains( All ) ) ) { - id = m.insertItem( i18n("Default for All New &Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, All ); + id = m.insertItem( i18n("Default for All New &Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, All ); m.setItemChecked( id, i->isDefault( All ) ); } if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.contains( Unknown ) ) ) { - id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown ); + id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, Unknown ); m.setItemChecked( id, i->isDefault( Unknown ) ); } @@ -147,10 +147,10 @@ void FolderListView::slotPopupHandler( int z ) void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c) { if ( dynamic_cast<FolderListItem*>(i) ) { - if ( btn == Qt::RightButton ) { + if ( btn == TQt::RightButton ) { showPopupMenu( (FolderListItem*)i, /*mapToGlobal(*/pos/*)*/ ); } - else if ( btn == Qt::LeftButton && c > 0 ) { + else if ( btn == TQt::LeftButton && c > 0 ) { // map pos to item/column and call FolderListItem::activate(col, pos) ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); // } else { @@ -293,4 +293,3 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i //END #include "folderlistview.moc" -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/tderesources/lib/folderlistview.h b/tderesources/lib/folderlistview.h index ce6243df..a54ffd56 100644 --- a/tderesources/lib/folderlistview.h +++ b/tderesources/lib/folderlistview.h @@ -37,7 +37,7 @@ class FolderListCaption; */ class FolderListView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class FolderListItem; @@ -126,5 +126,3 @@ class FolderListItem : public TQCheckListItem #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/tderesources/lib/folderselectdialog.cpp b/tderesources/lib/folderselectdialog.cpp index ab599153..7ffd3e38 100644 --- a/tderesources/lib/folderselectdialog.cpp +++ b/tderesources/lib/folderselectdialog.cpp @@ -53,10 +53,10 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& mListBox->ensureCurrentVisible(); layout->addWidget( mListBox, 10 ); - connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); mListBox->setFocus(); diff --git a/tderesources/lib/groupwaredataadaptor.h b/tderesources/lib/groupwaredataadaptor.h index b7bd6e33..27807124 100644 --- a/tderesources/lib/groupwaredataadaptor.h +++ b/tderesources/lib/groupwaredataadaptor.h @@ -29,7 +29,7 @@ #include <tqstring.h> #include <libkcal/listbase.h> #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEIO { @@ -90,7 +90,7 @@ class KDE_EXPORT GroupwareUploadItem class KDE_EXPORT GroupwareDataAdaptor : public TQObject { -Q_OBJECT +TQ_OBJECT public: GroupwareDataAdaptor(); diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp index 52a01fd4..1381b929 100644 --- a/tderesources/lib/groupwaredownloadjob.cpp +++ b/tderesources/lib/groupwaredownloadjob.cpp @@ -59,21 +59,21 @@ void GroupwareDownloadJob::run() mItemsForDownload.clear(); mCurrentlyOnServer.clear(); - connect( adaptor(), TQT_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ), - TQT_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) ); - connect( adaptor(), TQT_SIGNAL( itemOnServer( const KURL & ) ), - TQT_SLOT( slotItemOnServer( const KURL & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ), - TQT_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ), - TQT_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ), + TQ_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) ); + connect( adaptor(), TQ_SIGNAL( itemOnServer( const KURL & ) ), + TQ_SLOT( slotItemOnServer( const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ), + TQ_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ), + TQ_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), adaptor()->downloadProgressMessage() ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); listItems(); } @@ -105,10 +105,10 @@ void GroupwareDownloadJob::listItems() mListItemsData = TQString(); mListEventsJob = adaptor()->createListItemsJob( url ); - connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotListItemsResult( TDEIO::Job * ) ) ); - connect( mListEventsJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mListEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotListItemsResult( TDEIO::Job * ) ) ); + connect( mListEventsJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) ); } } @@ -187,10 +187,10 @@ void GroupwareDownloadJob::downloadItem() mDownloadJob = adaptor()->createDownloadJob( href, ctype ); } - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) ); } } diff --git a/tderesources/lib/groupwaredownloadjob.h b/tderesources/lib/groupwaredownloadjob.h index 6cf3bf24..d754ecb5 100644 --- a/tderesources/lib/groupwaredownloadjob.h +++ b/tderesources/lib/groupwaredownloadjob.h @@ -41,7 +41,7 @@ class ProgressItem; */ class GroupwareDownloadJob : public GroupwareJob { - Q_OBJECT + TQ_OBJECT public: GroupwareDownloadJob( GroupwareDataAdaptor *adaptor ); diff --git a/tderesources/lib/groupwareresourcejob.cpp b/tderesources/lib/groupwareresourcejob.cpp index b7e4b57b..09972b85 100644 --- a/tderesources/lib/groupwareresourcejob.cpp +++ b/tderesources/lib/groupwareresourcejob.cpp @@ -30,7 +30,7 @@ using namespace KPIM; GroupwareJob::GroupwareJob( GroupwareDataAdaptor *adaptor ) : mAdaptor( adaptor ) { - TQTimer::singleShot( 0, this, TQT_SLOT( run() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( run() ) ); } bool GroupwareJob::error() const diff --git a/tderesources/lib/groupwareresourcejob.h b/tderesources/lib/groupwareresourcejob.h index d32caaae..1b7697e3 100644 --- a/tderesources/lib/groupwareresourcejob.h +++ b/tderesources/lib/groupwareresourcejob.h @@ -37,7 +37,7 @@ class GroupwareDataAdaptor; */ class GroupwareJob : public TQObject { - Q_OBJECT + TQ_OBJECT public: GroupwareJob( GroupwareDataAdaptor *adaptor ); diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp index 51307d83..4c0f1ba2 100644 --- a/tderesources/lib/groupwareuploadjob.cpp +++ b/tderesources/lib/groupwareuploadjob.cpp @@ -52,22 +52,22 @@ void GroupwareUploadJob::run() KPIM::ProgressManager::getUniqueID(), adaptor()->uploadProgressMessage() ); connect( mUploadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelSave() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelSave() ) ); - connect( adaptor(), TQT_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ), - TQT_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploadError( const KURL &, const TQString & ) ), - TQT_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ), - TQT_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ), + TQ_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploadError( const KURL &, const TQString & ) ), + TQ_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ), + TQ_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemDeleted( const TQString &, const KURL & ) ), - TQT_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploaded( const TQString &, const KURL & ) ), - TQT_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ), - TQT_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDeleted( const TQString &, const KURL & ) ), + TQ_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploaded( const TQString &, const KURL & ) ), + TQ_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ), + TQ_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) ); mUploadProgress->setTotalItems( mAddedItems.size() + mChangedItems.size() + @@ -81,7 +81,7 @@ void GroupwareUploadJob::deleteItem() { kdDebug(5800)<<"GroupwareUploadJob::deleteItem()"<<endl; if ( mDeletedItems.isEmpty() ) { - TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) ); } else { kdDebug(7000) << " Deleting " << mDeletedItems.size() << " items from the server " << endl; @@ -102,10 +102,10 @@ kdDebug() << "Not using batch delete " << endl; if ( mDeletionJob ) { mDeletionJobData = TQString(); - connect( mDeletionJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) ); -// connect( mDeletionJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), -// TQT_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDeletionJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) ); +// connect( mDeletionJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), +// TQ_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { deleteItem(); } @@ -129,7 +129,7 @@ void GroupwareUploadJob::slotDeletionJobResult( TDEIO::Job *job ) adaptor()->interpretRemoveJob( job, mDeletionJobData ); } mDeletionJob = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( deleteItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteItem() ) ); } @@ -138,7 +138,7 @@ void GroupwareUploadJob::uploadItem() { kdDebug(5800)<<"GroupwareUploadJob::uploadItem()"<<endl; if ( mChangedItems.isEmpty() ) { - TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) ); } else { kdDebug(5800)<<"We still have "<<mChangedItems.count()<<" changed items to upload"<<endl; @@ -159,10 +159,10 @@ kdDebug() << "Not using batch upload " << endl; if ( mUploadJob ) { mUploadJobData = TQString(); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotUploadJobResult( TDEIO::Job* ) ) ); - connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotUploadJobResult( TDEIO::Job* ) ) ); + connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { uploadItem(); } @@ -185,7 +185,7 @@ void GroupwareUploadJob::slotUploadJobResult( TDEIO::Job *job ) adaptor()->interpretUploadJob( job, mUploadJobData ); } mUploadJob = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) ); } @@ -217,10 +217,10 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " < if ( mUploadJob ) { mUploadNewJobData = TQString(); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) ); - connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) ); + connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { uploadNewItem(); } @@ -246,7 +246,7 @@ void GroupwareUploadJob::slotUploadNewJobResult( TDEIO::Job *job ) adaptor()->interpretUploadNewJob( job, mUploadNewJobData ); } mUploadJob = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) ); } diff --git a/tderesources/lib/groupwareuploadjob.h b/tderesources/lib/groupwareuploadjob.h index 13ba3ed5..9845457b 100644 --- a/tderesources/lib/groupwareuploadjob.h +++ b/tderesources/lib/groupwareuploadjob.h @@ -46,7 +46,7 @@ class ProgressItem; */ class GroupwareUploadJob : public GroupwareJob { - Q_OBJECT + TQ_OBJECT public: GroupwareUploadJob( GroupwareDataAdaptor *adaptor ); diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h index 51263e26..f9462e5d 100644 --- a/tderesources/lib/kcal_cachesettingsdlg.h +++ b/tderesources/lib/kcal_cachesettingsdlg.h @@ -23,7 +23,7 @@ #define KCAL_CACHESETTINGSDLG_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KRES { @@ -41,7 +41,7 @@ class ResourceCachedSaveConfig; */ class KDE_EXPORT CacheSettingsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CacheSettingsDialog( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp index 8474ed21..1710a11e 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp @@ -195,8 +195,8 @@ bool ResourceGroupwareBase::doOpen() return false; } else { mLoginFinished = false; - connect( loginJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoginJobResult( TDEIO::Job* ) ) ); + connect( loginJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoginJobResult( TDEIO::Job* ) ) ); enter_loop(); return mLoginFinished; } @@ -217,7 +217,7 @@ void tqt_leave_modal( TQWidget *widget ); void ResourceGroupwareBase::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); @@ -239,8 +239,8 @@ void ResourceGroupwareBase::doClose() if ( adaptor() && adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) { TDEIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() ); - connect( logoffJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) ); + connect( logoffJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) ); // TODO: Do we really need to block while waiting for the job to return? enter_loop(); } @@ -276,8 +276,8 @@ bool ResourceGroupwareBase::doLoad() emit resourceChanged( this ); mDownloadJob = createDownloadJob( adaptor() ); - connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); return true; } @@ -322,8 +322,8 @@ bool ResourceGroupwareBase::doSave() if ( !confirmSave() ) return false; mUploadJob = createUploadJob( adaptor() ); - connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); Incidence::List inc; Incidence::List::Iterator it; @@ -376,8 +376,8 @@ void ResourceGroupwareBase::slotUploadJobResult( KPIM::GroupwareJob *job ) if ( !mDownloadJob ) { mDownloadJob = createDownloadJob( adaptor() ); - connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); } else { kdWarning() << k_funcinfo << "Download still in progress. " "Can't happen. (TM)" << endl; diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h index 80a1d460..ae4ca579 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.h +++ b/tderesources/lib/kcal_resourcegroupwarebase.h @@ -25,7 +25,7 @@ #include <kurl.h> #include <libkcal/resourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeabc/locknull.h> namespace TDEIO { @@ -51,7 +51,7 @@ class CalendarAdaptor; */ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: ResourceGroupwareBase(); diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp index 1ca2570a..4f576ed7 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp @@ -68,15 +68,15 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, mPasswordEdit->setEchoMode( KLineEdit::Password ); mFolderConfig = new KPIM::FolderConfig( this ); - connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ), - TQT_SLOT( updateFolders() ) ); + connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ), + TQ_SLOT( updateFolders() ) ); mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 ); TQHBox *hBox = new TQHBox( this ); mCacheSettingsButton = new KPushButton( i18n("Configure Cache Settings..."), hBox ); mainLayout->addMultiCellWidget( hBox, 5, 5, 0, 1 ); - connect( mCacheSettingsButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( showCacheSettings() ) ); + connect( mCacheSettingsButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( showCacheSettings() ) ); mCacheDialog = new CacheSettingsDialog( this ); } diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h index 7639b562..db3ddd98 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h @@ -23,7 +23,7 @@ #define KCAL_RESOURCEGROUPWAREBASECONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KPushButton; class KLineEdit; @@ -46,7 +46,7 @@ class CacheSettingsDialog; */ class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceGroupwareBaseConfig( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp index f4a46990..cf73e03a 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp @@ -177,8 +177,8 @@ bool ResourceGroupwareBase::asyncLoad() loadCache(); mDownloadJob = createDownloadJob( mAdaptor ); - connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); return true; } @@ -212,8 +212,8 @@ bool ResourceGroupwareBase::asyncSave( Ticket* ) } mUploadJob = createUploadJob( mAdaptor ); - connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); TDEABC::Addressee::List addr; TDEABC::Addressee::List::Iterator it; diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h index 7835d3d2..bea6ca91 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h @@ -24,7 +24,7 @@ #include <kurl.h> #include <tdeabcresourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfig; @@ -42,7 +42,7 @@ class AddressBookAdaptor; class KDE_EXPORT ResourceGroupwareBase : public ResourceCached { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp index 69dfb3d8..a80ce9e0 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp @@ -67,8 +67,8 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, con mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 ); mFolderConfig = new KPIM::FolderConfig( this ); - connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ), - TQT_SLOT( updateFolders() ) ); + connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ), + TQ_SLOT( updateFolders() ) ); mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 ); } diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h index 7b832623..c1ccb689 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h @@ -23,7 +23,7 @@ #define TDEABC_RESOURCEGROUPWAREBASECONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KLineEdit; class KURLRequester; @@ -38,7 +38,7 @@ class ResourceGroupwareBase; class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/lib/webdavhandler.cpp b/tderesources/lib/webdavhandler.cpp index af5eb276..d3255c36 100644 --- a/tderesources/lib/webdavhandler.cpp +++ b/tderesources/lib/webdavhandler.cpp @@ -120,7 +120,7 @@ bool WebdavHandler::extractDateTime( const TQDomElement &node, const TQString &e { TQDomElement element = node.namedItem( entry ).toElement(); if ( !element.isNull() && !element.text().isEmpty() ) { - value = TQDateTime::fromString( element.text(), Qt::ISODate ); + value = TQDateTime::fromString( element.text(), TQt::ISODate ); return true; } return false; diff --git a/tderesources/lib/webdavhandler.h b/tderesources/lib/webdavhandler.h index 0bfb33e9..a2de509d 100644 --- a/tderesources/lib/webdavhandler.h +++ b/tderesources/lib/webdavhandler.h @@ -27,7 +27,7 @@ #include <tqdom.h> #include <tqdatetime.h> #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class KDE_EXPORT WebdavHandler { diff --git a/tderesources/newexchange/CMakeLists.txt b/tderesources/newexchange/CMakeLists.txt index 4680a73a..975093b8 100644 --- a/tderesources/newexchange/CMakeLists.txt +++ b/tderesources/newexchange/CMakeLists.txt @@ -26,8 +26,17 @@ link_directories( ##### other data ################################ -install( FILES kcal_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -install( FILES tdeabc_newexchange.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +tde_create_translated_desktop( + SOURCE kcal_newexchange.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) + +tde_create_translated_desktop( + SOURCE tdeabc_newexchange.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc + PO_DIR tderesources-desktops +) ##### kcal_newexchange (module) ################# diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp index 5b51de5e..3b7aa36d 100644 --- a/tderesources/newexchange/exchangecalendaradaptor.cpp +++ b/tderesources/newexchange/exchangecalendaradaptor.cpp @@ -109,7 +109,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid ) TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); job->setWindow( mWindow ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFindUidResult(TDEIO::Job *))); } */ diff --git a/tderesources/newexchange/exchangeconvertercalendar.cpp b/tderesources/newexchange/exchangeconvertercalendar.cpp index 85baf974..58c31535 100644 --- a/tderesources/newexchange/exchangeconvertercalendar.cpp +++ b/tderesources/newexchange/exchangeconvertercalendar.cpp @@ -314,8 +314,8 @@ void ExchangeDownload::handleRecurrence( TQString uid ) query, false ); TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotMasterResult( TDEIO::Job * ) ) ); } */ @@ -410,7 +410,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl TQStringList::Iterator it = tmplst.begin(); KCal::DateList exdates; for ( ; it != tmplst.end(); ++it ) { - exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, Qt::ISODate )/*, + exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, TQt::ISODate )/*, localTimeZoneId )*/.date() ); } event->recurrence()->setExDates( exdates ); @@ -593,7 +593,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis void addDateProp( TQDomElement &el ) { el.setAttribute( "b:dt", "dateTime.tz" ); } void addFloatProp( TQDomElement &el ) { el.setAttribute( "b:dt", "float" ); } void addIntProp( TQDomElement &el ) { el.setAttribute( "b:dt", "int" ); } - TQString timePropString( const TQDateTime &dt ) { return dt.toString( Qt::ISODate )+"Z"; } + TQString timePropString( const TQDateTime &dt ) { return dt.toString( TQt::ISODate )+"Z"; } bool visitIncidence( Incidence *incidence ) { @@ -730,8 +730,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis /* FIXME: domCalendarProperty( "uid", todo->uid() ); - domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) ); - domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/ + domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) ); + domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/ // TODO /*propertyTask1( TaskProp_Owner ); propertyTask2( TaskProp_ContactNames ); @@ -758,8 +758,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis "outlookmessageclass", "IPM.Journal" ); /* FIXME: domCalendarProperty( "uid", todo->uid() ); - domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) ); - domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/ + domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) ); + domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/ // TODO return true; } diff --git a/tderesources/newexchange/exchangeconvertercontact.cpp b/tderesources/newexchange/exchangeconvertercontact.cpp index 5551516e..c6f3599f 100644 --- a/tderesources/newexchange/exchangeconvertercontact.cpp +++ b/tderesources/newexchange/exchangeconvertercontact.cpp @@ -21,6 +21,7 @@ #include "exchangeconvertercontact.h" #include <libkcal/freebusyurlstore.h> #include <webdavhandler.h> +#include <tdeversion.h> #include <kdebug.h> diff --git a/tderesources/newexchange/kcal_newexchange.desktop b/tderesources/newexchange/kcal_newexchange.desktop index a08b7eaa..e32808da 100644 --- a/tderesources/newexchange/kcal_newexchange.desktop +++ b/tderesources/newexchange/kcal_newexchange.desktop @@ -1,49 +1,6 @@ [Desktop Entry] Name=Calendar on an Exchange Server (experimental) -Name[af]=Kalender op 'n Exchange bediener (eksperimenteel) -Name[bg]=Календар на сървър Exchange (експериментално) -Name[ca]=Calendari a un servidor Exchange (experimental) -Name[cs]=Kalendář na serveru Exchange (experimentální) -Name[da]=Kalender på en Exchange-server (eksperimentel) -Name[de]=Kalender auf einem Exchange-Server (experimentell) -Name[el]=Ημερολόγιο σε εξυπηρετητή Exchange (πειραματικό) -Name[es]=Calendario en un servidor Exchange (experimental) -Name[et]=Kalender Exchange-serveris (eksperimentaalne) -Name[eu]=Egutegia Exchange zerbitzari batean (esperimentala) -Name[fa]=تقویم روی یک کارساز مبادله )تجربی( -Name[fi]=Kalenteri Exchange-palvelimella (kokeellinen) -Name[fr]=Agenda sur un serveur Exchange (expérimental) -Name[fy]=Aginda op in Exchange-tsjinner (eksperimenteel) -Name[ga]=Féilire ar Fhreastalaí Exchange (trialach) -Name[gl]=Calendario nun servidor Exchange (experimental) -Name[hu]=Exchange 2000-kiszolgáló naptára (kísérleti) -Name[is]=Dagatal á Exchange þjóni (á tilraunarstigi) -Name[it]=Calendario su un server Exchange (sperimentale) -Name[ja]=Exchange サーバのカレンダー (実験版) -Name[kk]=Exchange серверіндегі күнтізбе (сынақтағы) -Name[km]=ប្រតិទិនលើម៉ាស៊ីនបម្រើ Exchange (សម្រាប់អ្នកមានបទពិសោធន៍) -Name[lt]=Kalendorius Exchange serveryje (eksperimentine tvarka) -Name[mk]=Календар на Exchange-сервер (експериментално) -Name[ms]=Kalendar pada pelayan Exchange (ujikaji) -Name[nb]=Kalender på en Exchange-tjener (forsøksvis) -Name[nds]=Kalenner op en Exchange-Server (warrt utprobeert) -Name[ne]=एक्सचेन्ज सर्भरमा क्यालेन्डर (प्रयोगात्मक) -Name[nl]=Agenda op een Exchange-server (experimenteel) -Name[nn]=Kalender på ein Exchange-tenar (eksperimentelt) -Name[pl]=Kalendarz na serwerze Exchange (eksperymentalne) -Name[pt]=Calendário em servidor Exchange (experimental) -Name[pt_BR]=Calendário em um Servidor Exchange (experimental) -Name[ru]=Календарь на сервере Exchange (экспериментально) -Name[sk]=Kalendár na Exchange serveri (experimentálne) -Name[sl]=Koledar na strežniku Exchange (poskusno) -Name[sr]=Календар на Exchange серверу (експериментално) -Name[sr@Latn]=Kalendar na Exchange serveru (eksperimentalno) -Name[sv]=Kalender på en Exchange-server (experimentell) -Name[ta]=பரிமாற்ற சேவகனில் நாட்காட்டி (சோதனைக்குரியது) -Name[tr]=Bir Exchange Sunucusu üzerinde Takvim (deneyimsel) -Name[uk]=Календар на сервері Exchange (експериментальне) -Name[zh_CN]=Exchange 服务器上的日历(试验性) -Name[zh_TW]=Exchanger 伺服器上的行事曆(實驗中) + X-TDE-Library=kcal_newexchange Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/newexchange/kcal_newexchange_final.desktop b/tderesources/newexchange/kcal_newexchange_final.desktop index 01904c54..b4e32439 100644 --- a/tderesources/newexchange/kcal_newexchange_final.desktop +++ b/tderesources/newexchange/kcal_newexchange_final.desktop @@ -1,48 +1,4 @@ [Desktop Entry] Hidden=true + Name=Calendar on an Exchange Server -Name[af]=Kalender op 'n Exchange bediener -Name[bg]=Календар на сървър Exchange -Name[br]=Deiziadur en ur servijer Exchange -Name[ca]=Calendari a un servidor Exchange -Name[cs]=Kalendář na serveru Exchange -Name[da]=Kalender på en Exchange-server -Name[de]=Kalender auf einem Exchange-Server -Name[el]=Ημερολόγιο σε εξυπηρετητή Exchange -Name[es]=Calendario en un servidor Exchange -Name[et]=Kalender Exchange-serveris -Name[eu]=Egutegia Exchange zerbitzari batean -Name[fa]=تقویم روی یک کارساز مبادله -Name[fi]=Kalenteri Exchange-palvelimella -Name[fr]=Agenda sur un serveur Exchange -Name[fy]=Aginda op in Exchange-tsjinner -Name[ga]=Féilire ar Fhreastalaí Exchange -Name[gl]=Calendario nun servidor Exchange -Name[hu]=Exchange 2000-kiszolgáló naptára -Name[is]=Dagatal á Exchange þjóni -Name[it]=Calendario su un server Exchange -Name[ja]=Exchange サーバのカレンダー -Name[kk]=Exchange серверіндегі күнтізбе -Name[km]=ប្រតិទិនលើម៉ាស៊ីនបម្រើ Exchange -Name[lt]=Kalendorius Exchange serveryje -Name[mk]=Календар на Exchange-сервер -Name[ms]=Kalendar pada pelayan Exchange -Name[nb]=Kalender på en Exchange-tjener -Name[nds]=Kalenner op en Exchange-Server -Name[ne]=एक्सचेन्ज सर्भरमा क्यालेन्डर -Name[nl]=Agenda op een Exchange-server -Name[nn]=Kalender på ein Exchange-tenar -Name[pl]=Kalendarz na serwerze Exchange -Name[pt]=Calendário em servidor Exchange -Name[pt_BR]=Calendário em um Servidor Exchange -Name[ru]=Календарь на сервере Exchange -Name[sk]=Kalendár na Exchange serveri -Name[sl]=Koledar na strežniku Exchange -Name[sr]=Календар на Exchange серверу -Name[sr@Latn]=Kalendar na Exchange serveru -Name[sv]=Kalender på en Exchange-server -Name[ta]=ஒரு பரிமாற்ற சேவகனில் நாட்காட்சி -Name[tr]=Bir Exchange Sunucusu üzerinde Takvim -Name[uk]=Календар на сервері Exchange -Name[zh_CN]=Exchange 服务器上的日历 -Name[zh_TW]=Exchanger 伺服器上的行事曆 diff --git a/tderesources/newexchange/kcal_resourceexchange.h b/tderesources/newexchange/kcal_resourceexchange.h index 823ed9a7..886319a4 100644 --- a/tderesources/newexchange/kcal_resourceexchange.h +++ b/tderesources/newexchange/kcal_resourceexchange.h @@ -31,7 +31,7 @@ namespace KCal { */ class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase { - Q_OBJECT + TQ_OBJECT public: ResourceExchange(); diff --git a/tderesources/newexchange/tdeabc_newexchange.desktop b/tderesources/newexchange/tdeabc_newexchange.desktop index a21d3e90..847871fa 100644 --- a/tderesources/newexchange/tdeabc_newexchange.desktop +++ b/tderesources/newexchange/tdeabc_newexchange.desktop @@ -1,49 +1,6 @@ [Desktop Entry] Name=Addressbook on an Exchange Server (experimental) -Name[af]=Adresboek op 'n Exchange bediener (eksperimenteel) -Name[bg]=Адресник на сървър Exchange (експериментално) -Name[ca]=Llibreta d'adreces a un servidor Exchange (experimental) -Name[cs]=Kniha adres na serveru Exchange (experimentální) -Name[da]=Adressebog på en Exchange-server (eksperimentel) -Name[de]=Adressbuch auf einem Exchange-Server (experimentell) -Name[el]=Βιβλίο διευθύνσεων σε εξυπηρετητή Exchange (πειραματικό) -Name[es]=Libreta de direcciones en un servidor Exchange (experimental) -Name[et]=Aadressiraamat Exchange-serveris (eksperimentaalne) -Name[eu]=Helbide-liburua Exchange zerbitzari batean (esperimentala) -Name[fa]=کتاب نشانی روی یک کارساز مبادله )تجربی( -Name[fi]=Osoitekirja Exchange-palvelimella (kokeellinen) -Name[fr]=Carnet d'adresse sur un serveur Exchange (expérimental) -Name[fy]=Adresboek op in Exchange-tsjinner (eksperimenteel) -Name[ga]=Leabhar Seoltaí ar Fhreastalaí Exchange (trialach) -Name[gl]=Caderno de enderezos no Servidor Exchange2000 (experimental) -Name[hu]=Exchange-kiszolgáló címjegyzéke (kísérleti) -Name[is]=Vistfangaskrá Exchange þjóni (á tilraunarstigi) -Name[it]=Rubrica indirizzi su un server Exchange (sperimentale) -Name[ja]=Exchange サーバのアドレス帳 (実験版) -Name[kk]=Exchange серверіндегі адрестік кітапша (сынақтағы) -Name[km]=សៀវភៅអាសយដ្ឋានលើម៉ាស៊ីនបម្រើ Exchange (សម្រាប់អ្នកមានបទពិសោធន៍) -Name[lt]=Adresų knygelė Exchange serveryje (eksperimentine tvarka) -Name[mk]=Адресар на Exchange-сервер (експериментално) -Name[ms]=Buku Alamat pada pelayan Exchange (ujikaji) -Name[nb]=Adressebok på en Exchange-tjener (forsøksvis) -Name[nds]=Adressbook op en Exchange-Server (warrt utprobeert) -Name[ne]=एक्सचेन्ज सर्भरमा ठेगाना पुस्तिका (प्रयोगात्मक) -Name[nl]=Adresboek op een Exchange-server (experimenteel) -Name[nn]=Adressebok på ein Exchange-tenar (eksperimentelt) -Name[pl]=Książka adresowa na serwerze Exchange (eksperymentalne) -Name[pt]=Livro de endereços em servidor Exchange (experimental) -Name[pt_BR]=Livro de Endereços em um Servidor Exchange (experimenal) -Name[ru]=Адресная книга на сервере Exchange (экспериментально) -Name[sk]=Adresár na Exchange serveri (experimentálne) -Name[sl]=Adresar na strežniku Exchange (poskusno) -Name[sr]=Адресар на Exchange серверу (експериментално) -Name[sr@Latn]=Adresar na Exchange serveru (eksperimentalno) -Name[sv]=Adressbok på en Exchange-server (experimentell) -Name[ta]=IMAP சேவையக வழியாக கேஅஞ்சலில் நாள்காட்டி(சோதனைக்குரியது) -Name[tr]=Bir Exchange Sunucusu üzerinde Adres Defteri (deneyimsel) -Name[uk]=Адресна книга на сервері Exchange (експериментальне) -Name[zh_CN]=Exchange 服务器上的地址簿(试验性) -Name[zh_TW]=Exchanger 伺服器的通訊錄(實驗中) + X-TDE-Library=tdeabc_newexchange Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/newexchange/tdeabc_newexchange_final.desktop b/tderesources/newexchange/tdeabc_newexchange_final.desktop index 19cdda43..1febe0ef 100644 --- a/tderesources/newexchange/tdeabc_newexchange_final.desktop +++ b/tderesources/newexchange/tdeabc_newexchange_final.desktop @@ -1,48 +1,2 @@ [Desktop Entry] Name=Addressbook on an Exchange Server -Name[af]=Adresboek op 'n Exchange bediener -Name[bg]=Адресник на сървър Exchange -Name[br]=Karned chomlec'hioù war ur servijer Exchange -Name[ca]=Llibreta d'adreces a un servidor Exchange -Name[cs]=Kniha adres na serveru Exchange -Name[da]=Adressebog på en Exchange-server -Name[de]=Adressbuch auf einem Exchange-Server -Name[el]=Βιβλίο διευθύνσεων σε εξυπηρετητή Exchange -Name[es]=Libreta de direcciones en un servidor Exchange -Name[et]=Aadressiraamat Exchange-serveris -Name[eu]=Helbide-liburua Exchange zerbitzari (esperimentala) -Name[fa]=کتاب نشانی روی یک کارساز مبادله -Name[fi]=Osoitekirja Exchange-palvelimella -Name[fr]=Carnet d'adresse sur un serveur Exchange -Name[fy]=Adresboek op in Exchange-tsjinner -Name[ga]=Leabhar Seoltaí ar Fhreastalaí Exchange -Name[gl]=Caderno de enderezos nun Servidor Exchange -Name[he]=פנקס כתובות בשרת Exchange -Name[hu]=Exchange-kiszolgáló címjegyzéke -Name[is]=Vistfangaskrá á Exchange þjóni -Name[it]=Rubrica indirizzi su un server Exchange -Name[ja]=Exchange サーバのアドレス帳 -Name[kk]=Exchange серверіндегі адрестік кітапша -Name[km]=សៀវភៅអាសយដ្ឋានលើម៉ាស៊ីនបម្រើ Exchange -Name[lt]=Adresų knygelė Exchange serveryje -Name[mk]=Адресар на Exchange-сервер -Name[ms]=Buku alamat pada pelayan Exchange -Name[nb]=Adressebok på en Exchange-tjener -Name[nds]=Adressbook op en Exchange-Server -Name[ne]=एक्सचेन्ज सर्भरमा ठेगाना पुस्तिका -Name[nl]=Adresboek op een Exchange-server -Name[nn]=Adressebok på ein Exchange-tenar -Name[pl]=Książka adresowa na serwerze Exchange -Name[pt]=Livro de endereços em servidor Exchange -Name[pt_BR]=Livro de Endereços em um Servidor Exchange -Name[ru]=Адресная книга на сервере Exchange -Name[sk]=Adresár na Exchange serveri -Name[sl]=Adresar na strežniko Exchange -Name[sr]=Адресар на Exchange серверу -Name[sr@Latn]=Adresar na Exchange serveru -Name[sv]=Adressbok på en Exchange-server -Name[ta]=ஒருமாற்று சேவகனில் முகவரிப்புத்தகம் -Name[tr]=Bir Exchange Sunucusu üzerinde Adres Defteri -Name[uk]=Адресна книга на сервері Exchange -Name[zh_CN]=Exchange 服务器上的地址簿 -Name[zh_TW]=Exchanger 伺服器上的通訊錄 diff --git a/tderesources/newexchange/tdeabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h index a5ae0e5e..121cdf11 100644 --- a/tderesources/newexchange/tdeabc_resourceexchange.h +++ b/tderesources/newexchange/tdeabc_resourceexchange.h @@ -27,7 +27,7 @@ namespace TDEABC { class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/remote/CMakeLists.txt b/tderesources/remote/CMakeLists.txt index 33b10fc3..f6b44c53 100644 --- a/tderesources/remote/CMakeLists.txt +++ b/tderesources/remote/CMakeLists.txt @@ -31,9 +31,11 @@ install( FILES ##### other data ################################ -install( FILES - remote.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +tde_create_translated_desktop( + SOURCE remote.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) ##### kcal_remote (module) ###################### diff --git a/tderesources/remote/remote.desktop b/tderesources/remote/remote.desktop index 4c9eb093..50a3fd0c 100644 --- a/tderesources/remote/remote.desktop +++ b/tderesources/remote/remote.desktop @@ -1,55 +1,6 @@ [Desktop Entry] Name=Calendar in Remote File -Name[af]=Kalender in 'n afgeleë lêer -Name[bg]=Календар в отдалечен файл -Name[br]=Deiziadur e restr a-bell -Name[bs]=Kalendar u udaljenoj datoteci -Name[ca]=Calendari a un fitxer remot -Name[cs]=Kalendář ve vzdáleném souboru -Name[cy]=Calendr mewn Ffeil Pell -Name[da]=Kalender i ekstern fil -Name[de]=Kalender in Datei auf Fremdrechner -Name[el]=Ημερολόγιο σε απομακρυσμένο αρχείο -Name[es]=Calendario en un archivo remoto -Name[et]=Kalender võrgufailis -Name[eu]=Egutegia urruneko fitxategi batean -Name[fa]=تقویم در پروندۀ دور -Name[fi]=Kalenteri etätiedostossa -Name[fr]=Calendrier dans un fichier distant -Name[fy]=Aginda yn ekstern triem -Name[ga]=Féilire i gCianchomhad -Name[gl]=Calendario en ficheiro remoto -Name[hi]=रिमोट फ़ाइल में कैलेन्डर -Name[hu]=Távoli fájlban tárolt naptár -Name[is]=Dagatal í fjarlægri skrá -Name[it]=Calendario in file remoto -Name[ja]=リモートファイルのカレンダー -Name[kk]=Қашықтағы файлдағы күнтізбе -Name[km]=ប្រតិទិននៅក្នុងឯកសារនៅឆ្ងាយ -Name[lt]=Kalendorius nutolusioje byloje -Name[mk]=Календар во оддалечена датотека -Name[ms]=Kalendar dalam Fail Jauh -Name[nb]=Kalender i fil på nettverk -Name[nds]=Kalenner as Datei op en anner Reekner -Name[ne]=टाढाको फाइलको क्यालेन्डर -Name[nl]=Agenda in extern bestand -Name[nn]=Kalender i ekstern fil -Name[pl]=Kalendarz w pliku zdalnym -Name[pt]=Calendário num Ficheiro Remoto -Name[pt_BR]=Calendário em Arquivo Remoto -Name[ro]=Calendar în fişier distant -Name[ru]=Календарь во внешнем файле -Name[sk]=Kalendár vo vzdialenom súbore -Name[sl]=Koledar v oddaljeni datoteki -Name[sr]=Календар у удаљеном фајлу -Name[sr@Latn]=Kalendar u udaljenom fajlu -Name[sv]=Kalender i fjärrfil -Name[ta]=தொலைதூர கோப்பில் உள்ள நாள்காட்டி -Name[tg]=Тақвимот дар файли хурӯҷӣ -Name[tr]=Uzak Dosyadaki Takvim -Name[uk]=Календар у віддаленому файлі -Name[zh_CN]=远程文件中的日历 -Name[zh_TW]=遠端檔案的行事曆 + X-TDE-Library=kcal_remote Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp index 0a58aefb..9ee4aef5 100644 --- a/tderesources/remote/resourceremote.cpp +++ b/tderesources/remote/resourceremote.cpp @@ -197,11 +197,11 @@ bool ResourceRemote::doLoad() mDownloadJob = TDEIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true, false, !mUseProgressManager ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoadJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoadJobResult( TDEIO::Job * ) ) ); if ( mUseProgressManager ) { - connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); mProgress = KPIM::ProgressManager::createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading Calendar") ); @@ -283,8 +283,8 @@ bool ResourceRemote::doSave() saveCache(); mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true ); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSaveJobResult( TDEIO::Job * ) ) ); return true; } diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h index 84e213ae..6989169f 100644 --- a/tderesources/remote/resourceremote.h +++ b/tderesources/remote/resourceremote.h @@ -28,7 +28,7 @@ #include <kurl.h> #include <tdeconfig.h> #include <kdirwatch.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libtdepim/progressmanager.h> @@ -50,7 +50,7 @@ namespace KCal { */ class KDE_EXPORT ResourceRemote : public ResourceCached { - Q_OBJECT + TQ_OBJECT friend class ResourceRemoteConfig; diff --git a/tderesources/remote/resourceremoteconfig.h b/tderesources/remote/resourceremoteconfig.h index a05171ee..45417795 100644 --- a/tderesources/remote/resourceremoteconfig.h +++ b/tderesources/remote/resourceremoteconfig.h @@ -30,7 +30,7 @@ #include <tderesources/resource.h> #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KCal { @@ -44,7 +44,7 @@ class ResourceCachedSaveConfig; */ class KDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceRemoteConfig( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tderesources/scalix/kcal/CMakeLists.txt b/tderesources/scalix/kcal/CMakeLists.txt index 647ad26e..88501246 100644 --- a/tderesources/scalix/kcal/CMakeLists.txt +++ b/tderesources/scalix/kcal/CMakeLists.txt @@ -24,9 +24,11 @@ link_directories( ##### other data ################################ -install( - FILES scalix.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) +tde_create_translated_desktop( + SOURCE scalix.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) install( FILES ../uninstall.desktop diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index ff9158d1..6b796e5d 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -66,8 +66,8 @@ ResourceScalix::ResourceScalix( const TDEConfig *config ) mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ) { setType( "scalix" ); - connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitResourceChanged() ) ); + connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitResourceChanged() ) ); } ResourceScalix::~ResourceScalix() @@ -310,7 +310,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr 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() ; diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h index b58eee85..5b283534 100644 --- a/tderesources/scalix/kcal/resourcescalix.h +++ b/tderesources/scalix/kcal/resourcescalix.h @@ -36,7 +36,7 @@ #include <tqtimer.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> @@ -50,7 +50,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar, public KCal::IncidenceBase::Observer, public Scalix::ResourceScalixBase { - Q_OBJECT + TQ_OBJECT friend struct TemporarySilencer; diff --git a/tderesources/scalix/kcal/scalix.desktop b/tderesources/scalix/kcal/scalix.desktop index 8ba56ef0..5c9ea9e9 100644 --- a/tderesources/scalix/kcal/scalix.desktop +++ b/tderesources/scalix/kcal/scalix.desktop @@ -1,29 +1,6 @@ [Desktop Entry] Name=Calendar on Scalix Server via KMail -Name[bg]=Календар на сървъра Scalix през KMail -Name[ca]=Calendari en un servidor Scalix mitjançant el KMail -Name[da]=Kalender på Scalix-server via KMail -Name[de]=Kalender auf einem Scalix-Server via KMail -Name[el]=Ημερολόγιο σε εξυπηρετητή Scalix μέσω του KMail -Name[es]=Calendario en servidor Scalix por medio de KMail -Name[et]=Kalender Scalix-serveris (KMaili vahendusel) -Name[fr]=Agenda sur serveur Scalix via KMail -Name[is]=Dagatal á Scalix-þjóni gegnum KMail -Name[it]=Calendario su server Scalix via KMail -Name[ja]=KMail 経由 Scalix サーバのカレンダー -Name[km]=ប្រតិទិននៅលើម៉ាស៊ីនបម្រើ Scalix តាមរយៈ KMail -Name[nds]=Kalenner op Scalix-Server över KMail -Name[nl]=Agenda op Scalix-server via KMail -Name[pl]=Kalendarz na serwerze Scalix za pośrednictwem KMaila -Name[pt_BR]=Calendário em Servidor Scalix via KMail -Name[ru]=Календарь на сервере Scalix через KMail -Name[sk]=Kalendár na Scalix serveri pomocou KMail -Name[sr]=Календар на Scalix серверу преко KMail-а -Name[sr@Latn]=Kalendar na Scalix serveru preko KMail-a -Name[sv]=Kalender på Scalix-server via Kmail -Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Takvim -Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的日历 -Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的行事曆 + X-TDE-Library=kcal_scalix Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/scalix/knotes/CMakeLists.txt b/tderesources/scalix/knotes/CMakeLists.txt index 2c088be7..b5fcdf4f 100644 --- a/tderesources/scalix/knotes/CMakeLists.txt +++ b/tderesources/scalix/knotes/CMakeLists.txt @@ -25,16 +25,17 @@ link_directories( ##### other data ################################ -# FIXME this is a conflict - -install( - FILES scalix.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) +tde_create_translated_desktop( + SOURCE scalix.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes + PO_DIR tderesources-desktops +) install( FILES ../uninstall.desktop - RENAME scalix.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes ) + RENAME imap.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes +) ##### knotes_scalix (module) #################### diff --git a/tderesources/scalix/knotes/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h index 6a3676c1..bcfa8cf5 100644 --- a/tderesources/scalix/knotes/resourcescalix.h +++ b/tderesources/scalix/knotes/resourcescalix.h @@ -38,7 +38,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Scalix { @@ -52,7 +52,7 @@ class KDE_EXPORT ResourceScalix : public ResourceNotes, public KCal::IncidenceBase::Observer, public ResourceScalixBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/knotes/scalix.desktop b/tderesources/scalix/knotes/scalix.desktop index 4852f8d2..998db887 100644 --- a/tderesources/scalix/knotes/scalix.desktop +++ b/tderesources/scalix/knotes/scalix.desktop @@ -1,28 +1,6 @@ [Desktop Entry] Name=Notes on Scalix Server via KMail -Name[bg]=Бележки на сървъра Scalix през KMail -Name[ca]=Notes en un servidor Scalix mitjançant el KMail -Name[da]=Noter på Scalix-server via KMail -Name[de]=Notizen auf einem Scalix-Server via KMail -Name[el]=Σημειώσεις σε εξυπηρετητή Scalix μέσω του KMail -Name[es]=Notas en servidor Scalix por medio de KMail -Name[et]=Kalender Scalix-serveris (KMaili vahendusel) -Name[fr]=Notes sur serveur Scalix via KMail -Name[is]=Minnismiðar á Scalix-þjóni gegnum KMail -Name[it]=Note su server Scalix via KMail -Name[ja]=KMail 経由 Scalix サーバのメモ -Name[km]=ចំណាំនៅលើម៉ាស៊ីនបម្រើ Scalix តាមរយៈ KMail -Name[nds]=Notizen op Scalix-Server över KMail -Name[nl]=Notities op Scalix-server via KMail -Name[pl]=Notatki na serwerze Scalix za pośrednictwem KMaila -Name[ru]=Заметки на сервере Scalix через KMail -Name[sk]=Poznámky na Scalix serveri pomocou KMail -Name[sr]=Белешке на Scalix серверу преко KMail-а -Name[sr@Latn]=Beleške na Scalix serveru preko KMail-a -Name[sv]=Anteckningar på Scalix-server via Kmail -Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Takvim -Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的日历 -Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的便條 + X-TDE-Library=knotes_scalix Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp index 8674ce70..af843285 100644 --- a/tderesources/scalix/scalixadmin/delegatedialog.cpp +++ b/tderesources/scalix/scalixadmin/delegatedialog.cpp @@ -63,7 +63,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent ) row++; } - connect( emailSelector, TQT_SIGNAL( clicked() ), TQT_SLOT( selectEmail() ) ); + connect( emailSelector, TQ_SIGNAL( clicked() ), TQ_SLOT( selectEmail() ) ); setMainWidget( page ); } diff --git a/tderesources/scalix/scalixadmin/delegatedialog.h b/tderesources/scalix/scalixadmin/delegatedialog.h index 2f258113..874bced5 100644 --- a/tderesources/scalix/scalixadmin/delegatedialog.h +++ b/tderesources/scalix/scalixadmin/delegatedialog.h @@ -34,7 +34,7 @@ class Delegate; class DelegateDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/delegatemanager.h b/tderesources/scalix/scalixadmin/delegatemanager.h index 05b0262d..b58d8ac9 100644 --- a/tderesources/scalix/scalixadmin/delegatemanager.h +++ b/tderesources/scalix/scalixadmin/delegatemanager.h @@ -28,7 +28,7 @@ class DelegateManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp index b4368f7d..b43dac85 100644 --- a/tderesources/scalix/scalixadmin/delegatepage.cpp +++ b/tderesources/scalix/scalixadmin/delegatepage.cpp @@ -53,10 +53,10 @@ DelegatePage::DelegatePage( TQWidget *parent ) mRemoveButton->setEnabled( false ); layout->addWidget( mRemoveButton, 1, 2 ); - connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editDelegate() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeDelegate() ) ); + connect( mView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addDelegate() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editDelegate() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeDelegate() ) ); loadAllDelegates(); } @@ -69,7 +69,7 @@ void DelegatePage::loadAllDelegates() { Scalix::GetDelegatesJob *job = Scalix::getDelegates( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allDelegates( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( allDelegates( TDEIO::Job* ) ) ); } void DelegatePage::addDelegate() @@ -88,7 +88,7 @@ void DelegatePage::addDelegate() Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email(), delegate.rights() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateAdded( TDEIO::Job* ) ) ); } void DelegatePage::editDelegate() @@ -113,7 +113,7 @@ void DelegatePage::editDelegate() Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email(), delegate.rights() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateAdded( TDEIO::Job* ) ) ); } void DelegatePage::removeDelegate() @@ -124,7 +124,7 @@ void DelegatePage::removeDelegate() Scalix::DeleteDelegateJob *job = Scalix::deleteDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateRemoved( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateRemoved( TDEIO::Job* ) ) ); } void DelegatePage::allDelegates( TDEIO::Job *job ) diff --git a/tderesources/scalix/scalixadmin/delegatepage.h b/tderesources/scalix/scalixadmin/delegatepage.h index 0523effe..eabd988d 100644 --- a/tderesources/scalix/scalixadmin/delegatepage.h +++ b/tderesources/scalix/scalixadmin/delegatepage.h @@ -30,7 +30,7 @@ class DelegateView; class DelegatePage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp index 79b8cf33..e999baff 100644 --- a/tderesources/scalix/scalixadmin/delegateview.cpp +++ b/tderesources/scalix/scalixadmin/delegateview.cpp @@ -48,7 +48,7 @@ DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent ) setFullWidth( true ); setAllColumnsShowFocus( true ); - connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( delegateChanged() ) ); + connect( mManager, TQ_SIGNAL( changed() ), TQ_SLOT( delegateChanged() ) ); delegateChanged(); } diff --git a/tderesources/scalix/scalixadmin/delegateview.h b/tderesources/scalix/scalixadmin/delegateview.h index 0416b8a0..2b72d284 100644 --- a/tderesources/scalix/scalixadmin/delegateview.h +++ b/tderesources/scalix/scalixadmin/delegateview.h @@ -31,7 +31,7 @@ class DelegateManager; class DelegateView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp index e07b17ca..d965438d 100644 --- a/tderesources/scalix/scalixadmin/jobs.cpp +++ b/tderesources/scalix/scalixadmin/jobs.cpp @@ -207,8 +207,8 @@ DeleteDelegateJob::DeleteDelegateJob( const KURL& url, const TQByteArray &packed GetDelegatesJob::GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } Delegate::List GetDelegatesJob::delegates() const @@ -259,8 +259,8 @@ DeleteOtherUserJob::DeleteOtherUserJob( const KURL& url, const TQByteArray &pack GetOtherUsersJob::GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } TQStringList GetOtherUsersJob::otherUsers() const @@ -281,8 +281,8 @@ SetOutOfOfficeJob::SetOutOfOfficeJob( const KURL& url, const TQByteArray &packed GetOutOfOfficeJob::GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } bool GetOutOfOfficeJob::enabled() const diff --git a/tderesources/scalix/scalixadmin/jobs.h b/tderesources/scalix/scalixadmin/jobs.h index 832db070..0f65a104 100644 --- a/tderesources/scalix/scalixadmin/jobs.h +++ b/tderesources/scalix/scalixadmin/jobs.h @@ -132,7 +132,7 @@ namespace Scalix { class GetDelegatesJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: @@ -161,7 +161,7 @@ namespace Scalix { class GetOtherUsersJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: @@ -184,7 +184,7 @@ namespace Scalix { class GetOutOfOfficeJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp index 3e6eea04..a58dec2e 100644 --- a/tderesources/scalix/scalixadmin/ldapview.cpp +++ b/tderesources/scalix/scalixadmin/ldapview.cpp @@ -56,10 +56,10 @@ LdapView::LdapView( TQWidget *parent ) attrs << "surname" << "mail"; mClient->setAttrs( attrs ); - connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ), - this, TQT_SLOT( entryAdded( const TDEABC::LdapObject& ) ) ); - connect( mClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( error( const TQString& ) ) ); + connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ), + this, TQ_SLOT( entryAdded( const TDEABC::LdapObject& ) ) ); + connect( mClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( error( const TQString& ) ) ); } LdapView::~LdapView() diff --git a/tderesources/scalix/scalixadmin/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h index 9de45817..f405045b 100644 --- a/tderesources/scalix/scalixadmin/ldapview.h +++ b/tderesources/scalix/scalixadmin/ldapview.h @@ -29,7 +29,7 @@ class LdapObject; class LdapView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/otherusermanager.h b/tderesources/scalix/scalixadmin/otherusermanager.h index 26f33ee4..e02e53a1 100644 --- a/tderesources/scalix/scalixadmin/otherusermanager.h +++ b/tderesources/scalix/scalixadmin/otherusermanager.h @@ -26,7 +26,7 @@ class OtherUserManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp index 3cc220ea..f7594acf 100644 --- a/tderesources/scalix/scalixadmin/otheruserpage.cpp +++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp @@ -52,9 +52,9 @@ OtherUserPage::OtherUserPage( TQWidget *parent ) mDeleteButton->setEnabled( false ); layout->addWidget( mDeleteButton, 1, 1 ); - connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeUser() ) ); + connect( mView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addUser() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeUser() ) ); loadAllUsers(); } @@ -67,7 +67,7 @@ void OtherUserPage::loadAllUsers() { Scalix::GetOtherUsersJob *job = Scalix::getOtherUsers( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allUsers( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( allUsers( TDEIO::Job* ) ) ); } void OtherUserPage::addUser() @@ -82,7 +82,7 @@ void OtherUserPage::addUser() Scalix::AddOtherUserJob *job = Scalix::addOtherUser( Settings::self()->globalSlave(), Settings::self()->accountUrl(), email ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userAdded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( userAdded( TDEIO::Job* ) ) ); } void OtherUserPage::removeUser() @@ -93,7 +93,7 @@ void OtherUserPage::removeUser() Scalix::DeleteOtherUserJob *job = Scalix::deleteOtherUser( Settings::self()->globalSlave(), Settings::self()->accountUrl(), email ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userRemoved( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( userRemoved( TDEIO::Job* ) ) ); } void OtherUserPage::allUsers( TDEIO::Job *job ) diff --git a/tderesources/scalix/scalixadmin/otheruserpage.h b/tderesources/scalix/scalixadmin/otheruserpage.h index e8c5e269..03527125 100644 --- a/tderesources/scalix/scalixadmin/otheruserpage.h +++ b/tderesources/scalix/scalixadmin/otheruserpage.h @@ -30,7 +30,7 @@ class OtherUserView; class OtherUserPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp index e8aa13bc..be09dc74 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.cpp +++ b/tderesources/scalix/scalixadmin/otheruserview.cpp @@ -45,7 +45,7 @@ OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent ) addColumn( i18n( "Registered Accounts" ) ); setFullWidth( true ); - connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( userChanged() ) ); + connect( mManager, TQ_SIGNAL( changed() ), TQ_SLOT( userChanged() ) ); userChanged(); } diff --git a/tderesources/scalix/scalixadmin/otheruserview.h b/tderesources/scalix/scalixadmin/otheruserview.h index 832b09b8..b52ce1d7 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.h +++ b/tderesources/scalix/scalixadmin/otheruserview.h @@ -27,7 +27,7 @@ class OtherUserManager; class OtherUserView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp index e807379a..343f4f4c 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.cpp +++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp @@ -38,7 +38,7 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) { TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 ); - TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this ); + TQButtonGroup *group = new TQButtonGroup( 1, TQt::Vertical, this ); mDisabled = new TQRadioButton( i18n( "I am in the office" ), group ); mDisabled->setChecked( true ); @@ -55,10 +55,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) statusChanged(); - connect( mEnabled, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( statusChanged() ) ); - connect( mEnabled, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( changed() ) ); - connect( mSaveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( store() ) ); - connect( mMessage, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( changed() ) ); + connect( mEnabled, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( statusChanged() ) ); + connect( mEnabled, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( changed() ) ); + connect( mSaveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( store() ) ); + connect( mMessage, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( changed() ) ); load(); } @@ -71,7 +71,7 @@ void OutOfOfficePage::load() { Scalix::GetOutOfOfficeJob *job = Scalix::getOutOfOffice( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( loaded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( loaded( TDEIO::Job* ) ) ); } void OutOfOfficePage::loaded( TDEIO::Job* job ) @@ -98,7 +98,7 @@ void OutOfOfficePage::store() mEnabled->isChecked(), mMessage->text() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( stored( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( stored( TDEIO::Job* ) ) ); mSaveButton->setEnabled( false ); } diff --git a/tderesources/scalix/scalixadmin/outofofficepage.h b/tderesources/scalix/scalixadmin/outofofficepage.h index f9863fa1..b96de352 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.h +++ b/tderesources/scalix/scalixadmin/outofofficepage.h @@ -30,7 +30,7 @@ class TQTextEdit; class OutOfOfficePage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index 38262725..f67e4251 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.cpp +++ b/tderesources/scalix/scalixadmin/passwordpage.cpp @@ -62,9 +62,9 @@ PasswordPage::PasswordPage( TQWidget *parent ) layout->setRowSpacing( 3, 1 ); - connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); - connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); - connect( mButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonClicked() ) ); + connect( mPassword, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged() ) ); + connect( mPasswordRetype, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged() ) ); + connect( mButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonClicked() ) ); } void PasswordPage::buttonClicked() @@ -77,7 +77,7 @@ void PasswordPage::buttonClicked() mJob = Scalix::setPassword( Settings::self()->globalSlave(), Settings::self()->accountUrl(), Settings::self()->accountPassword(), mPassword->text() ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( finished( TDEIO::Job* ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( finished( TDEIO::Job* ) ) ); updateState( true ); } else { diff --git a/tderesources/scalix/scalixadmin/passwordpage.h b/tderesources/scalix/scalixadmin/passwordpage.h index 5255193e..d7d6f455 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.h +++ b/tderesources/scalix/scalixadmin/passwordpage.h @@ -32,7 +32,7 @@ class Job; class PasswordPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp index 147b9822..6f239cc2 100644 --- a/tderesources/scalix/shared/kmailconnection.cpp +++ b/tderesources/scalix/shared/kmailconnection.cpp @@ -55,8 +55,8 @@ KMailConnection::KMailConnection( ResourceScalixBase* 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/scalix/shared/kmailconnection.h b/tderesources/scalix/shared/kmailconnection.h index 7fec6274..b8f102cd 100644 --- a/tderesources/scalix/shared/kmailconnection.h +++ b/tderesources/scalix/shared/kmailconnection.h @@ -48,7 +48,7 @@ class ResourceScalixBase; 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/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp index f07a6983..51ef8798 100644 --- a/tderesources/scalix/shared/scalixbase.cpp +++ b/tderesources/scalix/shared/scalixbase.cpp @@ -372,12 +372,12 @@ TQDomDocument ScalixBase::domTree() TQString ScalixBase::dateTimeToString( const TQDateTime& time ) { - return time.toString( Qt::ISODate ) + 'Z'; + return time.toString( TQt::ISODate ) + 'Z'; } TQString ScalixBase::dateToString( const TQDate& date ) { - return date.toString( Qt::ISODate ); + return date.toString( TQt::ISODate ); } TQDateTime ScalixBase::stringToDateTime( const TQString& _date ) @@ -385,12 +385,12 @@ TQDateTime ScalixBase::stringToDateTime( const TQString& _date ) TQString date( _date ); if ( date.endsWith( "Z" ) ) date.truncate( date.length() - 1 ); - return TQDateTime::fromString( date, Qt::ISODate ); + return TQDateTime::fromString( date, TQt::ISODate ); } TQDate ScalixBase::stringToDate( const TQString& date ) { - return TQDate::fromString( date, Qt::ISODate ); + return TQDate::fromString( date, TQt::ISODate ); } TQString ScalixBase::sensitivityToString( Sensitivity s ) diff --git a/tderesources/scalix/tdeabc/CMakeLists.txt b/tderesources/scalix/tdeabc/CMakeLists.txt index 5875d5ac..d677a306 100644 --- a/tderesources/scalix/tdeabc/CMakeLists.txt +++ b/tderesources/scalix/tdeabc/CMakeLists.txt @@ -24,9 +24,11 @@ link_directories( ##### other data ################################ -install( - FILES scalix.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +tde_create_translated_desktop( + SOURCE scalix.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc + PO_DIR tderesources-desktops +) install( FILES ../uninstall.desktop diff --git a/tderesources/scalix/tdeabc/contact.cpp b/tderesources/scalix/tdeabc/contact.cpp index 190837a0..6d4cc2bf 100644 --- a/tderesources/scalix/tdeabc/contact.cpp +++ b/tderesources/scalix/tdeabc/contact.cpp @@ -71,7 +71,7 @@ TQString Contact::toXml( const TDEABC::Addressee &addr ) xml += "<reminder_set>" + custom( "reminder_set", addr, "false" ) + "</reminder_set>\n"; xml += "<send_rich_info>" + custom( "send_rich_info", addr, "false" ) + "</send_rich_info>\n"; xml += "<subject>" + addr.formattedName() + "</subject>\n"; - xml += "<last_modification_time>" + addr.revision().toString( Qt::ISODate ) + "</last_modification_time>\n"; + xml += "<last_modification_time>" + addr.revision().toString( TQt::ISODate ) + "</last_modification_time>\n"; xml += "<display_name_prefix>" + addr.prefix() + "</display_name_prefix>\n"; xml += "<first_name>" + addr.givenName() + "</first_name>\n"; @@ -166,7 +166,7 @@ TQString Contact::toXml( const TDEABC::Addressee &addr ) xml += "<office_location>" + addr.custom( "KADDRESSBOOK", "X-Office" ) + "</office_location>\n"; xml += "<spouse>" + addr.custom( "KADDRESSBOOK", "X-SpousesName" ) + "</spouse>\n"; - xml += "<bday>" + addr.birthday().toString( Qt::ISODate ) + "</bday>\n"; + xml += "<bday>" + addr.birthday().toString( TQt::ISODate ) + "</bday>\n"; xml += "<anniversary>" + addr.custom( "KADDRESSBOOK", "X-Anniversary" ) + "</anniversary>\n"; xml += "<mapi_charset>" + custom( "mapi_charset", addr, "UTF8" ) + "</mapi_charset>"; @@ -235,7 +235,7 @@ TDEABC::Addressee Contact::fromXml( const TQString &xml ) else if ( element.tagName() == "send_rich_info" ) setCustom( "send_rich_info", element.text(), addr ); else if ( element.tagName() == "last_modification_time" ) - addr.setRevision( TQDateTime::fromString( element.text(), Qt::ISODate ) ); + addr.setRevision( TQDateTime::fromString( element.text(), TQt::ISODate ) ); // name else if ( element.tagName() == "display_name_prefix" ) @@ -352,7 +352,7 @@ TDEABC::Addressee Contact::fromXml( const TQString &xml ) addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", element.text() ); else if ( element.tagName() == "bday" ) - addr.setBirthday( TQDateTime::fromString( element.text(), Qt::ISODate ) ); + addr.setBirthday( TQDateTime::fromString( element.text(), TQt::ISODate ) ); else if ( element.tagName() == "anniversary" ) addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", element.text() ); else diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h index f9d4c309..ee3c8af9 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.h +++ b/tderesources/scalix/tdeabc/resourcescalix.h @@ -39,7 +39,7 @@ #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEABC { @@ -53,7 +53,7 @@ namespace TDEABC { class KDE_EXPORT ResourceScalix : public KPIM::ResourceABC, public Scalix::ResourceScalixBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/tdeabc/scalix.desktop b/tderesources/scalix/tdeabc/scalix.desktop index 673082db..99817840 100644 --- a/tderesources/scalix/tdeabc/scalix.desktop +++ b/tderesources/scalix/tdeabc/scalix.desktop @@ -1,28 +1,6 @@ [Desktop Entry] Name=Addressbook on Scalix Server via KMail -Name[bg]=Адресник на сървъра Scalix през KMail -Name[ca]=Llibreta d'adreces en un servidor Scalix mitjançant el KMail -Name[da]=Adressebog på Scalix-server via KMail -Name[de]=Adressbuch auf einem Scalix-Server via KMail -Name[el]=Βιβλίο διευθύνσεων σε εξυπηρετητή Scalix μέσω του KMail -Name[es]=Libreta de direcciones en servidor Scalix por medio de KMail -Name[et]=Aadressiraamat Scalix-serveris (KMaili vahendusel) -Name[fr]=Carnet d'adresses sur serveur Scalix via KMail -Name[is]=Vistfangaskrá á Scalix-þjóni gegnum KMail -Name[it]=Rubrica indirizzi su server Scalix via KMail -Name[ja]=KMail 経由 Scalix サーバのアドレス帳 -Name[km]=សៀវភៅអាសយដ្ឋាននៅលើម៉ាស៊ីនបម្រើ Scalix តាមរយៈ KMail -Name[nds]=Adressbook op Scalix-Server över KMail -Name[nl]=Adresboek op Scalix-server via KMail -Name[pl]=Książka adresowa na serwerze Scalix za pośrednictwem KMaila -Name[ru]=Адресная книга на сервере Scalix через KMail -Name[sk]=Adresár na Scalix serveri pomocou KMail -Name[sr]=Адресар на Scalix серверу преко KMail-а -Name[sr@Latn]=Adresar na Scalix serveru preko KMail-a -Name[sv]=Adressbok på Scalix-server via Kmail -Name[tr]=KMail Aracılığı ile Scalix Sunucusunda Adres Defteri -Name[zh_CN]=通过 KMail 访问 Scalix 服务器上的地址簿 -Name[zh_TW]=透過 KMail 取得 Scalix 伺服器上的通訊錄 + X-TDE-Library=tdeabc_scalix Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/scalix/tdeioslave/CMakeLists.txt b/tderesources/scalix/tdeioslave/CMakeLists.txt index d1ae3844..717e5cb1 100644 --- a/tderesources/scalix/tdeioslave/CMakeLists.txt +++ b/tderesources/scalix/tdeioslave/CMakeLists.txt @@ -23,9 +23,11 @@ link_directories( ##### other data ################################ -install( - FILES scalix.protocol scalixs.protocol - DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE scalix.protocol scalixs.protocol + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tderesources-desktops +) ##### tdeio_scalix (module) ####################### diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 5ce8dca1..8dbb8651 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -28,7 +28,7 @@ #include <tdeio/global.h> #include <tdelocale.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <stdlib.h> @@ -116,10 +116,10 @@ void Scalix::retrieveFreeBusy( const KURL &url ) mFreeBusyData = TQString(); TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotRetrieveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotRetrieveResult( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); } @@ -182,8 +182,8 @@ void Scalix::publishFreeBusy( const KURL &url ) .arg( url.host() ); TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotPublishResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotPublishResult( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); } diff --git a/tderesources/scalix/tdeioslave/scalix.h b/tderesources/scalix/tdeioslave/scalix.h index f4dbdead..78a71447 100644 --- a/tderesources/scalix/tdeioslave/scalix.h +++ b/tderesources/scalix/tdeioslave/scalix.h @@ -28,7 +28,7 @@ class Scalix : public TQObject, public TDEIO::SlaveBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/slox/CMakeLists.txt b/tderesources/slox/CMakeLists.txt index 0d932ecb..a9ce5a9a 100644 --- a/tderesources/slox/CMakeLists.txt +++ b/tderesources/slox/CMakeLists.txt @@ -25,8 +25,17 @@ link_directories( ##### other data ################################ -install( FILES kcal_slox.desktop kcal_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal ) -install( FILES tdeabc_slox.desktop tdeabc_ox.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc ) +tde_create_translated_desktop( + SOURCE kcal_slox.desktop kcal_ox.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal + PO_DIR tderesources-desktops +) + +tde_create_translated_desktop( + SOURCE tdeabc_slox.desktop tdeabc_ox.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/tdeabc + PO_DIR tderesources-desktops +) ##### kcal_slox (module) ######################## diff --git a/tderesources/slox/kcal_ox.desktop b/tderesources/slox/kcal_ox.desktop index 1a70f2fc..6df9cdb4 100644 --- a/tderesources/slox/kcal_ox.desktop +++ b/tderesources/slox/kcal_ox.desktop @@ -1,44 +1,6 @@ [Desktop Entry] Name=OpenXchange Server -Name[af]=OpenXchange bediener -Name[bg]=Сървър OpenXchange -Name[br]=Servijer OpenXchange -Name[ca]=Servidor OpenXchange -Name[da]=Openxchange-server -Name[el]=Εξυπηρετητής OpenXchange -Name[es]=Servidor OpenXchange -Name[et]=OpenXchange server -Name[eu]=OpenXchange zerbitzaria -Name[fa]=کارساز OpenXchange -Name[fi]=OpenXchange-palvelin -Name[fr]=Serveur OpenXchange -Name[fy]=OpenXchange-tsjinner -Name[ga]=Freastalaí Openexchange -Name[gl]=Servidor OpenXchange -Name[hu]=OpenXchange-kiszolgáló -Name[is]=OpenXchange þjónn -Name[ja]=OpenXchange サーバ -Name[kk]=OpenXchange сервері -Name[km]=ម៉ាស៊ីនបម្រើ OpenXchange -Name[lt]=OpenXchange serveris -Name[mk]=OpenXchange-сервер -Name[nb]=OpenExchange-tjener -Name[nds]=OpenXchange-Server -Name[ne]=ओपन एक्सचेन्ज सर्भर -Name[nl]=OpenXchange-server -Name[nn]=OpenXchange-tenar -Name[pl]=Server OpenXchange -Name[pt]=Servidor OpenXchange -Name[pt_BR]=Servidor OpenXchange -Name[ru]=Сервер OpenXchange -Name[sl]=Strežnik OpenXchange -Name[sr]=Openexchange сервер -Name[sr@Latn]=Openexchange server -Name[sv]=Openxchange-server -Name[tr]=OpenXchange Sunucusu -Name[uk]=Сервер OpenXchange -Name[zh_CN]=OpenXchange 服务器 -Name[zh_TW]=OpenXchange 伺服器 + X-TDE-Library=kcal_slox Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/slox/kcal_slox.desktop b/tderesources/slox/kcal_slox.desktop index dec7e48f..61034b16 100644 --- a/tderesources/slox/kcal_slox.desktop +++ b/tderesources/slox/kcal_slox.desktop @@ -1,49 +1,6 @@ [Desktop Entry] Name=SUSE LINUX Openexchange Server -Name[af]=SuSE Linux OpenExchange bediener -Name[bg]=Сървър SUSE LINUX Openexchange -Name[br]=Servijer Openexchange SUSE LINUX -Name[ca]=Servidor SUSE LINUX Openexchange -Name[cs]=SUSE LINUX Openexchange server -Name[da]=SUSE Linux Openexchange-server -Name[de]=SUSE LINUX Openexchange-Server -Name[el]=Εξυπηρετητή SUSE LINUX Openexchange -Name[es]=Servidor Openexchange de SUSE LINUX -Name[et]=SUSE LINUX Openexchange server -Name[eu]=SUSE LINUX Openexchange zerbitzaria -Name[fa]=کارساز SUSE LINUX Openexchange -Name[fi]=Suse Linux Openexchange -palvelin -Name[fr]=Serveur SUSE Linux Openexchange -Name[fy]=SUSE LINUX Openexchange-tsjinner -Name[ga]=Freastalaí Openexchange SUSE LINUX -Name[gl]=Servidor SUSE LINUX Openexchange -Name[hu]=SUSE LINUX Openexchange-kiszolgáló -Name[is]=SUSE LINUX Openexchange þjónn -Name[it]=Server SUSE LINUX Openexchange -Name[ja]=SUSE LINUX Openexchange サーバ -Name[kk]=SUSE LINUX Openexchange сервері -Name[km]=ម៉ាស៊ីនបម្រើ Openexchange របស់ស៊ូស៊ីលីនីក -Name[lt]=SUSE LINUX Openexchange serveris -Name[mk]=SUSE LINUX Openexchange-сервер -Name[ms]=Pelayan SUSE LINUX Openexchange -Name[nb]=SUSE LINUX Openexchange-tjener -Name[nds]=SUSE-Openexchangeserver -Name[ne]=SUSE LINUX ओपन एक्सचेन्ज सर्भर -Name[nl]=SUSE LINUX Openexchange-server -Name[nn]=SUSE LINUX Openexchange-tenar -Name[pl]=Server SUSE LINUX Openexchange -Name[pt]=Servidor SUSE LINUX Openexchange -Name[pt_BR]=Servidor OpenExchange do SUSE Linux (SLOX) -Name[ru]=Сервер SUSE LINUX Openexchange -Name[sl]=Strežnik SUSE LINUX Openexchange -Name[sr]=Openexchange сервер SUSE-овог Linux-а -Name[sr@Latn]=Openexchange server SUSE-ovog Linux-a -Name[sv]=SUSE Linux Openexchange-server -Name[ta]=SUSE LINUX திறந்த பரிமாற்ற சேவகன் -Name[tr]=SUSE LINUX Openexchange Sunucusu -Name[uk]=Сервер SUSE LINUX Openexchange -Name[zh_CN]=SUSE LINUX Openexchange 服务器 -Name[zh_TW]=SUSE LINUX Openexchange 伺服器 + X-TDE-Library=kcal_slox Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp index 4c2ab12c..e93b8944 100644 --- a/tderesources/slox/kcalresourceslox.cpp +++ b/tderesources/slox/kcalresourceslox.cpp @@ -226,16 +226,16 @@ void KCalResourceSlox::requestEvents() kdDebug() << "REQUEST CALENDAR: \n" << doc.toString( 2 ) << endl; mLoadEventsJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mLoadEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) ); - connect( mLoadEventsJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mLoadEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) ); + connect( mLoadEventsJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) ); mLoadEventsProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading events") ); connect( mLoadEventsProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoadEvents() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoadEvents() ) ); mPrefs->setLastEventSync( TQDateTime::currentDateTime() ); } @@ -271,16 +271,16 @@ void KCalResourceSlox::requestTodos() kdDebug() << "REQUEST TASKS: \n" << doc.toString( 2 ) << endl; mLoadTodosJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mLoadTodosJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) ); - connect( mLoadTodosJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mLoadTodosJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) ); + connect( mLoadTodosJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) ); mLoadTodosProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading to-dos") ); connect( mLoadTodosProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoadTodos() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoadTodos() ) ); mPrefs->setLastTodoSync( TQDateTime::currentDateTime() ); } @@ -380,16 +380,16 @@ void KCalResourceSlox::uploadIncidences() kdDebug() << "UPLOAD: \n" << doc.toString( 2 ) << endl; mUploadJob = TDEIO::davPropPatch( url, doc, false ); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) ); - connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) ); mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Uploading incidence") ); connect( mUploadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelUpload() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelUpload() ) ); } void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc, diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h index 39a2757e..a4a80b3e 100644 --- a/tderesources/slox/kcalresourceslox.h +++ b/tderesources/slox/kcalresourceslox.h @@ -31,7 +31,7 @@ #include <kurl.h> #include <tdeconfig.h> #include <kdirwatch.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <libkcal/incidence.h> #include <libkcal/todo.h> @@ -60,7 +60,7 @@ class SloxAccounts; */ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase { - Q_OBJECT + TQ_OBJECT friend class KCalResourceSloxConfig; diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp index 83246a03..8652263f 100644 --- a/tderesources/slox/kcalresourcesloxconfig.cpp +++ b/tderesources/slox/kcalresourcesloxconfig.cpp @@ -72,11 +72,11 @@ KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent, const char* n mCalButton = new KPushButton( i18n("Calendar Folder..."), this ); mainLayout->addWidget( mCalButton, 5, 0 ); - connect( mCalButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCalendarFolder() ) ); + connect( mCalButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectCalendarFolder() ) ); mTaskButton = new KPushButton( i18n("Task Folder..."), this ); mainLayout->addWidget( mTaskButton, 5, 1 ); - connect( mTaskButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectTaskFolder() ) ); + connect( mTaskButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectTaskFolder() ) ); mReloadConfig = new KCal::ResourceCachedReloadConfig( this ); mainLayout->addMultiCellWidget( mReloadConfig, 6, 6, 0, 1 ); diff --git a/tderesources/slox/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h index e2a666c0..21670bbb 100644 --- a/tderesources/slox/kcalresourcesloxconfig.h +++ b/tderesources/slox/kcalresourcesloxconfig.h @@ -21,7 +21,7 @@ #define KCALRESOURCESLOXCONFIG_H #include <kurlrequester.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tderesources/resource.h> #include <tderesources/configwidget.h> @@ -44,7 +44,7 @@ class SloxBase; */ class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: KCalResourceSloxConfig( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp index 3afa7019..e5ba2651 100644 --- a/tderesources/slox/sloxaccounts.cpp +++ b/tderesources/slox/sloxaccounts.cpp @@ -139,8 +139,8 @@ void SloxAccounts::requestAccounts() mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); } - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void SloxAccounts::slotResult( TDEIO::Job *job ) diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h index 2e9d1289..7b5e92a1 100644 --- a/tderesources/slox/sloxaccounts.h +++ b/tderesources/slox/sloxaccounts.h @@ -21,7 +21,7 @@ #define SLOXACCOUNTS_H #include <tdeabc/addressee.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqobject.h> namespace TDEIO { @@ -32,7 +32,7 @@ class SloxBase; class KDE_EXPORT SloxAccounts : public TQObject { - Q_OBJECT + TQ_OBJECT public: SloxAccounts( SloxBase *res, const KURL &baseUrl ); diff --git a/tderesources/slox/sloxbase.h b/tderesources/slox/sloxbase.h index 8e9309c9..dc3c9c53 100644 --- a/tderesources/slox/sloxbase.h +++ b/tderesources/slox/sloxbase.h @@ -21,7 +21,7 @@ #define SLOXUTILS_H #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace KRES { class Resource; diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h index 6f6a6c93..06f08003 100644 --- a/tderesources/slox/sloxfolder.h +++ b/tderesources/slox/sloxfolder.h @@ -21,7 +21,7 @@ #define SLOXFOLDER_H #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEListViewItem; diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index 716c2d40..c1f1086e 100644 --- a/tderesources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp @@ -37,7 +37,7 @@ SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, mListView->addColumn( i18n("Folder ID"), 0 ); setMainWidget( mListView ); updateFolderView(); - connect( manager, TQT_SIGNAL( foldersUpdated() ), TQT_SLOT( updateFolderView() ) ); + connect( manager, TQ_SIGNAL( foldersUpdated() ), TQ_SLOT( updateFolderView() ) ); } SloxFolderDialog::~SloxFolderDialog() diff --git a/tderesources/slox/sloxfolderdialog.h b/tderesources/slox/sloxfolderdialog.h index 1a0749ea..0b8785ea 100644 --- a/tderesources/slox/sloxfolderdialog.h +++ b/tderesources/slox/sloxfolderdialog.h @@ -30,7 +30,7 @@ class SloxFolderManager; class SloxFolderDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = 0, const char *name = 0 ); diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp index d7284d3a..b862a388 100644 --- a/tderesources/slox/sloxfoldermanager.cpp +++ b/tderesources/slox/sloxfoldermanager.cpp @@ -79,8 +79,8 @@ void SloxFolderManager::requestFolders() mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void SloxFolderManager::slotResult( TDEIO::Job *job ) diff --git a/tderesources/slox/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h index f31c212c..f61ab471 100644 --- a/tderesources/slox/sloxfoldermanager.h +++ b/tderesources/slox/sloxfoldermanager.h @@ -25,7 +25,7 @@ #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace TDEIO { class Job; @@ -37,7 +37,7 @@ class SloxFolder; class KDE_EXPORT SloxFolderManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: SloxFolderManager( SloxBase *res, const KURL &baseUrl ); diff --git a/tderesources/slox/tdeabc_ox.desktop b/tderesources/slox/tdeabc_ox.desktop index cf3407d9..88f32adf 100644 --- a/tderesources/slox/tdeabc_ox.desktop +++ b/tderesources/slox/tdeabc_ox.desktop @@ -1,44 +1,6 @@ [Desktop Entry] Name=OpenXchange Server -Name[af]=OpenXchange bediener -Name[bg]=Сървър OpenXchange -Name[br]=Servijer OpenXchange -Name[ca]=Servidor OpenXchange -Name[da]=Openxchange-server -Name[el]=Εξυπηρετητής OpenXchange -Name[es]=Servidor OpenXchange -Name[et]=OpenXchange server -Name[eu]=OpenXchange zerbitzaria -Name[fa]=کارساز OpenXchange -Name[fi]=OpenXchange-palvelin -Name[fr]=Serveur OpenXchange -Name[fy]=OpenXchange-tsjinner -Name[ga]=Freastalaí Openexchange -Name[gl]=Servidor OpenXchange -Name[hu]=OpenXchange-kiszolgáló -Name[is]=OpenXchange þjónn -Name[ja]=OpenXchange サーバ -Name[kk]=OpenXchange сервері -Name[km]=ម៉ាស៊ីនបម្រើ OpenXchange -Name[lt]=OpenXchange serveris -Name[mk]=OpenXchange-сервер -Name[nb]=OpenExchange-tjener -Name[nds]=OpenXchange-Server -Name[ne]=ओपन एक्सचेन्ज सर्भर -Name[nl]=OpenXchange-server -Name[nn]=OpenXchange-tenar -Name[pl]=Server OpenXchange -Name[pt]=Servidor OpenXchange -Name[pt_BR]=Servidor OpenXchange -Name[ru]=Сервер OpenXchange -Name[sl]=Strežnik OpenXchange -Name[sr]=Openexchange сервер -Name[sr@Latn]=Openexchange server -Name[sv]=Openxchange-server -Name[tr]=OpenXchange Sunucusu -Name[uk]=Сервер OpenXchange -Name[zh_CN]=OpenXchange 服务器 -Name[zh_TW]=OpenXchange 伺服器 + X-TDE-Library=tdeabc_slox Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/slox/tdeabc_slox.desktop b/tderesources/slox/tdeabc_slox.desktop index 6e9a6075..0552cc6a 100644 --- a/tderesources/slox/tdeabc_slox.desktop +++ b/tderesources/slox/tdeabc_slox.desktop @@ -1,49 +1,6 @@ [Desktop Entry] Name=SUSE LINUX Openexchange Server -Name[af]=SuSE Linux OpenExchange bediener -Name[bg]=Сървър SUSE LINUX Openexchange -Name[br]=Servijer Openexchange SUSE LINUX -Name[ca]=Servidor SUSE LINUX Openexchange -Name[cs]=SUSE LINUX Openexchange server -Name[da]=SUSE Linux Openexchange-server -Name[de]=SUSE LINUX Openexchange-Server -Name[el]=Εξυπηρετητή SUSE LINUX Openexchange -Name[es]=Servidor Openexchange de SUSE LINUX -Name[et]=SUSE LINUX Openexchange server -Name[eu]=SUSE LINUX Openexchange zerbitzaria -Name[fa]=کارساز SUSE LINUX Openexchange -Name[fi]=Suse Linux Openexchange -palvelin -Name[fr]=Serveur SUSE Linux Openexchange -Name[fy]=SUSE LINUX Openexchange-tsjinner -Name[ga]=Freastalaí Openexchange SUSE LINUX -Name[gl]=Servidor SUSE LINUX Openexchange -Name[hu]=SUSE LINUX Openexchange-kiszolgáló -Name[is]=SUSE LINUX Openexchange þjónn -Name[it]=Server SUSE LINUX Openexchange -Name[ja]=SUSE LINUX Openexchange サーバ -Name[kk]=SUSE LINUX Openexchange сервері -Name[km]=ម៉ាស៊ីនបម្រើ Openexchange របស់ស៊ូស៊ីលីនីក -Name[lt]=SUSE LINUX Openexchange serveris -Name[mk]=SUSE LINUX Openexchange-сервер -Name[ms]=Pelayan SUSE LINUX Openexchange -Name[nb]=SUSE LINUX Openexchange-tjener -Name[nds]=SUSE-Openexchangeserver -Name[ne]=SUSE LINUX ओपन एक्सचेन्ज सर्भर -Name[nl]=SUSE LINUX Openexchange-server -Name[nn]=SUSE LINUX Openexchange-tenar -Name[pl]=Server SUSE LINUX Openexchange -Name[pt]=Servidor SUSE LINUX Openexchange -Name[pt_BR]=Servidor OpenExchange do SUSE Linux (SLOX) -Name[ru]=Сервер SUSE LINUX Openexchange -Name[sl]=Strežnik SUSE LINUX Openexchange -Name[sr]=Openexchange сервер SUSE-овог Linux-а -Name[sr@Latn]=Openexchange server SUSE-ovog Linux-a -Name[sv]=SUSE Linux Openexchange-server -Name[ta]=SUSE LINUX திறந்த பரிமாற்ற சேவகன் -Name[tr]=SUSE LINUX Openexchange Sunucusu -Name[uk]=Сервер SUSE LINUX Openexchange -Name[zh_CN]=SUSE LINUX Openexchange 服务器 -Name[zh_TW]=SUSE LINUX Openexchange 伺服器 + X-TDE-Library=tdeabc_slox Type=Service X-TDE-ServiceTypes=TDEResources/Plugin diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp index 248e3f39..d77347d3 100644 --- a/tderesources/slox/tdeabcresourceslox.cpp +++ b/tderesources/slox/tdeabcresourceslox.cpp @@ -21,6 +21,7 @@ #include <tqapplication.h> +#include <tdeversion.h> #include <tdeabc/picture.h> #include <tdeconfig.h> #include <kdebug.h> @@ -207,16 +208,16 @@ bool ResourceSlox::asyncLoad() kdDebug() << "REQUEST CONTACTS: \n" << doc.toString( 2 ) << endl; mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); mDownloadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading contacts") ); connect( mDownloadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelDownload() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelDownload() ) ); mPrefs->setLastSync( TQDateTime::currentDateTime() ); @@ -401,7 +402,7 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a ) a.insertCustom( "KADDRESSBOOK", "X-SpousesName", text ); } else if ( tag == fieldName( Anniversary ) ) { TQDateTime dt = WebdavHandler::sloxToTQDateTime( text ); - a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( Qt::ISODate ) ); + a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( TQt::ISODate ) ); } else if ( tag == fieldName( Categories ) ) { a.setCategories( TQStringList::split( TQRegExp(",\\s*"), text ) ); } else if ( type() == "ox" ) { // FIXME: Address reading is missing for SLOX @@ -520,16 +521,16 @@ void ResourceSlox::uploadContacts() url.setPass( mPrefs->password() ); mUploadJob = TDEIO::davPropPatch( url, doc, false ); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) ); - connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Uploading contacts") ); connect( mUploadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelUpload() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelUpload() ) ); } void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop, @@ -576,7 +577,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop TQString anniversary = a.custom( "KADDRESSBOOK", "X-Anniversary" ); if ( !anniversary.isEmpty() ) WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ), - WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, Qt::ISODate ).date() ) ); + WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, TQt::ISODate ).date() ) ); else WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ) ); } diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h index 35a71be2..225f8a33 100644 --- a/tderesources/slox/tdeabcresourceslox.h +++ b/tderesources/slox/tdeabcresourceslox.h @@ -24,7 +24,7 @@ #include "webdavhandler.h" #include <libtdepim/tdeabcresourcecached.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeabc/addressee.h> #include <tqmap.h> @@ -47,7 +47,7 @@ class SloxPrefs; class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase { - Q_OBJECT + TQ_OBJECT public: ResourceSlox( const TDEConfig * ); diff --git a/tderesources/slox/tdeabcresourcesloxconfig.cpp b/tderesources/slox/tdeabcresourcesloxconfig.cpp index 8ad6701c..36f76238 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.cpp +++ b/tderesources/slox/tdeabcresourcesloxconfig.cpp @@ -69,7 +69,7 @@ ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent, const char* name ) mFolderButton = new KPushButton( i18n("Select Folder..."), this ); mainLayout->addMultiCellWidget( mFolderButton, 4, 4, 0, 1 ); - connect( mFolderButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectAddressFolder() ) ); + connect( mFolderButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectAddressFolder() ) ); } diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h index 6bbaf6ae..46a9a74a 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.h +++ b/tderesources/slox/tdeabcresourcesloxconfig.h @@ -21,7 +21,7 @@ #define RESOURCESLOXCONFIG_H #include <tderesources/configwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQCheckBox; class KLineEdit; @@ -34,7 +34,7 @@ namespace TDEABC { class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/slox/testsloxaccounts.cpp b/tderesources/slox/testsloxaccounts.cpp index 22c44e66..ea7b3da1 100644 --- a/tderesources/slox/testsloxaccounts.cpp +++ b/tderesources/slox/testsloxaccounts.cpp @@ -55,7 +55,7 @@ int main(int argc,char **argv) app.setMainWidget( &button ); button.show(); - TQObject::connect( &button, TQT_SIGNAL( clicked() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &button, TQ_SIGNAL( clicked() ), &app, TQ_SLOT( quit() ) ); app.exec(); } diff --git a/tderesources/slox/webdavhandler.cpp b/tderesources/slox/webdavhandler.cpp index 4b57e1de..8d677bd0 100644 --- a/tderesources/slox/webdavhandler.cpp +++ b/tderesources/slox/webdavhandler.cpp @@ -199,7 +199,7 @@ TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str ) TQDateTime dt; if (preEpoch) { - dt.setTime_t( 0, Qt::UTC ); + dt.setTime_t( 0, TQt::UTC ); if (ticks > INT_MAX) { dt = dt.addSecs(-INT_MAX); ticks -= INT_MAX; @@ -208,7 +208,7 @@ TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str ) } else { - dt.setTime_t( ticks, Qt::UTC ); + dt.setTime_t( ticks, TQt::UTC ); } return dt; diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h index c7c93222..6d98fd52 100644 --- a/tderesources/slox/webdavhandler.h +++ b/tderesources/slox/webdavhandler.h @@ -25,7 +25,7 @@ #include <tqdatetime.h> #include <tqdom.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tdeabc/addressee.h> namespace KCal { 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..cea9004b 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" @@ -50,7 +50,7 @@ class TVAnytimePrefsBase; */ class KDE_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..926bc7f3 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> @@ -40,7 +40,7 @@ class ResourceCachedSaveConfig; */ class KDE_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" /> |