summaryrefslogtreecommitdiffstats
path: root/kresources
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:53:50 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:53:50 +0000
commit7be55ffa061c026e35e2d6a0effe1161ddb0d41f (patch)
tree8474f9b444b2756228600050f07a7ff25de532b2 /kresources
parentf587f20a6d09f1729dd0a8c1cd8ee0110aec7451 (diff)
downloadtdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.tar.gz
tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources')
-rw-r--r--kresources/birthdays/resourcekabc.cpp74
-rw-r--r--kresources/birthdays/resourcekabc.h34
-rw-r--r--kresources/birthdays/resourcekabcconfig.cpp44
-rw-r--r--kresources/birthdays/resourcekabcconfig.h12
-rw-r--r--kresources/blogging/API_Blog.cpp30
-rw-r--r--kresources/blogging/API_Blog.h110
-rw-r--r--kresources/blogging/API_Blogger.cpp100
-rw-r--r--kresources/blogging/API_Blogger.h16
-rw-r--r--kresources/blogging/bloggingcalendaradaptor.cpp46
-rw-r--r--kresources/blogging/bloggingcalendaradaptor.h26
-rw-r--r--kresources/blogging/bloggingglobals.cpp18
-rw-r--r--kresources/blogging/bloggingglobals.h12
-rw-r--r--kresources/blogging/kcal_resourceblogging.cpp2
-rw-r--r--kresources/blogging/kcal_resourcebloggingconfig.cpp2
-rw-r--r--kresources/blogging/kcal_resourcebloggingconfig.h2
-rw-r--r--kresources/blogging/xmlrpcjob.cpp192
-rw-r--r--kresources/blogging/xmlrpcjob.h54
-rw-r--r--kresources/caldav/config.cpp30
-rw-r--r--kresources/caldav/config.h10
-rw-r--r--kresources/caldav/configwidgets.cpp106
-rw-r--r--kresources/caldav/configwidgets.h6
-rw-r--r--kresources/caldav/job.cpp12
-rw-r--r--kresources/caldav/job.h30
-rw-r--r--kresources/caldav/preferences.cpp32
-rw-r--r--kresources/caldav/preferences.h28
-rw-r--r--kresources/caldav/reader.h16
-rw-r--r--kresources/caldav/resource.cpp92
-rw-r--r--kresources/caldav/resource.h32
-rw-r--r--kresources/caldav/writer.h20
-rw-r--r--kresources/carddav/config.cpp32
-rw-r--r--kresources/carddav/config.h12
-rw-r--r--kresources/carddav/configwidgets.cpp106
-rw-r--r--kresources/carddav/configwidgets.h6
-rw-r--r--kresources/carddav/job.cpp12
-rw-r--r--kresources/carddav/job.h30
-rw-r--r--kresources/carddav/preferences.cpp32
-rw-r--r--kresources/carddav/preferences.h28
-rw-r--r--kresources/carddav/reader.h16
-rw-r--r--kresources/carddav/resource.cpp88
-rw-r--r--kresources/carddav/resource.h30
-rw-r--r--kresources/carddav/writer.h20
-rw-r--r--kresources/egroupware/debugdialog.cpp20
-rw-r--r--kresources/egroupware/debugdialog.h8
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpc.cpp202
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpc.h46
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpcconfig.cpp18
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpcconfig.h2
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpc.cpp346
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpc.h70
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpcconfig.cpp18
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpcconfig.h2
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpc.cpp94
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpc.h30
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpcconfig.cpp18
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpcconfig.h2
-rw-r--r--kresources/egroupware/synchronizer.cpp4
-rw-r--r--kresources/egroupware/synchronizer.h6
-rw-r--r--kresources/egroupware/todostatemapper.cpp38
-rw-r--r--kresources/egroupware/todostatemapper.h34
-rw-r--r--kresources/egroupware/xmlrpciface.cpp280
-rw-r--r--kresources/egroupware/xmlrpciface.h160
-rw-r--r--kresources/exchange/dateset.cpp54
-rw-r--r--kresources/exchange/dateset.h46
-rw-r--r--kresources/exchange/resourceexchange.cpp86
-rw-r--r--kresources/exchange/resourceexchange.h60
-rw-r--r--kresources/exchange/resourceexchangeconfig.cpp38
-rw-r--r--kresources/exchange/resourceexchangeconfig.h10
-rw-r--r--kresources/featureplan/benchmarkfeaturelist.cpp8
-rw-r--r--kresources/featureplan/dumpfeaturelist.cpp12
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplan.cpp12
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplanconfig.cpp16
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplanconfig.h4
-rw-r--r--kresources/groupdav/groupdavaddressbookadaptor.h16
-rw-r--r--kresources/groupdav/groupdavcalendaradaptor.h16
-rw-r--r--kresources/groupdav/groupdavglobals.cpp62
-rw-r--r--kresources/groupdav/groupdavglobals.h14
-rw-r--r--kresources/groupdav/kabc_resourcegroupdav.h2
-rw-r--r--kresources/groupware/kabc_resourcegroupware.cpp56
-rw-r--r--kresources/groupware/kabc_resourcegroupware.h6
-rw-r--r--kresources/groupware/kabc_resourcegroupwareconfig.cpp42
-rw-r--r--kresources/groupware/kabc_resourcegroupwareconfig.h6
-rw-r--r--kresources/groupware/kcal_resourcegroupware.cpp32
-rw-r--r--kresources/groupware/kcal_resourcegroupware.h4
-rw-r--r--kresources/groupware/kcal_resourcegroupwareconfig.cpp16
-rw-r--r--kresources/groupware/kcal_resourcegroupwareconfig.h2
-rw-r--r--kresources/groupwise/groupwisesettingswidget.cpp10
-rw-r--r--kresources/groupwise/groupwisesettingswidget.h10
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.cpp110
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.h14
-rw-r--r--kresources/groupwise/kabc_resourcegroupwiseconfig.cpp42
-rw-r--r--kresources/groupwise/kabc_resourcegroupwiseconfig.h8
-rw-r--r--kresources/groupwise/kcal_groupwiseprefs.cpp2
-rw-r--r--kresources/groupwise/kcal_groupwiseprefs.h2
-rw-r--r--kresources/groupwise/kcal_resourcegroupwise.cpp36
-rw-r--r--kresources/groupwise/kcal_resourcegroupwise.h6
-rw-r--r--kresources/groupwise/kcal_resourcegroupwiseconfig.cpp40
-rw-r--r--kresources/groupwise/kcal_resourcegroupwiseconfig.h2
-rw-r--r--kresources/groupwise/kioslave/groupwise.cpp120
-rw-r--r--kresources/groupwise/kioslave/groupwise.h16
-rw-r--r--kresources/groupwise/soap/contactconverter.cpp48
-rw-r--r--kresources/groupwise/soap/contactconverter.h4
-rw-r--r--kresources/groupwise/soap/groupwiseserver.cpp86
-rw-r--r--kresources/groupwise/soap/groupwiseserver.h70
-rw-r--r--kresources/groupwise/soap/gwconverter.cpp72
-rw-r--r--kresources/groupwise/soap/gwconverter.h36
-rw-r--r--kresources/groupwise/soap/gwjobs.cpp26
-rw-r--r--kresources/groupwise/soap/gwjobs.h20
-rw-r--r--kresources/groupwise/soap/incidenceconverter.cpp44
-rw-r--r--kresources/groupwise/soap/incidenceconverter.h18
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp62
-rw-r--r--kresources/groupwise/soap/ksslsocket.h12
-rw-r--r--kresources/groupwise/soap/soapdebug.cpp16
-rw-r--r--kresources/groupwise/soap/stdsoap2.h2
-rw-r--r--kresources/kolab/kabc/contact.cpp296
-rw-r--r--kresources/kolab/kabc/contact.h300
-rw-r--r--kresources/kolab/kabc/resourcekolab.cpp140
-rw-r--r--kresources/kolab/kabc/resourcekolab.h54
-rw-r--r--kresources/kolab/kabc/resourcekolab_plugin.cpp2
-rw-r--r--kresources/kolab/kcal/event.cpp40
-rw-r--r--kresources/kolab/kcal/event.h30
-rw-r--r--kresources/kolab/kcal/incidence.cpp162
-rw-r--r--kresources/kolab/kcal/incidence.h94
-rw-r--r--kresources/kolab/kcal/journal.cpp42
-rw-r--r--kresources/kolab/kcal/journal.h36
-rw-r--r--kresources/kolab/kcal/resourcekolab.cpp194
-rw-r--r--kresources/kolab/kcal/resourcekolab.h98
-rw-r--r--kresources/kolab/kcal/resourcekolab_plugin.cpp2
-rw-r--r--kresources/kolab/kcal/task.cpp52
-rw-r--r--kresources/kolab/kcal/task.h38
-rw-r--r--kresources/kolab/knotes/note.cpp42
-rw-r--r--kresources/kolab/knotes/note.h34
-rw-r--r--kresources/kolab/knotes/resourcekolab.cpp88
-rw-r--r--kresources/kolab/knotes/resourcekolab.h42
-rw-r--r--kresources/kolab/knotes/resourcekolab_plugin.cpp2
-rw-r--r--kresources/kolab/shared/kmailconnection.cpp134
-rw-r--r--kresources/kolab/shared/kmailconnection.h84
-rw-r--r--kresources/kolab/shared/kolabbase.cpp120
-rw-r--r--kresources/kolab/shared/kolabbase.h94
-rw-r--r--kresources/kolab/shared/resourcekolabbase.cpp100
-rw-r--r--kresources/kolab/shared/resourcekolabbase.h108
-rw-r--r--kresources/kolab/shared/subresource.cpp14
-rw-r--r--kresources/kolab/shared/subresource.h26
-rw-r--r--kresources/lib/addressbookadaptor.cpp16
-rw-r--r--kresources/lib/addressbookadaptor.h18
-rw-r--r--kresources/lib/calendaradaptor.cpp16
-rw-r--r--kresources/lib/calendaradaptor.h24
-rw-r--r--kresources/lib/davaddressbookadaptor.cpp12
-rw-r--r--kresources/lib/davaddressbookadaptor.h6
-rw-r--r--kresources/lib/davcalendaradaptor.cpp14
-rw-r--r--kresources/lib/davcalendaradaptor.h6
-rw-r--r--kresources/lib/folderconfig.cpp42
-rw-r--r--kresources/lib/folderconfig.h4
-rw-r--r--kresources/lib/folderlister.cpp64
-rw-r--r--kresources/lib/folderlister.h32
-rw-r--r--kresources/lib/folderlistview.cpp66
-rw-r--r--kresources/lib/folderlistview.h34
-rw-r--r--kresources/lib/folderselectdialog.cpp30
-rw-r--r--kresources/lib/folderselectdialog.h10
-rw-r--r--kresources/lib/groupwaredataadaptor.cpp40
-rw-r--r--kresources/lib/groupwaredataadaptor.h112
-rw-r--r--kresources/lib/groupwaredownloadjob.cpp64
-rw-r--r--kresources/lib/groupwaredownloadjob.h24
-rw-r--r--kresources/lib/groupwareresourcejob.cpp10
-rw-r--r--kresources/lib/groupwareresourcejob.h10
-rw-r--r--kresources/lib/groupwareuploadjob.cpp102
-rw-r--r--kresources/lib/groupwareuploadjob.h26
-rw-r--r--kresources/lib/kabc_resourcegroupwarebase.cpp8
-rw-r--r--kresources/lib/kabc_resourcegroupwarebaseconfig.cpp24
-rw-r--r--kresources/lib/kabc_resourcegroupwarebaseconfig.h2
-rw-r--r--kresources/lib/kcal_cachesettingsdlg.cpp10
-rw-r--r--kresources/lib/kcal_cachesettingsdlg.h2
-rw-r--r--kresources/lib/kcal_resourcegroupwarebase.cpp32
-rw-r--r--kresources/lib/kcal_resourcegroupwarebaseconfig.cpp26
-rw-r--r--kresources/lib/kcal_resourcegroupwarebaseconfig.h2
-rw-r--r--kresources/lib/webdavhandler.cpp64
-rw-r--r--kresources/lib/webdavhandler.h52
-rw-r--r--kresources/newexchange/exchangeaddressbookadaptor.cpp4
-rw-r--r--kresources/newexchange/exchangeaddressbookadaptor.h18
-rw-r--r--kresources/newexchange/exchangecalendaradaptor.cpp22
-rw-r--r--kresources/newexchange/exchangecalendaradaptor.h22
-rw-r--r--kresources/newexchange/exchangeconvertercalendar.cpp152
-rw-r--r--kresources/newexchange/exchangeconvertercalendar.h28
-rw-r--r--kresources/newexchange/exchangeconvertercontact.cpp78
-rw-r--r--kresources/newexchange/exchangeconvertercontact.h20
-rw-r--r--kresources/newexchange/exchangeglobals.cpp70
-rw-r--r--kresources/newexchange/exchangeglobals.h16
-rw-r--r--kresources/newexchange/kabc_resourceexchange.h2
-rw-r--r--kresources/remote/resourceremote.cpp28
-rw-r--r--kresources/remote/resourceremote.h10
-rw-r--r--kresources/remote/resourceremoteconfig.cpp12
-rw-r--r--kresources/remote/resourceremoteconfig.h6
-rw-r--r--kresources/scalix/kabc/contact.cpp66
-rw-r--r--kresources/scalix/kabc/contact.h4
-rw-r--r--kresources/scalix/kabc/resourcescalix.cpp134
-rw-r--r--kresources/scalix/kabc/resourcescalix.h52
-rw-r--r--kresources/scalix/kabc/resourcescalix_plugin.cpp2
-rw-r--r--kresources/scalix/kcal/resourcescalix.cpp152
-rw-r--r--kresources/scalix/kcal/resourcescalix.h90
-rw-r--r--kresources/scalix/kcal/resourcescalix_plugin.cpp2
-rw-r--r--kresources/scalix/kioslave/scalix.cpp56
-rw-r--r--kresources/scalix/kioslave/scalix.h10
-rw-r--r--kresources/scalix/knotes/resourcescalix.cpp88
-rw-r--r--kresources/scalix/knotes/resourcescalix.h42
-rw-r--r--kresources/scalix/knotes/resourcescalix_plugin.cpp2
-rw-r--r--kresources/scalix/scalixadmin/delegatedialog.cpp34
-rw-r--r--kresources/scalix/scalixadmin/delegatedialog.h8
-rw-r--r--kresources/scalix/scalixadmin/delegatemanager.h4
-rw-r--r--kresources/scalix/scalixadmin/delegatepage.cpp32
-rw-r--r--kresources/scalix/scalixadmin/delegatepage.h10
-rw-r--r--kresources/scalix/scalixadmin/delegateview.cpp8
-rw-r--r--kresources/scalix/scalixadmin/delegateview.h2
-rw-r--r--kresources/scalix/scalixadmin/jobs.cpp130
-rw-r--r--kresources/scalix/scalixadmin/jobs.h54
-rw-r--r--kresources/scalix/scalixadmin/ldapdialog.cpp4
-rw-r--r--kresources/scalix/scalixadmin/ldapdialog.h4
-rw-r--r--kresources/scalix/scalixadmin/ldapview.cpp28
-rw-r--r--kresources/scalix/scalixadmin/ldapview.h8
-rw-r--r--kresources/scalix/scalixadmin/mainwindow.cpp6
-rw-r--r--kresources/scalix/scalixadmin/otherusermanager.cpp4
-rw-r--r--kresources/scalix/scalixadmin/otherusermanager.h10
-rw-r--r--kresources/scalix/scalixadmin/otheruserpage.cpp48
-rw-r--r--kresources/scalix/scalixadmin/otheruserpage.h8
-rw-r--r--kresources/scalix/scalixadmin/otheruserview.cpp18
-rw-r--r--kresources/scalix/scalixadmin/otheruserview.h4
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.cpp42
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.h14
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.cpp48
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.h10
-rw-r--r--kresources/scalix/scalixadmin/settings.cpp18
-rw-r--r--kresources/scalix/scalixadmin/settings.h14
-rw-r--r--kresources/scalix/shared/kmailconnection.cpp116
-rw-r--r--kresources/scalix/shared/kmailconnection.h64
-rw-r--r--kresources/scalix/shared/resourcescalixbase.cpp64
-rw-r--r--kresources/scalix/shared/resourcescalixbase.h94
-rw-r--r--kresources/scalix/shared/scalixbase.cpp120
-rw-r--r--kresources/scalix/shared/scalixbase.h94
-rw-r--r--kresources/scalix/shared/subresource.cpp12
-rw-r--r--kresources/scalix/shared/subresource.h24
-rw-r--r--kresources/slox/kabcresourceslox.cpp124
-rw-r--r--kresources/slox/kabcresourceslox.h18
-rw-r--r--kresources/slox/kabcresourcesloxconfig.cpp24
-rw-r--r--kresources/slox/kabcresourcesloxconfig.h6
-rw-r--r--kresources/slox/kcalresourceslox.cpp296
-rw-r--r--kresources/slox/kcalresourceslox.h40
-rw-r--r--kresources/slox/kcalresourcesloxconfig.cpp26
-rw-r--r--kresources/slox/kcalresourcesloxconfig.h8
-rw-r--r--kresources/slox/sloxaccounts.cpp64
-rw-r--r--kresources/slox/sloxaccounts.h14
-rw-r--r--kresources/slox/sloxbase.cpp12
-rw-r--r--kresources/slox/sloxbase.h10
-rw-r--r--kresources/slox/sloxfolder.cpp4
-rw-r--r--kresources/slox/sloxfolder.h14
-rw-r--r--kresources/slox/sloxfolderdialog.cpp24
-rw-r--r--kresources/slox/sloxfolderdialog.h10
-rw-r--r--kresources/slox/sloxfoldermanager.cpp48
-rw-r--r--kresources/slox/sloxfoldermanager.h10
-rw-r--r--kresources/slox/testsloxaccounts.cpp6
-rw-r--r--kresources/slox/webdavhandler.cpp104
-rw-r--r--kresources/slox/webdavhandler.h60
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytime.cpp128
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytime.h28
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp20
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytimeconfig.h4
-rw-r--r--kresources/tvanytime/kcal_tvanytimeprefs.cpp2
-rw-r--r--kresources/tvanytime/kcal_tvanytimeprefs.h2
-rw-r--r--kresources/tvanytime/service.cpp88
-rw-r--r--kresources/tvanytime/service.h82
267 files changed, 5823 insertions, 5823 deletions
diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index 9d86aa3dd..dc902c5bf 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -22,9 +22,9 @@
#include <typeinfo>
#include <stdlib.h>
-#include <qdatetime.h>
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#include <klocale.h>
#include <kdebug.h>
@@ -65,7 +65,7 @@ extern "C"
}
ResourceKABC::ResourceKABC( const KConfig* config )
- : ResourceCalendar( config ), mCalendar( QString::fromLatin1( "UTC" ) ),
+ : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
{
if ( config ) {
@@ -76,7 +76,7 @@ ResourceKABC::ResourceKABC( const KConfig* config )
}
ResourceKABC::ResourceKABC()
- : ResourceCalendar( 0 ), mCalendar( QString::fromLatin1( "UTC" ) ),
+ : ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ),
mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
{
init();
@@ -121,7 +121,7 @@ bool ResourceKABC::doOpen()
kdDebug(5800) << "ResourceKABC::doOpen()" << endl;
mAddressbook = KABC::StdAddressBook::self( true );
- connect( mAddressbook, SIGNAL(addressBookChanged(AddressBook*)), SLOT( reload() ) );
+ connect( mAddressbook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT( reload() ) );
return true;
}
@@ -133,9 +133,9 @@ bool ResourceKABC::doLoad()
mCalendar.close();
// import from kabc
- QString summary;
- QStringList::ConstIterator strIt;
- const QStringList::ConstIterator endStrIt = mCategories.end();
+ TQString summary;
+ TQStringList::ConstIterator strIt;
+ const TQStringList::ConstIterator endStrIt = mCategories.end();
KABC::Addressee::List anniversaries;
KABC::Addressee::List::Iterator addrIt;
@@ -145,7 +145,7 @@ bool ResourceKABC::doLoad()
if ( mUseCategories ) {
bool hasCategory = false;
- QStringList categories = (*it).categories();
+ TQStringList categories = (*it).categories();
for ( strIt = mCategories.begin(); strIt != endStrIt; ++strIt )
if ( categories.contains( *strIt ) ) {
hasCategory = true;
@@ -156,8 +156,8 @@ bool ResourceKABC::doLoad()
continue;
}
- QDate birthdate = (*it).birthday().date();
- QString name_1, email_1, uid_1;
+ TQDate birthdate = (*it).birthday().date();
+ TQString name_1, email_1, uid_1;
if ( birthdate.isValid() ) {
kdDebug(5800) << "found a birthday " << birthdate.toString() << endl;
@@ -213,21 +213,21 @@ bool ResourceKABC::doLoad()
kdDebug(5800) << "imported " << birthdate.toString() << endl;
}
- QString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" );
+ TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" );
if (anniversary_string.isEmpty() )
continue;
- QDateTime anniversary = QDate::fromString( anniversary_string, Qt::ISODate );
+ TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate );
if ( !anniversary.isValid() )
continue;
- QString name = (*it).custom( "KADDRESSBOOK", "X-SpousesName" );
+ TQString name = (*it).custom( "KADDRESSBOOK", "X-SpousesName" );
if ( name.isEmpty() )
anniversaries.append( *it );
else {
bool found = false;
for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
if ( name == (*addrIt).realName() ) {
- QDateTime spouseAnniversary = QDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+ TQDateTime spouseAnniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
if ( anniversary == spouseAnniversary ) {
found = true;
break;
@@ -242,21 +242,21 @@ bool ResourceKABC::doLoad()
}
for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
- QDate anniversary = QDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+ TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
kdDebug(5800) << "found a anniversary " << anniversary.toString() << endl;
- QString name;
- QString name_1 = (*addrIt).nickName();
- QString uid_1 = (*addrIt).uid();
- QString email_1 = (*addrIt).fullEmail();
+ TQString name;
+ TQString name_1 = (*addrIt).nickName();
+ TQString uid_1 = (*addrIt).uid();
+ TQString email_1 = (*addrIt).fullEmail();
if ( name_1.isEmpty() )
name_1 = (*addrIt).realName();
- QString spouseName = (*addrIt).custom( "KADDRESSBOOK", "X-SpousesName" );
- QString name_2,email_2,uid_2;
+ TQString spouseName = (*addrIt).custom( "KADDRESSBOOK", "X-SpousesName" );
+ TQString name_2,email_2,uid_2;
if ( !spouseName.isEmpty() ) {
//TODO: find a KABC:Addressee of the spouse
- // Probably easiest would be to use a QMap (as the spouse's entry was already searched above!
+ // Probably easiest would be to use a TQMap (as the spouse's entry was already searched above!
KABC::Addressee spouse;
spouse.setNameFromString( spouseName );
uid_2 = spouse.uid();
@@ -341,12 +341,12 @@ int ResourceKABC::alarmDays()
return mAlarmDays;
}
-void ResourceKABC::setCategories( const QStringList &categories )
+void ResourceKABC::setCategories( const TQStringList &categories )
{
mCategories = categories;
}
-QStringList ResourceKABC::categories() const
+TQStringList ResourceKABC::categories() const
{
return mCategories;
}
@@ -389,25 +389,25 @@ bool ResourceKABC::deleteEvent(Event*)
}
-Event *ResourceKABC::event( const QString &uid )
+Event *ResourceKABC::event( const TQString &uid )
{
return mCalendar.event( uid );
}
-Event::List ResourceKABC::rawEventsForDate( const QDate &date,
+Event::List ResourceKABC::rawEventsForDate( const TQDate &date,
EventSortField sortField,
SortDirection sortDirection )
{
return mCalendar.rawEventsForDate( date, sortField, sortDirection );
}
-Event::List ResourceKABC::rawEvents( const QDate &start, const QDate &end,
+Event::List ResourceKABC::rawEvents( const TQDate &start, const TQDate &end,
bool inclusive )
{
return mCalendar.rawEvents( start, end, inclusive );
}
-Event::List ResourceKABC::rawEventsForDate(const QDateTime &qdt)
+Event::List ResourceKABC::rawEventsForDate(const TQDateTime &qdt)
{
return mCalendar.rawEventsForDate( qdt.date() );
}
@@ -433,12 +433,12 @@ Todo::List ResourceKABC::rawTodos( TodoSortField sortField, SortDirection sortDi
return mCalendar.rawTodos( sortField, sortDirection );
}
-Todo *ResourceKABC::todo( const QString &uid )
+Todo *ResourceKABC::todo( const TQString &uid )
{
return mCalendar.todo( uid );
}
-Todo::List ResourceKABC::rawTodosForDate( const QDate &date )
+Todo::List ResourceKABC::rawTodosForDate( const TQDate &date )
{
return mCalendar.rawTodosForDate( date );
}
@@ -454,7 +454,7 @@ bool ResourceKABC::deleteJournal(Journal*)
return false;
}
-Journal *ResourceKABC::journal(const QString &uid)
+Journal *ResourceKABC::journal(const TQString &uid)
{
return mCalendar.journal( uid );
}
@@ -464,17 +464,17 @@ Journal::List ResourceKABC::rawJournals( JournalSortField sortField, SortDirecti
return mCalendar.rawJournals( sortField, sortDirection );
}
-Journal::List ResourceKABC::rawJournalsForDate( const QDate &date )
+Journal::List ResourceKABC::rawJournalsForDate( const TQDate &date )
{
return mCalendar.rawJournalsForDate( date );
}
-Alarm::List ResourceKABC::alarmsTo( const QDateTime &to )
+Alarm::List ResourceKABC::alarmsTo( const TQDateTime &to )
{
return mCalendar.alarmsTo( to );
}
-Alarm::List ResourceKABC::alarms( const QDateTime &from, const QDateTime &to )
+Alarm::List ResourceKABC::alarms( const TQDateTime &from, const TQDateTime &to )
{
// kdDebug(5800) << "ResourceKABC::alarms(" << from.toString() << " - " << to.toString() << ")\n";
@@ -492,7 +492,7 @@ void ResourceKABC::reload()
emit resourceChanged( this );
}
-void ResourceKABC::setTimeZoneId( const QString& tzid )
+void ResourceKABC::setTimeZoneId( const TQString& tzid )
{
mCalendar.setTimeZoneId( tzid );
}
diff --git a/kresources/birthdays/resourcekabc.h b/kresources/birthdays/resourcekabc.h
index 9f9a75994..eebe087e9 100644
--- a/kresources/birthdays/resourcekabc.h
+++ b/kresources/birthdays/resourcekabc.h
@@ -21,9 +21,9 @@
#ifndef KCAL_RESOURCEKABC_H
#define KCAL_RESOURCEKABC_H
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qdatetime.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
#include <kconfig.h>
@@ -65,8 +65,8 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar
void setAlarmDays( int );
int alarmDays();
- void setCategories( const QStringList &categories );
- QStringList categories() const;
+ void setCategories( const TQStringList &categories );
+ TQStringList categories() const;
void setUseCategories( bool useCategories );
bool useCategories() const;
@@ -83,7 +83,7 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar
/**
Retrieves an event on the basis of the unique string ID.
*/
- Event *event(const QString &UniqueStr);
+ Event *event(const TQString &UniqueStr);
/**
Return unfiltered list of all events in calendar.
*/
@@ -92,16 +92,16 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar
Builds and then returns a list of all events that match for the
date specified. useful for dayView, etc. etc.
*/
- Event::List rawEventsForDate( const QDate &date, EventSortField sortField = EventSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
+ Event::List rawEventsForDate( const TQDate &date, EventSortField sortField = EventSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
/**
Get unfiltered events for date \a qdt.
*/
- Event::List rawEventsForDate( const QDateTime &qdt );
+ Event::List rawEventsForDate( const TQDateTime &qdt );
/**
Get unfiltered events in a range of dates. If inclusive is set to true,
only events are returned, which are completely included in the range.
*/
- Event::List rawEvents( const QDate &start, const QDate &end,
+ Event::List rawEvents( const TQDate &start, const TQDate &end,
bool inclusive = false );
/**
@@ -116,7 +116,7 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar
Searches todolist for an event with this unique string identifier,
returns a pointer or null.
*/
- Todo *todo( const QString &uid );
+ Todo *todo( const TQString &uid );
/**
Return list of all todos.
*/
@@ -124,13 +124,13 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar
/**
Returns list of todos due on the specified date.
*/
- Todo::List rawTodosForDate( const QDate &date );
+ Todo::List rawTodosForDate( const TQDate &date );
/** Add a Journal entry to calendar */
virtual bool addJournal(Journal *);
/** Remove journal from the calendar. */
bool deleteJournal( Journal * );
/** Return Journal with given UID */
- virtual Journal *journal(const QString &uid);
+ virtual Journal *journal(const TQString &uid);
/**
Return list of all journals.
*/
@@ -138,17 +138,17 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar
/**
Returns list of journals for the given date.
*/
- Journal::List rawJournalsForDate( const QDate &date );
+ Journal::List rawJournalsForDate( const TQDate &date );
/** Return all alarms, which ocur in the given time interval. */
- Alarm::List alarms( const QDateTime &from, const QDateTime &to );
+ Alarm::List alarms( const TQDateTime &from, const TQDateTime &to );
/** Return all alarms, which ocur before given date. */
- Alarm::List alarmsTo( const QDateTime &to );
+ Alarm::List alarmsTo( const TQDateTime &to );
void dump() const;
- void setTimeZoneId( const QString &timeZoneId );
+ void setTimeZoneId( const TQString &timeZoneId );
protected:
bool doOpen();
@@ -165,7 +165,7 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar
int mAlarmDays;
bool mAlarm;
- QStringList mCategories;
+ TQStringList mCategories;
bool mUseCategories;
KABC::AddressBook *mAddressbook;
diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/kresources/birthdays/resourcekabcconfig.cpp
index 9fcbdcb61..2f7671dc7 100644
--- a/kresources/birthdays/resourcekabcconfig.cpp
+++ b/kresources/birthdays/resourcekabcconfig.cpp
@@ -21,8 +21,8 @@
#include <typeinfo>
-#include <qheader.h>
-#include <qlayout.h>
+#include <tqheader.h>
+#include <tqlayout.h>
#include <kabprefs.h>
#include <kdebug.h>
@@ -33,26 +33,26 @@
using namespace KCal;
-ResourceKABCConfig::ResourceKABCConfig( QWidget* parent, const char* name )
+ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
- QGridLayout *topLayout = new QGridLayout( this, 5, 1, 11, 6 );
+ TQGridLayout *topLayout = new TQGridLayout( this, 5, 1, 11, 6 );
- mAlarm = new QCheckBox(i18n("Set reminder"), this);
+ mAlarm = new TQCheckBox(i18n("Set reminder"), this);
topLayout->addWidget(mAlarm, 0, 0);
- QBoxLayout *alarmLayout = new QHBoxLayout(topLayout);
+ TQBoxLayout *alarmLayout = new TQHBoxLayout(topLayout);
- mALabel = new QLabel(i18n("Reminder before (in days):"), this);
+ mALabel = new TQLabel(i18n("Reminder before (in days):"), this);
alarmLayout->addWidget(mALabel);
mAlarmTimeEdit = new KRestrictedLine(this, "alarmTimeEdit", "1234567890");
mAlarmTimeEdit->setText("0");
alarmLayout->addWidget(mAlarmTimeEdit);
- QFrame *line = new QFrame( this );
- line->setFrameStyle( QFrame::Sunken | QFrame::HLine );
+ TQFrame *line = new TQFrame( this );
+ line->setFrameStyle( TQFrame::Sunken | TQFrame::HLine );
topLayout->addMultiCellWidget( line, 2, 2, 0, 1 );
- mUseCategories = new QCheckBox( i18n( "Filter by categories" ), this );
+ mUseCategories = new TQCheckBox( i18n( "Filter by categories" ), this );
topLayout->addMultiCellWidget( mUseCategories, 3, 3, 0, 1 );
mCategoryView = new KListView( this );
@@ -61,21 +61,21 @@ ResourceKABCConfig::ResourceKABCConfig( QWidget* parent, const char* name )
mCategoryView->setEnabled( false );
topLayout->addMultiCellWidget( mCategoryView, 4, 4, 0, 1 );
- connect( mUseCategories, SIGNAL( toggled( bool ) ),
- mCategoryView, SLOT( setEnabled( bool ) ) );
+ connect( mUseCategories, TQT_SIGNAL( toggled( bool ) ),
+ mCategoryView, TQT_SLOT( setEnabled( bool ) ) );
mAlarmTimeEdit->setDisabled(true);
mALabel->setDisabled(true);
- connect(mAlarm, SIGNAL(clicked()), SLOT(alarmClicked()));
+ connect(mAlarm, TQT_SIGNAL(clicked()), TQT_SLOT(alarmClicked()));
setReadOnly( true );
KABPrefs *prefs = KABPrefs::instance();
- const QStringList categories = prefs->customCategories();
- QStringList::ConstIterator it;
+ const TQStringList categories = prefs->customCategories();
+ TQStringList::ConstIterator it;
for ( it = categories.begin(); it != categories.end(); ++it )
- new QCheckListItem( mCategoryView, *it, QCheckListItem::CheckBox );
+ new TQCheckListItem( mCategoryView, *it, TQCheckListItem::CheckBox );
}
void ResourceKABCConfig::loadSettings( KRES::Resource *resource )
@@ -83,17 +83,17 @@ void ResourceKABCConfig::loadSettings( KRES::Resource *resource )
ResourceKABC *res = static_cast<ResourceKABC *>( resource );
if ( res ) {
mAlarm->setChecked( res->alarm() );
- QString days;
+ TQString days;
mAlarmTimeEdit->setText( days.setNum(res->alarmDays()) );
mAlarmTimeEdit->setEnabled( res->alarm() );
mALabel->setEnabled( res->alarm() );
- const QStringList categories = res->categories();
- QListViewItemIterator it( mCategoryView );
+ const TQStringList categories = res->categories();
+ TQListViewItemIterator it( mCategoryView );
while ( it.current() ) {
if ( categories.contains( it.current()->text( 0 ) ) ) {
- QCheckListItem *item = static_cast<QCheckListItem*>( it.current() );
+ TQCheckListItem *item = static_cast<TQCheckListItem*>( it.current() );
item->setOn( true );
}
++it;
@@ -113,8 +113,8 @@ void ResourceKABCConfig::saveSettings( KRES::Resource *resource )
res->setAlarmDays( mAlarmTimeEdit->text().toInt() );
setReadOnly( true );
- QStringList categories;
- QListViewItemIterator it( mCategoryView, QListViewItemIterator::Checked );
+ TQStringList categories;
+ TQListViewItemIterator it( mCategoryView, TQListViewItemIterator::Checked );
while ( it.current() ) {
categories.append( it.current()->text( 0 ) );
++it;
diff --git a/kresources/birthdays/resourcekabcconfig.h b/kresources/birthdays/resourcekabcconfig.h
index b67d38847..7d3ddf098 100644
--- a/kresources/birthdays/resourcekabcconfig.h
+++ b/kresources/birthdays/resourcekabcconfig.h
@@ -23,8 +23,8 @@
#ifndef KCAL_RESOURCEKABCCONFIG_H
#define KCAL_RESOURCEKABCCONFIG_H
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
#include <klistview.h>
#include <krestrictedline.h>
@@ -42,7 +42,7 @@ class ResourceKABCConfig : public KRES::ConfigWidget
{
Q_OBJECT
public:
- ResourceKABCConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceKABCConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource);
@@ -52,10 +52,10 @@ class ResourceKABCConfig : public KRES::ConfigWidget
void alarmClicked();
private:
- QCheckBox *mAlarm;
+ TQCheckBox *mAlarm;
KRestrictedLine *mAlarmTimeEdit;
- QLabel *mALabel;
- QCheckBox *mUseCategories;
+ TQLabel *mALabel;
+ TQCheckBox *mUseCategories;
KListView *mCategoryView;
class Private;
diff --git a/kresources/blogging/API_Blog.cpp b/kresources/blogging/API_Blog.cpp
index 670cd1661..b6ac3752b 100644
--- a/kresources/blogging/API_Blog.cpp
+++ b/kresources/blogging/API_Blog.cpp
@@ -8,13 +8,13 @@
***************************************************************************/
#include "API_Blog.h"
#include <kdebug.h>
-#include <qvariant.h>
+#include <tqvariant.h>
using namespace KBlog;
-APIBlog::APIBlog( const KURL &url, QObject *parent, const char *name ) :
- QObject( parent, name ),
- mServerURL( url ), mAppID( QString::null ), mDownloadCount( 20 )
+APIBlog::APIBlog( const KURL &url, TQObject *parent, const char *name ) :
+ TQObject( parent, name ),
+ mServerURL( url ), mAppID( TQString::null ), mDownloadCount( 20 )
{}
APIBlog::~APIBlog()
@@ -42,7 +42,7 @@ BlogTemplate APIBlog::templateTags() const
return mTemplate;
}*/
-/*void APIBlog::deletePost( const QString &postID )
+/*void APIBlog::deletePost( const TQString &postID )
{
BlogPosting *post = new BlogPosting();
post->setPostID( postID );
@@ -50,15 +50,15 @@ BlogTemplate APIBlog::templateTags() const
delete post;
}*/
-QValueList<QVariant> APIBlog::defaultArgs( const QString &id )
+TQValueList<TQVariant> APIBlog::defaultArgs( const TQString &id )
{
- QValueList<QVariant> args;
- args << QVariant( mAppID );
+ TQValueList<TQVariant> args;
+ args << TQVariant( mAppID );
if ( !id.isNull() ) {
- args << QVariant( id );
+ args << TQVariant( id );
}
- args << QVariant( mUsername )
- << QVariant( mPassword );
+ args << TQVariant( mUsername )
+ << TQVariant( mPassword );
return args;
}
@@ -67,9 +67,9 @@ KCal::Journal *APIBlog::journalFromPosting( KBlog::BlogPosting *blog )
{
if ( !blog ) return 0;
KCal::Journal *j = new KCal::Journal();
- QDateTime dt = blog->dateTime();
- QDateTime creationDt = blog->creationDateTime();
- QDateTime modificationDt = blog->modificationDateTime();
+ TQDateTime dt = blog->dateTime();
+ TQDateTime creationDt = blog->creationDateTime();
+ TQDateTime modificationDt = blog->modificationDateTime();
kdDebug() << "dt ="<<dt.toString( Qt::ISODate ) << endl;
kdDebug() << "creationDt ="<<creationDt.toString( Qt::ISODate ) << endl;
kdDebug() << "modificationDt="<<modificationDt.toString( Qt::ISODate ) << endl;
@@ -88,7 +88,7 @@ kdDebug() << "modificationDt="<<modificationDt.toString( Qt::ISODate ) << endl;
<< blog->dateTime().toString()<<endl;
j->setSummary( blog->title() );
j->setDescription( blog->content() );
- j->setCategories( QStringList( blog->category() ) );
+ j->setCategories( TQStringList( blog->category() ) );
j->setOrganizer( blog->userID() );
j->setCustomProperty( "KCalBloggerRes", "UserID", blog->userID() );
j->setCustomProperty( "KCalBloggerRes", "BlogID", blog->blogID() );
diff --git a/kresources/blogging/API_Blog.h b/kresources/blogging/API_Blog.h
index 77c27d68b..18bc1be0f 100644
--- a/kresources/blogging/API_Blog.h
+++ b/kresources/blogging/API_Blog.h
@@ -13,10 +13,10 @@
#include <kio/job.h>
#include <libkcal/journal.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <qdatetime.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
+#include <tqdatetime.h>
/**
This is the main interface for blog backends
@@ -31,53 +31,53 @@ public:
BlogPosting() {}
virtual ~BlogPosting() {}
- QString userID() const { return mUserID; }
- void setUserID( const QString &userID ) { mUserID = userID; }
+ TQString userID() const { return mUserID; }
+ void setUserID( const TQString &userID ) { mUserID = userID; }
- QString blogID() const { return mBlogID; }
- void setBlogID( const QString &blogID ) { mBlogID = blogID; }
+ TQString blogID() const { return mBlogID; }
+ void setBlogID( const TQString &blogID ) { mBlogID = blogID; }
- QString postID() const { return mPostID; }
- void setPostID( const QString &postID ) { assignPostID( postID ); mPostID = postID; }
+ TQString postID() const { return mPostID; }
+ void setPostID( const TQString &postID ) { assignPostID( postID ); mPostID = postID; }
- QString title() const { return mTitle; }
- void setTitle( const QString &title ) { mTitle = title; }
+ TQString title() const { return mTitle; }
+ void setTitle( const TQString &title ) { mTitle = title; }
- QString content() const { return mContent; }
- void setContent( const QString &content ) { mContent = content; }
+ TQString content() const { return mContent; }
+ void setContent( const TQString &content ) { mContent = content; }
- QString category() const { return mCategory; }
- void setCategory( const QString &category ) { mCategory = category; }
+ TQString category() const { return mCategory; }
+ void setCategory( const TQString &category ) { mCategory = category; }
- QString fingerprint() const { return mFingerprint; }
- void setFingerprint( const QString &fp ) { mFingerprint = fp; }
+ TQString fingerprint() const { return mFingerprint; }
+ void setFingerprint( const TQString &fp ) { mFingerprint = fp; }
- QDateTime dateTime() const { return mDateTime; }
- void setDateTime( const QDateTime &datetime ) { mDateTime = datetime; }
+ TQDateTime dateTime() const { return mDateTime; }
+ void setDateTime( const TQDateTime &datetime ) { mDateTime = datetime; }
- QDateTime creationDateTime() const { return mCreationDateTime; }
- void setCreationDateTime( const QDateTime &datetime ) { mCreationDateTime = datetime; }
+ TQDateTime creationDateTime() const { return mCreationDateTime; }
+ void setCreationDateTime( const TQDateTime &datetime ) { mCreationDateTime = datetime; }
- QDateTime modificationDateTime() const { return mModificationDateTime; }
- void setModificationDateTime( const QDateTime &datetime ) { mModificationDateTime = datetime; }
+ TQDateTime modificationDateTime() const { return mModificationDateTime; }
+ void setModificationDateTime( const TQDateTime &datetime ) { mModificationDateTime = datetime; }
virtual void wasDeleted( bool ) {}
virtual void wasUploaded( bool ) {}
- virtual void error( int /*code*/, const QString &/*error*/ ) {}
+ virtual void error( int /*code*/, const TQString &/*error*/ ) {}
protected:
// Override this method to detect the new postID assigned when adding a new post
- virtual void assignPostID( const QString &/*postID*/ ) {}
- QString mUserID;
- QString mBlogID;
- QString mPostID;
- QString mTitle;
- QString mContent;
- QString mCategory;
- QString mFingerprint;
- QDateTime mDateTime;
- QDateTime mCreationDateTime;
- QDateTime mModificationDateTime;
+ virtual void assignPostID( const TQString &/*postID*/ ) {}
+ TQString mUserID;
+ TQString mBlogID;
+ TQString mPostID;
+ TQString mTitle;
+ TQString mContent;
+ TQString mCategory;
+ TQString mFingerprint;
+ TQDateTime mDateTime;
+ TQDateTime mCreationDateTime;
+ TQDateTime mModificationDateTime;
};
@@ -85,18 +85,18 @@ class APIBlog : public QObject
{
Q_OBJECT
public:
- APIBlog( const KURL &server, QObject *parent = 0L, const char *name = 0L );
+ APIBlog( const KURL &server, TQObject *parent = 0L, const char *name = 0L );
virtual ~APIBlog();
- virtual QString interfaceName() const = 0;
+ virtual TQString interfaceName() const = 0;
- void setAppID( const QString &appID ) { mAppID = appID; }
- QString appID() const { return mAppID; }
+ void setAppID( const TQString &appID ) { mAppID = appID; }
+ TQString appID() const { return mAppID; }
- void setPassword( const QString &pass ) { mPassword = pass; }
- QString password() const { return mPassword; }
+ void setPassword( const TQString &pass ) { mPassword = pass; }
+ TQString password() const { return mPassword; }
- void setUsername( const QString &uname ) { mUsername = uname; }
- QString username() const { return mUsername; }
+ void setUsername( const TQString &uname ) { mUsername = uname; }
+ TQString username() const { return mUsername; }
void setURL( const KURL& url ) { mServerURL = url; }
KURL url() const { return mServerURL; }
@@ -119,8 +119,8 @@ class APIBlog : public QObject
bloggerSetTemplate
};
- virtual QString getFunctionName( blogFunctions type ) = 0;
- virtual QValueList<QVariant> defaultArgs( const QString &id = QString::null );
+ virtual TQString getFunctionName( blogFunctions type ) = 0;
+ virtual TQValueList<TQVariant> defaultArgs( const TQString &id = TQString::null );
virtual KIO::Job *createUserInfoJob() = 0;
virtual KIO::Job *createListFoldersJob() = 0;
@@ -128,7 +128,7 @@ class APIBlog : public QObject
virtual KIO::TransferJob *createDownloadJob( const KURL &url ) = 0;
virtual KIO::TransferJob *createUploadJob( const KURL &url, KBlog::BlogPosting *posting ) = 0;
virtual KIO::TransferJob *createUploadNewJob( KBlog::BlogPosting *posting ) = 0;
- virtual KIO::Job *createRemoveJob( const KURL &url, const QString &postid ) = 0;
+ virtual KIO::Job *createRemoveJob( const KURL &url, const TQString &postid ) = 0;
virtual bool interpretUserInfoJob( KIO::Job *job ) = 0;
virtual void interpretListFoldersJob( KIO::Job *job ) = 0;
@@ -140,21 +140,21 @@ class APIBlog : public QObject
signals:
// TODO: Connect these
- void userInfoRetrieved( const QString &nickname, const QString &userid, const QString &email );
- void folderInfoRetrieved( const QString &id, const QString &name );
+ void userInfoRetrieved( const TQString &nickname, const TQString &userid, const TQString &email );
+ void folderInfoRetrieved( const TQString &id, const TQString &name );
void itemOnServer( const KURL &remoteURL );
- void itemDownloaded( KCal::Incidence *j, const QString &localID,
- const KURL &remoteURL, const QString &fingerprint,
- const QString &storageLocation );
+ void itemDownloaded( KCal::Incidence *j, const TQString &localID,
+ const KURL &remoteURL, const TQString &fingerprint,
+ const TQString &storageLocation );
protected:
KURL mServerURL;
- QString mPassword;
- QString mUsername;
- QString mAppID;
+ TQString mPassword;
+ TQString mUsername;
+ TQString mAppID;
int mDownloadCount;
};
diff --git a/kresources/blogging/API_Blogger.cpp b/kresources/blogging/API_Blogger.cpp
index f30c56206..5cca14e1a 100644
--- a/kresources/blogging/API_Blogger.cpp
+++ b/kresources/blogging/API_Blogger.cpp
@@ -25,7 +25,7 @@
using namespace KBlog;
-QString APIBlogger::getFunctionName( blogFunctions type )
+TQString APIBlogger::getFunctionName( blogFunctions type )
{
switch ( type ) {
case bloggerGetUserInfo: return "blogger.getUserInfo";
@@ -37,7 +37,7 @@ QString APIBlogger::getFunctionName( blogFunctions type )
case bloggerGetPost: return "blogger.getPost";
case bloggerGetTemplate: return "blogger.getTemplate";
case bloggerSetTemplate: return "blogger.setTemplate";
- default: return QString::null;
+ default: return TQString::null;
}
}
@@ -47,7 +47,7 @@ QString APIBlogger::getFunctionName( blogFunctions type )
KIO::Job *APIBlogger::createUserInfoJob()
{
kdDebug() << "read user info..." << endl;
- QValueList<QVariant> args( defaultArgs() );
+ TQValueList<TQVariant> args( defaultArgs() );
return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetUserInfo ), args, false );
}
@@ -56,7 +56,7 @@ KIO::Job *APIBlogger::createListFoldersJob()
// TODO: Check if we're already authenticated. If not, do it!
// if ( isValid() ) {
kdDebug() << "Fetch List of Blogs..." << endl;
- QValueList<QVariant> args( defaultArgs() );
+ TQValueList<TQVariant> args( defaultArgs() );
return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetUsersBlogs ), args, false );
// } else {
// warningNotInitialized();
@@ -69,8 +69,8 @@ KIO::TransferJob *APIBlogger::createListItemsJob( const KURL &url )
// TODO: Check if we're already authenticated. If not, do it!
// if ( isValid() ) {
kdDebug() << "Fetch List of Posts..." << endl;
- QValueList<QVariant> args( defaultArgs( url.url() ) );
- args << QVariant( mDownloadCount );
+ TQValueList<TQVariant> args( defaultArgs( url.url() ) );
+ args << TQVariant( mDownloadCount );
return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetRecentPosts ), args, false );
// } else {
// warningNotInitialized();
@@ -82,7 +82,7 @@ KIO::TransferJob *APIBlogger::createDownloadJob( const KURL &url )
{
// if ( isValid() ){
kdDebug() << "Fetch Posting with url " << url.url() << endl;
- QValueList<QVariant> args( defaultArgs( url.url() ) );
+ TQValueList<TQVariant> args( defaultArgs( url.url() ) );
return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerGetPost ), args, false );
// } else {
// warningNotInitialized();
@@ -98,9 +98,9 @@ KIO::TransferJob *APIBlogger::createUploadJob( const KURL &url, KBlog::BlogPosti
}
// if ( isValid() ){
kdDebug() << "Uploading Posting with url " << url.url() << endl;
- QValueList<QVariant> args( defaultArgs( posting->postID() ) );
- args << QVariant( posting->content() );
- args << QVariant( /*publish=*/true, 0 );
+ TQValueList<TQVariant> args( defaultArgs( posting->postID() ) );
+ args << TQVariant( posting->content() );
+ args << TQVariant( /*publish=*/true, 0 );
return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerEditPost ), args, false );
// } else {
// warningNotInitialized();
@@ -116,9 +116,9 @@ KIO::TransferJob *APIBlogger::createUploadNewJob( KBlog::BlogPosting *posting )
}
// if ( isValid() ){
kdDebug() << "Creating new Posting with blogid " << posting->blogID() << " at url " << mServerURL << endl;
- QValueList<QVariant> args( defaultArgs( posting->blogID() ) );
- args << QVariant( posting->content() );
- args << QVariant( /*publish=*/true, 0 );
+ TQValueList<TQVariant> args( defaultArgs( posting->blogID() ) );
+ args << TQVariant( posting->content() );
+ args << TQVariant( /*publish=*/true, 0 );
return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerNewPost ), args, false );
// } else {
// warningNotInitialized();
@@ -126,12 +126,12 @@ KIO::TransferJob *APIBlogger::createUploadNewJob( KBlog::BlogPosting *posting )
// }
}
-KIO::Job *APIBlogger::createRemoveJob( const KURL &/*url*/, const QString &postid )
+KIO::Job *APIBlogger::createRemoveJob( const KURL &/*url*/, const TQString &postid )
{
kdDebug() << "APIBlogger::createRemoveJob: postid=" << postid << endl;
// if ( isValid() ){
- QValueList<QVariant> args( defaultArgs( postid ) );
- args << QVariant( /*publish=*/true, 0 );
+ TQValueList<TQVariant> args( defaultArgs( postid ) );
+ args << TQVariant( /*publish=*/true, 0 );
return KIO::xmlrpcCall( mServerURL, getFunctionName( bloggerDeletePost ), args, false );
// } else {
// warningNotInitialized();
@@ -151,18 +151,18 @@ bool APIBlogger::interpretUserInfoJob( KIO::Job *job )
// TODO: Error handling
return false;
} else if ( trfjob ) {
- QValueList<QVariant> message( trfjob->response() );
+ TQValueList<TQVariant> message( trfjob->response() );
kdDebug () << "TOP: " << message[ 0 ].typeName() << endl;
- const QValueList<QVariant> posts = message;
- QValueList<QVariant>::ConstIterator it = posts.begin();
- QValueList<QVariant>::ConstIterator end = posts.end();
+ const TQValueList<TQVariant> posts = message;
+ TQValueList<TQVariant>::ConstIterator it = posts.begin();
+ TQValueList<TQVariant>::ConstIterator end = posts.end();
for ( ; it != end; ++it ) {
kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl;
- const QMap<QString, QVariant> postInfo = ( *it ).toMap();
- const QString nickname = postInfo[ "nickname" ].toString();
- const QString userid = postInfo[ "userid" ].toString();
- const QString email = postInfo[ "email" ].toString();
+ const TQMap<TQString, TQVariant> postInfo = ( *it ).toMap();
+ const TQString nickname = postInfo[ "nickname" ].toString();
+ const TQString userid = postInfo[ "userid" ].toString();
+ const TQString email = postInfo[ "email" ].toString();
kdDebug() << "Post " << nickname << " " << userid << " " << email << endl;
// FIXME: How about a BlogUserInfo class???
emit userInfoRetrieved( nickname, userid, email );
@@ -180,19 +180,19 @@ kdDebug() << "APIBlogger::interpretListFoldersJob" << endl;
// TODO: Error handling
} else {
kdDebug() << "APIBlogger::interpretListFoldersJob, no error!" << endl;
- QValueList<QVariant> message( trfjob->response() );
+ TQValueList<TQVariant> message( trfjob->response() );
kdDebug () << "TOP: " << message[ 0 ].typeName() << endl;
- const QValueList<QVariant> posts = message[ 0 ].toList();
- QValueList<QVariant>::ConstIterator it = posts.begin();
- QValueList<QVariant>::ConstIterator end = posts.end();
+ const TQValueList<TQVariant> posts = message[ 0 ].toList();
+ TQValueList<TQVariant>::ConstIterator it = posts.begin();
+ TQValueList<TQVariant>::ConstIterator end = posts.end();
for ( ; it != end; ++it ) {
kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl;
- const QMap<QString, QVariant> postInfo = ( *it ).toMap();
+ const TQMap<TQString, TQVariant> postInfo = ( *it ).toMap();
- const QString id( postInfo[ "blogid" ].toString() );
- const QString name( postInfo[ "blogName" ].toString() );
- const QString url( postInfo[ "url" ].toString() );
+ const TQString id( postInfo[ "blogid" ].toString() );
+ const TQString name( postInfo[ "blogName" ].toString() );
+ const TQString url( postInfo[ "url" ].toString() );
// Use the Blog ID instead of the URL. The ID already indicates the correct blog, and the
// URL for all calls will be the XML-RPC interface, anyway.
@@ -220,17 +220,17 @@ bool APIBlogger::interpretDownloadItemsJob( KIO::Job *job )
} else {
//array of structs containing ISO.8601 dateCreated, String userid, String postid, String content;
// TODO: Time zone for the dateCreated!
- QValueList<QVariant> message( trfjob->response() );
+ TQValueList<TQVariant> message( trfjob->response() );
kdDebug () << "TOP: " << message[ 0 ].typeName() << endl;
- const QValueList<QVariant> postReceived = message[ 0 ].toList();
- QValueList<QVariant>::ConstIterator it = postReceived.begin();
- QValueList<QVariant>::ConstIterator end = postReceived.end();
+ const TQValueList<TQVariant> postReceived = message[ 0 ].toList();
+ TQValueList<TQVariant>::ConstIterator it = postReceived.begin();
+ TQValueList<TQVariant>::ConstIterator end = postReceived.end();
success = true;
for ( ; it != end; ++it ) {
BlogPosting posting;
kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl;
- const QMap<QString, QVariant> postInfo = ( *it ).toMap();
+ const TQMap<TQString, TQVariant> postInfo = ( *it ).toMap();
if ( readPostingFromMap( &posting, postInfo ) ) {
KCal::Journal *j = journalFromPosting( &posting );
// dumpBlog( &posting );
@@ -252,19 +252,19 @@ bool APIBlogger::interpretDownloadItemsJob( KIO::Job *job )
}
-bool APIBlogger::readPostingFromMap( BlogPosting *post, const QMap<QString, QVariant> &postInfo )
+bool APIBlogger::readPostingFromMap( BlogPosting *post, const TQMap<TQString, TQVariant> &postInfo )
{
// FIXME:
if ( !post ) return false;
- QStringList mapkeys = postInfo.keys();
+ TQStringList mapkeys = postInfo.keys();
kdDebug() << endl << "Keys: " << mapkeys.join(", ") << endl << endl;
- QString fp( QString::null );
+ TQString fp( TQString::null );
- QDateTime dt( postInfo[ "dateCreated" ].toDateTime() );
+ TQDateTime dt( postInfo[ "dateCreated" ].toDateTime() );
if ( dt.isValid() && !dt.isNull() ) {
post->setCreationDateTime( dt );
- QString fp = dt.toString( Qt::ISODate );
+ TQString fp = dt.toString( Qt::ISODate );
}
dt = postInfo[ "postDate" ].toDateTime();
if ( dt.isValid() && !dt.isNull() ) {
@@ -281,10 +281,10 @@ bool APIBlogger::readPostingFromMap( BlogPosting *post, const QMap<QString, QVar
post->setUserID( postInfo[ "userid" ].toString() );
post->setPostID( postInfo[ "postid" ].toString() );
- QString title( postInfo[ "title" ].toString() );
- QString description( postInfo[ "description" ].toString() );
- QString contents( postInfo[ "content" ].toString() );
- QString category;
+ TQString title( postInfo[ "title" ].toString() );
+ TQString description( postInfo[ "description" ].toString() );
+ TQString contents( postInfo[ "content" ].toString() );
+ TQString category;
// TODO: Extract title and cats from the old-style blogger api without extensions
/*
@@ -294,10 +294,10 @@ bool APIBlogger::readPostingFromMap( BlogPosting *post, const QMap<QString, QVar
kdDebug() << "No title and description given, so it's an old-style "
"Blogger API without extensions" << endl;
- QString catTagOpen = mTemplate.categoryTagOpen();
- QString catTagClose = mTemplate.categoryTagClose();
- QString titleTagOpen = mTemplate.titleTagOpen();
- QString titleTagClose = mTemplate.titleTagClose();
+ TQString catTagOpen = mTemplate.categoryTagOpen();
+ TQString catTagClose = mTemplate.categoryTagClose();
+ TQString titleTagOpen = mTemplate.titleTagOpen();
+ TQString titleTagClose = mTemplate.titleTagClose();
int catStart = contents.find( catTagOpen, 0, false ) + catTagOpen.length();
int catEnd = contents.find( catTagClose, 0, false );
diff --git a/kresources/blogging/API_Blogger.h b/kresources/blogging/API_Blogger.h
index 3195b472e..32610bf60 100644
--- a/kresources/blogging/API_Blogger.h
+++ b/kresources/blogging/API_Blogger.h
@@ -23,18 +23,18 @@
#include "API_Blog.h"
-#include <qstring.h>
-#include <qvariant.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvariant.h>
+#include <tqvaluelist.h>
namespace KBlog {
class APIBlogger : public APIBlog
{
public:
- APIBlogger( const KURL &server, QObject *parent = 0L, const char *name = 0L ) : APIBlog( server, parent, name ) {}
- QString getFunctionName( blogFunctions type );
- QString interfaceName() const { return "Blogger API 1.0"; }
+ APIBlogger( const KURL &server, TQObject *parent = 0L, const char *name = 0L ) : APIBlog( server, parent, name ) {}
+ TQString getFunctionName( blogFunctions type );
+ TQString interfaceName() const { return "Blogger API 1.0"; }
KIO::Job *createUserInfoJob();
@@ -43,14 +43,14 @@ class APIBlogger : public APIBlog
KIO::TransferJob *createDownloadJob( const KURL &url );
KIO::TransferJob *createUploadJob( const KURL &url, KBlog::BlogPosting *posting );
KIO::TransferJob *createUploadNewJob( KBlog::BlogPosting *posting );
- KIO::Job *createRemoveJob( const KURL &url, const QString &postid );
+ KIO::Job *createRemoveJob( const KURL &url, const TQString &postid );
bool interpretUserInfoJob( KIO::Job *job );
void interpretListFoldersJob( KIO::Job *job );
bool interpretListItemsJob( KIO::Job *job );
bool interpretDownloadItemsJob( KIO::Job *job );
protected:
- bool readPostingFromMap( BlogPosting *post, const QMap<QString, QVariant> &postInfo );
+ bool readPostingFromMap( BlogPosting *post, const TQMap<TQString, TQVariant> &postInfo );
};
}
diff --git a/kresources/blogging/bloggingcalendaradaptor.cpp b/kresources/blogging/bloggingcalendaradaptor.cpp
index 252452788..1255cab38 100644
--- a/kresources/blogging/bloggingcalendaradaptor.cpp
+++ b/kresources/blogging/bloggingcalendaradaptor.cpp
@@ -36,8 +36,8 @@ using namespace KCal;
// http://www.blogger.com/developers/api/1_docs/register.html
// for the "KDE-Pim libkcal blogging resource".
// TODO:
-/*QString BloggingCalendarAdaptor::mAppID =
- QString("20ffffffd7ffffffc5ffffffbdffffff87ffffffb72d39fffffffe5c4bfffff"
+/*TQString BloggingCalendarAdaptor::mAppID =
+ TQString("20ffffffd7ffffffc5ffffffbdffffff87ffffffb72d39fffffffe5c4bfffff"
"fcfffffff80ffffffd4665cfffffff375ffffff88ffffff871a0cffffff8029");
*/
@@ -102,18 +102,18 @@ void BloggingCalendarAdaptor::setAPI( KBlog::APIBlog *api )
delete mAPI;
mAPI = api;
mAuthenticated = false;
- connect( api, SIGNAL( userInfoRetrieved( const QString &, const QString &,
- const QString & ) ),
- SLOT( slotUserInfoRetrieved( const QString &, const QString &,
- const QString & ) ) );
- connect( api, SIGNAL( folderInfoRetrieved( const QString &, const QString & ) ),
- SLOT( slotFolderInfoRetrieved( const QString&, const QString & ) ) );
- connect( api, SIGNAL( itemOnServer( const KURL & ) ),
- SIGNAL( itemOnServer( const KURL & ) ) );
- connect( api, SIGNAL( itemDownloaded( KCal::Incidence *, const QString &,
- const KURL &, const QString &, const QString & ) ),
- SLOT( calendarItemDownloaded( KCal::Incidence *, const QString &,
- const KURL &, const QString &, const QString & ) ) );
+ connect( api, TQT_SIGNAL( userInfoRetrieved( const TQString &, const TQString &,
+ const TQString & ) ),
+ TQT_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 &,
+ const KURL &, const TQString &, const TQString & ) ),
+ TQT_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &,
+ const KURL &, const TQString &, const TQString & ) ) );
}
@@ -125,13 +125,13 @@ KPIM::GroupwareUploadItem *BloggingCalendarAdaptor::newUploadItem( KCal::Inciden
-void BloggingCalendarAdaptor::slotFolderInfoRetrieved( const QString &id, const QString &name )
+void BloggingCalendarAdaptor::slotFolderInfoRetrieved( const TQString &id, const TQString &name )
{
emit folderInfoRetrieved( KURL(id), name, KPIM::FolderLister::Journal );
}
-void BloggingCalendarAdaptor::slotUserInfoRetrieved( const QString &/*nick*/,
- const QString &/*user*/, const QString &/*email*/ )
+void BloggingCalendarAdaptor::slotUserInfoRetrieved( const TQString &/*nick*/,
+ const TQString &/*user*/, const TQString &/*email*/ )
{
kdDebug() << "BloggingCalendarAdaptor::slotUserInfoRetrieved"<<endl;
mAuthenticated = true;
@@ -144,7 +144,7 @@ void BloggingCalendarAdaptor::setBaseURL( const KURL &url )
}
}
-void BloggingCalendarAdaptor::setUser( const QString &user )
+void BloggingCalendarAdaptor::setUser( const TQString &user )
{
CalendarAdaptor::setUser( user );
if ( mAPI ) {
@@ -152,7 +152,7 @@ void BloggingCalendarAdaptor::setUser( const QString &user )
}
}
-void BloggingCalendarAdaptor::setPassword( const QString &password )
+void BloggingCalendarAdaptor::setPassword( const TQString &password )
{
CalendarAdaptor::setPassword( password );
if ( mAPI ) {
@@ -168,8 +168,8 @@ void BloggingCalendarAdaptor::setUserPassword( KURL & )
KIO::Job *BloggingCalendarAdaptor::createLoginJob( const KURL &url,
- const QString &user,
- const QString &password )
+ const TQString &user,
+ const TQString &password )
{
if ( mAPI ) {
mAPI->setURL( url );
@@ -236,7 +236,7 @@ kdDebug() << "BloggingCalendarAdaptor::interpretListFoldersJob" << endl;
bool BloggingCalendarAdaptor::interpretListItemsJob( KIO::Job *job,
- const QString &/*jobData*/ )
+ const TQString &/*jobData*/ )
{
if ( mAPI ) {
return mAPI->interpretListItemsJob( job );
@@ -247,7 +247,7 @@ bool BloggingCalendarAdaptor::interpretListItemsJob( KIO::Job *job,
bool BloggingCalendarAdaptor::interpretDownloadItemsJob( KIO::Job *job,
- const QString &/*jobData*/ )
+ const TQString &/*jobData*/ )
{
if ( mAPI ) {
return mAPI->interpretDownloadItemsJob( job );
diff --git a/kresources/blogging/bloggingcalendaradaptor.h b/kresources/blogging/bloggingcalendaradaptor.h
index b078a744a..2b7a4899b 100644
--- a/kresources/blogging/bloggingcalendaradaptor.h
+++ b/kresources/blogging/bloggingcalendaradaptor.h
@@ -53,27 +53,27 @@ class BloggingCalendarAdaptor : public CalendarAdaptor
Q_OBJECT
public:
BloggingCalendarAdaptor();
- QValueList<KPIM::FolderLister::ContentType> supportedTypes()
+ TQValueList<KPIM::FolderLister::ContentType> supportedTypes()
{
- QValueList<KPIM::FolderLister::ContentType> types;
+ TQValueList<KPIM::FolderLister::ContentType> types;
types << KPIM::FolderLister::Journal;
return types;
}
- QCString identifier() const { return "KCalResourceBlogging"; }
+ TQCString identifier() const { return "KCalResourceBlogging"; }
long flags() const { return GWResNeedsLogon; }
void setBaseURL( const KURL &url );
- void setUser( const QString &user );
- void setPassword( const QString &password );
+ void setUser( const TQString &user );
+ void setPassword( const TQString &password );
// We don't want to set the username / pw for the URL!
void setUserPassword( KURL &url );
KBlog::APIBlog *api() const;
void setAPI( KBlog::APIBlog *api );
- KIO::Job *createLoginJob( const KURL &url, const QString &user,
- const QString &password );
+ KIO::Job *createLoginJob( const KURL &url, const TQString &user,
+ const TQString &password );
KIO::Job *createListFoldersJob( const KURL &url );
KIO::TransferJob *createListItemsJob( const KURL &url );
KIO::TransferJob *createDownloadJob( const KURL &url,
@@ -82,13 +82,13 @@ Q_OBJECT
bool interpretLoginJob( KIO::Job *job );
void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister * );
- bool interpretListItemsJob( KIO::Job *job, const QString &jobData );
- bool interpretDownloadItemsJob( KIO::Job *job, const QString &jobData );
+ bool interpretListItemsJob( KIO::Job *job, const TQString &jobData );
+ bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData );
public slots:
- void slotFolderInfoRetrieved( const QString &id, const QString &name );
- void slotUserInfoRetrieved( const QString &nick, const QString &user,
- const QString &email );
+ void slotFolderInfoRetrieved( const TQString &id, const TQString &name );
+ void slotUserInfoRetrieved( const TQString &nick, const TQString &user,
+ const TQString &email );
protected:
KPIM::GroupwareUploadItem *newUploadItem( KCal::Incidence*it,
@@ -96,7 +96,7 @@ Q_OBJECT
KBlog::APIBlog *mAPI;
bool mAuthenticated;
- static QString mAppID;
+ static TQString mAppID;
};
}
diff --git a/kresources/blogging/bloggingglobals.cpp b/kresources/blogging/bloggingglobals.cpp
index fae91610f..247ed9014 100644
--- a/kresources/blogging/bloggingglobals.cpp
+++ b/kresources/blogging/bloggingglobals.cpp
@@ -21,9 +21,9 @@
#include "bloggingglobals.h"
-QString BloggingGlobals::mAppID = QString("20ffffffd7ffffffc5ffffffbdffffff87ffffffb72d39fffffffe5c4bffffffcfffffff80ffffffd4665cfffffff375ffffff88ffffff871a0cffffff8029");
+TQString BloggingGlobals::mAppID = TQString("20ffffffd7ffffffc5ffffffbdffffff87ffffffb72d39fffffffe5c4bffffffcfffffff80ffffffd4665cfffffff375ffffff88ffffff871a0cffffff8029");
-QString BloggingGlobals::getFunctionName( blogFunctions type )
+TQString BloggingGlobals::getFunctionName( blogFunctions type )
{
switch ( type ) {
case bloggerGetUserInfo: return "blogger.getUserInfo";
@@ -35,19 +35,19 @@ QString BloggingGlobals::getFunctionName( blogFunctions type )
case bloggerGetPost: return "blogger.getPost";
case bloggerGetTemplate: return "blogger.getTemplate";
case bloggerSetTemplate: return "blogger.setTemplate";
- default: return QString::null;
+ default: return TQString::null;
}
}
-QValueList<QVariant> BloggingGlobals::defaultArgs( const QString &user, const QString &pw, const QString &id )
+TQValueList<TQVariant> BloggingGlobals::defaultArgs( const TQString &user, const TQString &pw, const TQString &id )
{
- QValueList<QVariant> args;
- args << QVariant( mAppID );
+ TQValueList<TQVariant> args;
+ args << TQVariant( mAppID );
if ( !id.isNull() ) {
- args << QVariant( id );
+ args << TQVariant( id );
}
- args << QVariant( user )
- << QVariant( pw );
+ args << TQVariant( user )
+ << TQVariant( pw );
return args;
}
diff --git a/kresources/blogging/bloggingglobals.h b/kresources/blogging/bloggingglobals.h
index 7d6ed786b..b55029f1a 100644
--- a/kresources/blogging/bloggingglobals.h
+++ b/kresources/blogging/bloggingglobals.h
@@ -21,9 +21,9 @@
#ifndef BLOGGINGGLOBALS_H
#define BLOGGINGGLOBALS_H
-#include <qstring.h>
-#include <qvariant.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvariant.h>
+#include <tqvaluelist.h>
class BloggingGlobals
{
@@ -42,9 +42,9 @@ class BloggingGlobals
bloggerSetTemplate
};
- static QString getFunctionName( blogFunctions type );
- static QValueList<QVariant> defaultArgs( const QString &user, const QString &pw, const QString &id = QString::null );
- static QString mAppID;
+ static TQString getFunctionName( blogFunctions type );
+ static TQValueList<TQVariant> defaultArgs( const TQString &user, const TQString &pw, const TQString &id = TQString::null );
+ static TQString mAppID;
};
#endif
diff --git a/kresources/blogging/kcal_resourceblogging.cpp b/kresources/blogging/kcal_resourceblogging.cpp
index bffce10d3..6f7ed46ec 100644
--- a/kresources/blogging/kcal_resourceblogging.cpp
+++ b/kresources/blogging/kcal_resourceblogging.cpp
@@ -62,7 +62,7 @@ void ResourceBlogging::readConfig( const KConfig *config )
ad->setPassword( prefs()->password() );
ad->setBaseURL( prefs()->url() );
}
-// QString url = config->readEntry( "URL" );
+// TQString url = config->readEntry( "URL" );
// mUrl = KURL( url );
// mServerAPI = config->readNumEntry( "ServerAPI" );
diff --git a/kresources/blogging/kcal_resourcebloggingconfig.cpp b/kresources/blogging/kcal_resourcebloggingconfig.cpp
index 6e2348288..d68584a2b 100644
--- a/kresources/blogging/kcal_resourcebloggingconfig.cpp
+++ b/kresources/blogging/kcal_resourcebloggingconfig.cpp
@@ -25,7 +25,7 @@
using namespace KCal;
-ResourceBloggingConfig::ResourceBloggingConfig( QWidget *parent, const char *name ) : ResourceGroupwareBaseConfig( parent, name )
+ResourceBloggingConfig::ResourceBloggingConfig( TQWidget *parent, const char *name ) : ResourceGroupwareBaseConfig( parent, name )
{
}
diff --git a/kresources/blogging/kcal_resourcebloggingconfig.h b/kresources/blogging/kcal_resourcebloggingconfig.h
index a7a7a4b00..8495595b6 100644
--- a/kresources/blogging/kcal_resourcebloggingconfig.h
+++ b/kresources/blogging/kcal_resourcebloggingconfig.h
@@ -29,7 +29,7 @@ class KDE_EXPORT ResourceBloggingConfig : public ResourceGroupwareBaseConfig
{
Q_OBJECT
public:
- ResourceBloggingConfig( QWidget *parent = 0, const char *name = 0 );
+ ResourceBloggingConfig( TQWidget *parent = 0, const char *name = 0 );
public slots:
virtual void saveSettings( KRES::Resource *resource );
diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp
index 76bee44f8..d99e8add8 100644
--- a/kresources/blogging/xmlrpcjob.cpp
+++ b/kresources/blogging/xmlrpcjob.cpp
@@ -26,8 +26,8 @@
#include "xmlrpcjob.h"
-#include <qvariant.h>
-#include <qregexp.h>
+#include <tqvariant.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <klocale.h>
@@ -36,8 +36,8 @@
#include <kio/davjob.h>
-#define KIO_ARGS QByteArray packedArgs; \
- QDataStream stream( packedArgs, IO_WriteOnly ); stream
+#define KIO_ARGS TQByteArray packedArgs; \
+ TQDataStream stream( packedArgs, IO_WriteOnly ); stream
using namespace KIO;
@@ -49,32 +49,32 @@ namespace KIO {
XMLRPCResult() {}
bool success() const { return m_success; }
int errorCode() const { return m_errorCode; }
- QString errorString() const { return m_errorString; }
- QValueList<QVariant> data() const { return m_data; }
+ TQString errorString() const { return m_errorString; }
+ TQValueList<TQVariant> data() const { return m_data; }
private:
bool m_success;
int m_errorCode;
- QString m_errorString;
- QValueList<QVariant> m_data;
+ TQString m_errorString;
+ TQValueList<TQVariant> m_data;
};
}
class XmlrpcJob::XmlrpcJobPrivate
{
public:
-// QByteArray savedStaticData;
+// TQByteArray savedStaticData;
};
-XmlrpcJob::XmlrpcJob( const KURL& url, const QString& method,
- const QValueList<QVariant> &params, bool showProgressInfo)
- : TransferJob( url, KIO::CMD_SPECIAL, QByteArray(), QByteArray(),
+XmlrpcJob::XmlrpcJob( const KURL& url, const TQString& method,
+ const TQValueList<TQVariant> &params, bool showProgressInfo)
+ : TransferJob( url, KIO::CMD_SPECIAL, TQByteArray(), TQByteArray(),
showProgressInfo )
{
d = new XmlrpcJobPrivate;
// We couldn't set the args when calling the parent constructor,
// so do it now.
- QDataStream stream( m_packedArgs, IO_WriteOnly );
+ TQDataStream stream( m_packedArgs, IO_WriteOnly );
stream << (int)1 << url;
kdDebug()<<"XMLrpcJob::url="<<url.url()<<endl;
kdDebug()<<"XmlrpcJob::XmlrpcJob, method="<<method<<endl;
@@ -82,7 +82,7 @@ kdDebug()<<"XmlrpcJob::XmlrpcJob, method="<<method<<endl;
if ( ! method.isEmpty() ) {
kdDebug()<<"XmlrpcJob::XmlrpcJob, method not empty."<<endl;
- QString call = markupCall( method, params );
+ TQString call = markupCall( method, params );
staticData = call.utf8();
staticData.truncate( staticData.size() - 1 );
kdDebug() << "Message: " << call << endl;
@@ -99,19 +99,19 @@ XmlrpcJob::~XmlrpcJob()
d = 0;
}
-QString XmlrpcJob::markupCall( const QString &cmd,
- const QValueList<QVariant> &args )
+TQString XmlrpcJob::markupCall( const TQString &cmd,
+ const TQValueList<TQVariant> &args )
{
kdDebug()<<"XmlrpcJob::markupCall, cmd="<<cmd<<endl;
- QString markup = "<?xml version=\"1.0\" ?>\r\n<methodCall>\r\n";
+ TQString markup = "<?xml version=\"1.0\" ?>\r\n<methodCall>\r\n";
markup += "<methodName>" + cmd + "</methodName>\r\n";
if ( !args.isEmpty() )
{
markup += "<params>\r\n";
- QValueList<QVariant>::ConstIterator it = args.begin();
- QValueList<QVariant>::ConstIterator end = args.end();
+ TQValueList<TQVariant>::ConstIterator it = args.begin();
+ TQValueList<TQVariant>::ConstIterator end = args.end();
for ( ; it != end; ++it )
markup += "<param>\r\n" + marshal( *it ) + "</param>\r\n";
markup += "</params>\r\n";
@@ -126,11 +126,11 @@ kdDebug()<<"XmlrpcJob::markupCall, cmd="<<cmd<<endl;
-void XmlrpcJob::slotData( const QByteArray& data )
+void XmlrpcJob::slotData( const TQByteArray& data )
{
kdDebug()<<"XmlrpcJob::slotData()"<<endl;
if ( m_redirectionURL.isEmpty() || !m_redirectionURL.isValid() || m_error )
- m_str_response.append( QString( data ) );
+ m_str_response.append( TQString( data ) );
}
void XmlrpcJob::slotFinished()
@@ -140,7 +140,7 @@ kdDebug() << m_str_response << endl;
// TODO: Redirection with XML-RPC??
/* if (! m_redirectionURL.isEmpty() && m_redirectionURL.isValid() ) {
- QDataStream istream( m_packedArgs, IO_ReadOnly );
+ TQDataStream istream( m_packedArgs, IO_ReadOnly );
int s_cmd, s_method;
KURL s_url;
istream >> s_cmd;
@@ -149,14 +149,14 @@ kdDebug() << m_str_response << endl;
// PROPFIND
if ( (s_cmd == 7) && (s_method == (int)KIO::HTTP_POST) ) {
m_packedArgs.truncate(0);
- QDataStream stream( m_packedArgs, IO_WriteOnly );
+ TQDataStream stream( m_packedArgs, IO_WriteOnly );
stream << (int)7 << m_redirectionURL << (int)KIO::HTTP_POST;
}
} else */
kdDebug() << "\033[35;40mResult: " << m_str_response << "\033[0;0m" << endl;
- QDomDocument doc;
- QString errMsg;
+ TQDomDocument doc;
+ TQString errMsg;
int errLine, errCol;
if ( doc.setContent( m_str_response, false, &errMsg, &errLine, &errCol ) ) {
if ( isMessageResponse( doc ) ) {
@@ -165,12 +165,12 @@ kdDebug() << m_str_response << endl;
} else if ( isFaultResponse( doc ) ) {
// TODO: Set the error of the job
m_response.clear();
- m_response << QVariant( parseFaultResponse( doc ).errorString() );
+ m_response << TQVariant( parseFaultResponse( doc ).errorString() );
m_responseType = XMLRPCFaultResponse;
} else {
// TODO: Set the error of the job
m_response.clear();
- m_response << QVariant( i18n( "Unknown type of XML markup received. "
+ m_response << TQVariant( i18n( "Unknown type of XML markup received. "
"Markup: \n %1" ).arg( m_str_response ) );
m_responseType = XMLRPCUnknownResponse;
}
@@ -190,18 +190,18 @@ kdDebug() << m_str_response << endl;
-bool XmlrpcJob::isMessageResponse( const QDomDocument &doc )
+bool XmlrpcJob::isMessageResponse( const TQDomDocument &doc )
{
return doc.documentElement().firstChild().toElement()
.tagName().lower() == "params";
}
-XMLRPCResult XmlrpcJob::parseMessageResponse( const QDomDocument &doc )
+XMLRPCResult XmlrpcJob::parseMessageResponse( const TQDomDocument &doc )
{
XMLRPCResult response;
response.m_success = true;
- QDomNode paramNode = doc.documentElement().firstChild().firstChild();
+ TQDomNode paramNode = doc.documentElement().firstChild().firstChild();
while ( !paramNode.isNull() ) {
response.m_data << demarshal( paramNode.firstChild().toElement() );
paramNode = paramNode.nextSibling();
@@ -214,19 +214,19 @@ XMLRPCResult XmlrpcJob::parseMessageResponse( const QDomDocument &doc )
-bool XmlrpcJob::isFaultResponse( const QDomDocument &doc )
+bool XmlrpcJob::isFaultResponse( const TQDomDocument &doc )
{
return doc.documentElement().firstChild().toElement()
.tagName().lower() == "fault";
}
-XMLRPCResult XmlrpcJob::parseFaultResponse( const QDomDocument &doc )
+XMLRPCResult XmlrpcJob::parseFaultResponse( const TQDomDocument &doc )
{
XMLRPCResult response;
response.m_success = false;
- QDomNode errorNode = doc.documentElement().firstChild().firstChild();
- const QVariant errorVariant = demarshal( errorNode.toElement() );
+ TQDomNode errorNode = doc.documentElement().firstChild().firstChild();
+ const TQVariant errorVariant = demarshal( errorNode.toElement() );
response.m_errorCode = errorVariant.toMap() [ "faultCode" ].toInt();
response.m_errorString = errorVariant.toMap() [ "faultString" ].toString();
@@ -237,50 +237,50 @@ XMLRPCResult XmlrpcJob::parseFaultResponse( const QDomDocument &doc )
-QString XmlrpcJob::marshal( const QVariant &arg )
+TQString XmlrpcJob::marshal( const TQVariant &arg )
{
switch ( arg.type() )
{
- case QVariant::String:
- case QVariant::CString:
+ case TQVariant::String:
+ case TQVariant::CString:
return "<value><string>" + arg.toString() + "</string></value>\r\n";
- case QVariant::Int:
- return "<value><int>" + QString::number( arg.toInt() ) +
+ case TQVariant::Int:
+ return "<value><int>" + TQString::number( arg.toInt() ) +
"</int></value>\r\n";
- case QVariant::Double:
- return "<value><double>" + QString::number( arg.toDouble() ) +
+ case TQVariant::Double:
+ return "<value><double>" + TQString::number( arg.toDouble() ) +
"</double></value>\r\n";
- case QVariant::Bool:
+ case TQVariant::Bool:
{
- QString markup = "<value><boolean>";
+ TQString markup = "<value><boolean>";
markup += arg.toBool() ? "1" : "0";
markup += "</boolean></value>\r\n";
return markup;
}
- case QVariant::ByteArray:
+ case TQVariant::ByteArray:
return "<value><base64>" + KCodecs::base64Encode( arg.toByteArray() ) +
"</base64></value>\r\n";
- case QVariant::DateTime:
+ case TQVariant::DateTime:
return "<value><datetime.iso8601>" +
arg.toDateTime().toString( Qt::ISODate ) +
"</datetime.iso8601></value>\r\n";
- case QVariant::List:
+ case TQVariant::List:
{
- QString markup = "<value><array><data>\r\n";
- const QValueList<QVariant> args = arg.toList();
- QValueList<QVariant>::ConstIterator it = args.begin();
- QValueList<QVariant>::ConstIterator end = args.end();
+ TQString markup = "<value><array><data>\r\n";
+ const TQValueList<TQVariant> args = arg.toList();
+ TQValueList<TQVariant>::ConstIterator it = args.begin();
+ TQValueList<TQVariant>::ConstIterator end = args.end();
for ( ; it != end; ++it )
markup += marshal( *it );
markup += "</data></array></value>\r\n";
return markup;
}
- case QVariant::Map:
+ case TQVariant::Map:
{
- QString markup = "<value><struct>\r\n";
- QMap<QString, QVariant> map = arg.toMap();
- QMap<QString, QVariant>::ConstIterator it = map.begin();
- QMap<QString, QVariant>::ConstIterator end = map.end();
+ TQString markup = "<value><struct>\r\n";
+ TQMap<TQString, TQVariant> map = arg.toMap();
+ TQMap<TQString, TQVariant>::ConstIterator it = map.begin();
+ TQMap<TQString, TQVariant>::ConstIterator end = map.end();
for ( ; it != end; ++it )
{
markup += "<member>\r\n";
@@ -295,10 +295,10 @@ QString XmlrpcJob::marshal( const QVariant &arg )
kdWarning() << "Failed to marshal unknown variant type: "
<< arg.type() << endl;
};
- return QString::null;
+ return TQString::null;
}
-QVariant XmlrpcJob::demarshal( const QDomElement &elem )
+TQVariant XmlrpcJob::demarshal( const TQDomElement &elem )
{
Q_ASSERT( elem.tagName().lower() == "value" );
@@ -310,71 +310,71 @@ QVariant XmlrpcJob::demarshal( const QDomElement &elem )
// Actually, the element will still have a child node, so this will not help here.
// The dirty hack is at the end of this method.
kdDebug()<<"XmlrpcJob::demarshal: No child nodes, assume type=string. Text: "<<elem.text()<<endl;
- return QVariant( elem.text() );
+ return TQVariant( elem.text() );
}
kdDebug()<<"Demarshalling element \"" << elem.text() <<"\"" << endl;
- const QDomElement typeElement = elem.firstChild().toElement();
- const QString typeName = typeElement.tagName().lower();
+ const TQDomElement typeElement = elem.firstChild().toElement();
+ const TQString typeName = typeElement.tagName().lower();
if ( typeName == "string" )
- return QVariant( typeElement.text() );
+ return TQVariant( typeElement.text() );
else if ( typeName == "i4" || typeName == "int" )
- return QVariant( typeElement.text().toInt() );
+ return TQVariant( typeElement.text().toInt() );
else if ( typeName == "double" )
- return QVariant( typeElement.text().toDouble() );
+ return TQVariant( typeElement.text().toDouble() );
else if ( typeName == "boolean" )
{
if ( typeElement.text().lower() == "true" || typeElement.text() == "1" )
- return QVariant( true );
+ return TQVariant( true );
else
- return QVariant( false );
+ return TQVariant( false );
}
else if ( typeName == "base64" )
- return QVariant( KCodecs::base64Decode( typeElement.text().latin1() ) );
+ return TQVariant( KCodecs::base64Decode( typeElement.text().latin1() ) );
else if ( typeName == "datetime" || typeName == "datetime.iso8601" ) {
- QString text( typeElement.text() );
- if ( text.find( QRegExp("^[0-9]{8,8}T") ) >= 0 ) {
+ TQString text( typeElement.text() );
+ if ( text.find( TQRegExp("^[0-9]{8,8}T") ) >= 0 ) {
// It's in the format 20041120T...., so adjust it to correct
- // ISO 8601 Format 2004-11-20T..., else QDateTime::fromString won't work:
+ // ISO 8601 Format 2004-11-20T..., else TQDateTime::fromString won't work:
text = text.insert( 6, '-' );
text = text.insert( 4, '-' );
}
- return QVariant( QDateTime::fromString( text, Qt::ISODate ) );
+ return TQVariant( TQDateTime::fromString( text, Qt::ISODate ) );
} else if ( typeName == "array" ) {
- QValueList<QVariant> values;
- QDomNode valueNode = typeElement.firstChild().firstChild();
+ TQValueList<TQVariant> values;
+ TQDomNode valueNode = typeElement.firstChild().firstChild();
while ( !valueNode.isNull() ) {
values << demarshal( valueNode.toElement() );
valueNode = valueNode.nextSibling();
}
- return QVariant( values );
+ return TQVariant( values );
} else if ( typeName == "struct" ) {
- QMap<QString, QVariant> map;
- QDomNode memberNode = typeElement.firstChild();
+ TQMap<TQString, TQVariant> map;
+ TQDomNode memberNode = typeElement.firstChild();
while ( !memberNode.isNull() ) {
- const QString key = memberNode.toElement().elementsByTagName( "name" ).item( 0 ).toElement().text();
- const QVariant data = demarshal( memberNode.toElement().elementsByTagName( "value" ).item( 0 ).toElement() );
+ const TQString key = memberNode.toElement().elementsByTagName( "name" ).item( 0 ).toElement().text();
+ const TQVariant data = demarshal( memberNode.toElement().elementsByTagName( "value" ).item( 0 ).toElement() );
map[ key ] = data;
memberNode = memberNode.nextSibling();
}
- return QVariant( map );
+ return TQVariant( map );
} else {
kdWarning() << "Cannot demarshal unknown type " << typeName << ", text= " << typeElement.text() << endl;
// FIXME: This is just a workaround, for the issue mentioned at the beginning of this method.
- return QVariant( elem.text() );
+ return TQVariant( elem.text() );
}
- return QVariant();
+ return TQVariant();
}
@@ -383,7 +383,7 @@ kdDebug()<<"Demarshalling element \"" << elem.text() <<"\"" << endl;
/* Convenience methods */
-XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const QString &method, const QValueList<QVariant> &params, bool showProgressInfo )
+XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method, const TQValueList<TQVariant> &params, bool showProgressInfo )
{
if ( url.isEmpty() ) {
kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl;
@@ -395,35 +395,35 @@ XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const QString &method, const QValue
return job;
}
-XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const QString &method,
- const QVariant &arg, bool showProgressInfo )
+XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method,
+ const TQVariant &arg, bool showProgressInfo )
{
- QValueList<QVariant> args;
+ TQValueList<TQVariant> args;
args << arg;
return KIO::xmlrpcCall( url, method, args, showProgressInfo );
}
-XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const QString &method,
- const QStringList &arg, bool showProgressInfo )
+XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method,
+ const TQStringList &arg, bool showProgressInfo )
{
- QValueList<QVariant> args;
- QStringList::ConstIterator it = arg.begin();
- QStringList::ConstIterator end = arg.end();
+ TQValueList<TQVariant> args;
+ TQStringList::ConstIterator it = arg.begin();
+ TQStringList::ConstIterator end = arg.end();
for ( ; it != end; ++it )
- args << QVariant( *it );
+ args << TQVariant( *it );
return KIO::xmlrpcCall( url, method, args, showProgressInfo );
}
template <typename T>
-XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const QString &method,
- const QValueList<T>&arg, bool showProgressInfo )
+XmlrpcJob* KIO::xmlrpcCall( const KURL& url, const TQString &method,
+ const TQValueList<T>&arg, bool showProgressInfo )
{
- QValueList<QVariant> args;
+ TQValueList<TQVariant> args;
- typename QValueList<T>::ConstIterator it = arg.begin();
- typename QValueList<T>::ConstIterator end = arg.end();
+ typename TQValueList<T>::ConstIterator it = arg.begin();
+ typename TQValueList<T>::ConstIterator end = arg.end();
for ( ; it != end; ++it )
- args << QVariant( *it );
+ args << TQVariant( *it );
return KIO::xmlrpcCall( url, method, args, showProgressInfo );
}
diff --git a/kresources/blogging/xmlrpcjob.h b/kresources/blogging/xmlrpcjob.h
index cd657aa3b..7bb18b159 100644
--- a/kresources/blogging/xmlrpcjob.h
+++ b/kresources/blogging/xmlrpcjob.h
@@ -25,9 +25,9 @@
#include <kurl.h>
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <qdom.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
+#include <tqdom.h>
#include <kio/jobclasses.h>
#include <kio/global.h>
@@ -59,42 +59,42 @@ Q_OBJECT
* Use KIO::xmlrpcPropFind(), KIO::xmlrpcPropPatch() and
* KIO::xmlrpcSearch() to create a new XmlrpcJob.
*/
- XmlrpcJob( const KURL& url, const QString& method,
- const QValueList<QVariant> &params, bool showProgressInfo );
+ XmlrpcJob( const KURL& url, const TQString& method,
+ const TQValueList<TQVariant> &params, bool showProgressInfo );
virtual ~XmlrpcJob();
/**
- * Returns the response as a QDomDocument.
+ * Returns the response as a TQDomDocument.
* @return the response document
*/
- QValueList<QVariant> &response() { return m_response; }
+ TQValueList<TQVariant> &response() { return m_response; }
/**
* Returns the type of the response.
* @return the type of the response
*/
XMLRPCResponseType responseType() const { return m_responseType; }
- static QString markupCall( const QString &cmd,
- const QValueList<QVariant> &args );
+ static TQString markupCall( const TQString &cmd,
+ const TQValueList<TQVariant> &args );
protected slots:
virtual void slotFinished();
- virtual void slotData( const QByteArray &data);
+ virtual void slotData( const TQByteArray &data);
protected:
- static QString marshal( const QVariant &arg );
- static QVariant demarshal( const QDomElement &e );
+ static TQString marshal( const TQVariant &arg );
+ static TQVariant demarshal( const TQDomElement &e );
- static bool isMessageResponse( const QDomDocument &doc );
- static bool isFaultResponse( const QDomDocument &doc );
+ static bool isMessageResponse( const TQDomDocument &doc );
+ static bool isFaultResponse( const TQDomDocument &doc );
- static XMLRPCResult parseMessageResponse( const QDomDocument &doc );
- static XMLRPCResult parseFaultResponse( const QDomDocument &doc );
+ static XMLRPCResult parseMessageResponse( const TQDomDocument &doc );
+ static XMLRPCResult parseFaultResponse( const TQDomDocument &doc );
private:
class XmlrpcJobPrivate;
XmlrpcJobPrivate *d;
- QString m_str_response;
- QValueList<QVariant> m_response;
+ TQString m_str_response;
+ TQValueList<TQVariant> m_response;
XMLRPCResponseType m_responseType;
};
@@ -103,21 +103,21 @@ Q_OBJECT
*
* @param url the URL of the XML-RPC Interface of the server
* @param method the name of the method to call
- * @param params the arguments (as QValueList<QVariant>) for the method call.
+ * @param params the arguments (as TQValueList<TQVariant>) for the method call.
* @param showProgressInfo true to show progress information
* @return the new XmlrpcJob
*/
-XmlrpcJob* xmlrpcCall( const KURL& url, const QString &method,
- const QValueList<QVariant> &params,
+XmlrpcJob* xmlrpcCall( const KURL& url, const TQString &method,
+ const TQValueList<TQVariant> &params,
bool showProgressInfo = true );
-XmlrpcJob* xmlrpcCall( const KURL& url, const QString &method,
- const QVariant &arg, bool showProgressInfo = true );
-XmlrpcJob* xmlrpcCall( const KURL& url, const QString &method,
- const QStringList &arg, bool showProgressInfo = true );
+XmlrpcJob* xmlrpcCall( const KURL& url, const TQString &method,
+ const TQVariant &arg, bool showProgressInfo = true );
+XmlrpcJob* xmlrpcCall( const KURL& url, const TQString &method,
+ const TQStringList &arg, bool showProgressInfo = true );
template <typename T>
-XmlrpcJob* xmlrpcCall( const KURL& url, const QString &method,
- const QValueList<T>&arg,bool showProgressInfo = true );
+XmlrpcJob* xmlrpcCall( const KURL& url, const TQString &method,
+ const TQValueList<T>&arg,bool showProgressInfo = true );
}
#endif
diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp
index 681faa1c7..da9bd8473 100644
--- a/kresources/caldav/config.cpp
+++ b/kresources/caldav/config.cpp
@@ -26,9 +26,9 @@
#include <klistview.h>
#include <kurlrequester.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
/*=========================================================================
| NAMESPACE
@@ -70,7 +70,7 @@ CalDavPrefs* ResourceCalDavConfig::getPrefs(ResourceCalDav* res) {
| CONSTRUCTOR / DESTRUCTOR
========================================================================*/
-ResourceCalDavConfig::ResourceCalDavConfig( QWidget *parent )
+ResourceCalDavConfig::ResourceCalDavConfig( TQWidget *parent )
: KRES::ConfigWidget( parent )
{
setupUI();
@@ -111,35 +111,35 @@ void ResourceCalDavConfig::saveSettings( KRES::Resource *resource ) {
}
void ResourceCalDavConfig::setupUI() {
- QVBoxLayout *vertical = new QVBoxLayout(this);
+ TQVBoxLayout *vertical = new TQVBoxLayout(this);
- QGridLayout *mainLayout = new QGridLayout( this );
+ TQGridLayout *mainLayout = new TQGridLayout( this );
// URL
- QLabel *label = new QLabel( i18n( "URL:" ), this );
- mUrl = new QLineEdit( this );
+ TQLabel *label = new TQLabel( i18n( "URL:" ), this );
+ mUrl = new TQLineEdit( this );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mUrl, 1, 1 );
// Username
- label = new QLabel( i18n( "Username:" ), this );
- mUsername = new QLineEdit( this );
+ label = new TQLabel( i18n( "Username:" ), this );
+ mUsername = new TQLineEdit( this );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mUsername, 2, 1 );
// Password
- label = new QLabel( i18n( "Password:" ), this );
- mPassword = new QLineEdit( this );
- mPassword->setEchoMode( QLineEdit::Password );
+ label = new TQLabel( i18n( "Password:" ), this );
+ mPassword = new TQLineEdit( this );
+ mPassword->setEchoMode( TQLineEdit::Password );
mainLayout->addWidget( label, 3, 0 );
mainLayout->addWidget( mPassword, 3, 1 );
// Remember password checkbox
- mRememberPassword = new QCheckBox( i18n("Remember password"), this );
+ mRememberPassword = new TQCheckBox( i18n("Remember password"), this );
mainLayout->addWidget(mRememberPassword, 4, 1);
// configs
- QHBoxLayout* horizontal = new QHBoxLayout(this);
+ TQHBoxLayout* horizontal = new TQHBoxLayout(this);
// Reload config
mReloadConfig = new CalDavReloadConfig(this);
diff --git a/kresources/caldav/config.h b/kresources/caldav/config.h
index 5b0325994..bd748db91 100644
--- a/kresources/caldav/config.h
+++ b/kresources/caldav/config.h
@@ -43,7 +43,7 @@ class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget
public:
- ResourceCalDavConfig(QWidget *parent = 0);
+ ResourceCalDavConfig(TQWidget *parent = 0);
public slots:
@@ -56,10 +56,10 @@ protected:
private:
- QLineEdit *mUrl;
- QLineEdit *mUsername;
- QLineEdit *mPassword;
- QCheckBox *mRememberPassword;
+ TQLineEdit *mUrl;
+ TQLineEdit *mUsername;
+ TQLineEdit *mPassword;
+ TQCheckBox *mRememberPassword;
CalDavReloadConfig* mReloadConfig;
CalDavSaveConfig* mSaveConfig;
diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp
index 64eb1a279..b5ef0f496 100644
--- a/kresources/caldav/configwidgets.cpp
+++ b/kresources/caldav/configwidgets.cpp
@@ -40,14 +40,14 @@
#include <klocale.h>
#include <kdebug.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-#include <qbuttongroup.h>
-#include <qgroupbox.h>
-#include <qhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
+#include <tqbuttongroup.h>
+#include <tqgroupbox.h>
+#include <tqhbox.h>
using namespace KCal;
@@ -59,8 +59,8 @@ class CalDavConfigPrivate
: mGroup( 0 ),
mIntervalSpin( 0 ) {}
- QButtonGroup *mGroup;
- QSpinBox *mIntervalSpin;
+ TQButtonGroup *mGroup;
+ TQSpinBox *mIntervalSpin;
};
class CalDavReloadConfig::Private
@@ -74,47 +74,47 @@ class CalDavSaveConfig::Private
};
//@endcond
-CalDavReloadConfig::CalDavReloadConfig( QWidget *parent )
- : QWidget( parent ), d( new KCal::CalDavReloadConfig::Private() )
+CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
+ : TQWidget( parent ), d( new KCal::CalDavReloadConfig::Private() )
{
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ TQBoxLayout *topLayout = new TQVBoxLayout( this );
- //QGroupBox *groupBox = new QGroupBox( i18nc( "@title:group", "Automatic Reload" ), this );
- QGroupBox *groupBox = new QGroupBox( i18n( "Automatic Reload" ), this );
+ //TQGroupBox *groupBox = new TQGroupBox( i18nc( "@title:group", "Automatic Reload" ), this );
+ TQGroupBox *groupBox = new TQGroupBox( i18n( "Automatic Reload" ), this );
topLayout->addWidget( groupBox );
- QRadioButton *noAutomaticReload =
- new QRadioButton(
+ TQRadioButton *noAutomaticReload =
+ new TQRadioButton(
//i18nc( "@option:radio never reload the cache", "Never" ), groupBox );
i18n( "Never" ), groupBox );
- QRadioButton *automaticReloadOnStartup =
- new QRadioButton(
+ TQRadioButton *automaticReloadOnStartup =
+ new TQRadioButton(
//i18nc( "@option:radio reload the cache on startup", "Only on startup" ), groupBox );
i18n( "Only on startup" ), groupBox );
- QRadioButton *intervalRadio =
- new QRadioButton(
+ TQRadioButton *intervalRadio =
+ new TQRadioButton(
// i18nc( "@option:radio reload the cache at regular intervals",
// "Regular interval" ), groupBox );
i18n( "Regular interval" ), groupBox );
- d->mGroup = new QButtonGroup( this );
+ d->mGroup = new TQButtonGroup( this );
d->mGroup->hide();
d->mGroup->insert( intervalRadio, 2 );
d->mGroup->insert( automaticReloadOnStartup, 1 );
d->mGroup->insert( noAutomaticReload, 0 );
- connect( intervalRadio, SIGNAL( toggled( bool ) ),
- SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
+ TQT_SLOT( slotIntervalToggled( bool ) ) );
- QHBox *intervalBox = new QHBox( groupBox );
- //new QLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
- new QLabel( i18n( "Interval in minutes:" ), intervalBox );
- d->mIntervalSpin = new QSpinBox( intervalBox );
+ TQHBox *intervalBox = new TQHBox( groupBox );
+ //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
+ new TQLabel( i18n( "Interval in minutes:" ), intervalBox );
+ d->mIntervalSpin = new TQSpinBox( intervalBox );
d->mIntervalSpin->setRange( 1, 900 );
d->mIntervalSpin->setEnabled( false );
groupBox->setColumnLayout(1, Qt::Vertical);
- QVBoxLayout *vbox = new QVBoxLayout(groupBox->layout());
+ TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
vbox->addWidget(intervalRadio);
vbox->addWidget(intervalBox);
vbox->addWidget(automaticReloadOnStartup);
@@ -148,54 +148,54 @@ void CalDavReloadConfig::slotIntervalToggled( bool checked )
}
}
-CalDavSaveConfig::CalDavSaveConfig( QWidget *parent )
- : QWidget( parent ), d( new KCal::CalDavSaveConfig::Private() )
+CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
+ : TQWidget( parent ), d( new KCal::CalDavSaveConfig::Private() )
{
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ TQBoxLayout *topLayout = new TQVBoxLayout( this );
- //QGroupBox *groupBox = new QGroupBox( i18nc( "@title:group", "Automatic Save" ), this );
- QGroupBox *groupBox = new QGroupBox( i18n( "Automatic Save" ), this );
- d->mGroup = new QButtonGroup( this );
+ //TQGroupBox *groupBox = new TQGroupBox( i18nc( "@title:group", "Automatic Save" ), this );
+ TQGroupBox *groupBox = new TQGroupBox( i18n( "Automatic Save" ), this );
+ d->mGroup = new TQButtonGroup( this );
d->mGroup->hide();
topLayout->addWidget( groupBox );
- QRadioButton *never =
- new QRadioButton(
+ TQRadioButton *never =
+ new TQRadioButton(
//i18nc( "@option:radio never save the cache automatically", "Never" ), groupBox );
i18n( "Never" ), groupBox );
- QRadioButton *onExit =
- new QRadioButton(
+ TQRadioButton *onExit =
+ new TQRadioButton(
//i18nc( "@option:radio save the cache on exit", "Only on exit" ), groupBox );
i18n( "Only on exit" ), groupBox );
- QRadioButton *intervalRadio =
- new QRadioButton(
+ TQRadioButton *intervalRadio =
+ new TQRadioButton(
//i18nc( "@option:radio save the cache at regular intervals", "Regular interval" ), groupBox );
i18n( "Regular interval" ), groupBox );
- d->mGroup = new QButtonGroup( this );
+ d->mGroup = new TQButtonGroup( this );
d->mGroup->hide();
d->mGroup->insert( never, 0 );
d->mGroup->insert( onExit, 1 );
d->mGroup->insert( intervalRadio, 2 );
- connect( intervalRadio, SIGNAL( toggled( bool ) ),
- SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
+ TQT_SLOT( slotIntervalToggled( bool ) ) );
- QHBox *intervalBox = new QHBox( groupBox );
- //new QLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
- new QLabel( i18n( "Interval in minutes:" ), intervalBox );
- d->mIntervalSpin = new QSpinBox( intervalBox );
+ TQHBox *intervalBox = new TQHBox( groupBox );
+ //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
+ new TQLabel( i18n( "Interval in minutes:" ), intervalBox );
+ d->mIntervalSpin = new TQSpinBox( intervalBox );
d->mIntervalSpin->setRange( 1, 900 );
d->mIntervalSpin->setEnabled( false );
- QRadioButton *delay =
- new QRadioButton(
+ TQRadioButton *delay =
+ new TQRadioButton(
// i18nc( "@option:radio save the cache after some delay",
// "Delayed after changes" ), groupBox );
i18n( "Delayed after changes" ), groupBox );
- QRadioButton *every =
- new QRadioButton(
+ TQRadioButton *every =
+ new TQRadioButton(
// i18nc( "@option:radio save the cache after every modification",
// "Immediately after changes" ), groupBox );
i18n( "Immediately after changes" ), groupBox );
@@ -207,7 +207,7 @@ CalDavSaveConfig::CalDavSaveConfig( QWidget *parent )
intervalBox->hide();
groupBox->setColumnLayout(1, Qt::Vertical);
- QVBoxLayout *vbox = new QVBoxLayout(groupBox->layout());
+ TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
vbox->addWidget(delay);
vbox->addWidget(every);
vbox->addWidget(intervalRadio);
diff --git a/kresources/caldav/configwidgets.h b/kresources/caldav/configwidgets.h
index 6a44d482a..64ae78323 100644
--- a/kresources/caldav/configwidgets.h
+++ b/kresources/caldav/configwidgets.h
@@ -35,7 +35,7 @@
#ifndef KCALDAV_AUTOWIDGETS_H
#define KCALDAV_AUTOWIDGETS_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kdemacros.h>
namespace KCal {
@@ -51,7 +51,7 @@ class KDE_EXPORT CalDavReloadConfig : public QWidget
{
Q_OBJECT
public:
- explicit CalDavReloadConfig( QWidget *parent = 0 );
+ explicit CalDavReloadConfig( TQWidget *parent = 0 );
~CalDavReloadConfig();
public slots:
void loadSettings( ResourceCached *resource );
@@ -77,7 +77,7 @@ class KDE_EXPORT CalDavSaveConfig : public QWidget
{
Q_OBJECT
public:
- explicit CalDavSaveConfig( QWidget *parent = 0 );
+ explicit CalDavSaveConfig( TQWidget *parent = 0 );
~CalDavSaveConfig();
public slots:
diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp
index 9d317d131..1f6c38c49 100644
--- a/kresources/caldav/job.cpp
+++ b/kresources/caldav/job.cpp
@@ -18,7 +18,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qmutex.h>
+#include <tqmutex.h>
#define log(s) kdDebug() << s;
@@ -36,7 +36,7 @@ using namespace KCal;
| CONSTRUCTOR AND DESTRUCTOR
========================================================================*/
-CalDavJob::CalDavJob(const QString& url) {
+CalDavJob::CalDavJob(const TQString& url) {
cleanJob();
setUrl(url);
}
@@ -56,14 +56,14 @@ void CalDavJob::enableCaldavDebug(runtime_info* rt) {
}
}
-void CalDavJob::setErrorString(const QString& err, const long number) {
+void CalDavJob::setErrorString(const TQString& err, const long number) {
mError = true;
mErrorString = err;
mErrorNumber = number;
}
void CalDavJob::processError(const caldav_error* err) {
- QString error_string;
+ TQString error_string;
long code = err->code;
@@ -104,8 +104,8 @@ void CalDavJob::run() {
// Signal done
// 1000 is read, 1001 is write
- if (type() == 0) QApplication::postEvent ( parent(), new QEvent( static_cast<QEvent::Type>(1000) ) );
- if (type() == 1) QApplication::postEvent ( parent(), new QEvent( static_cast<QEvent::Type>(1001) ) );
+ if (type() == 0) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) );
+ if (type() == 1) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) );
}
// EOF ========================================================================
diff --git a/kresources/caldav/job.h b/kresources/caldav/job.h
index 4f3430c90..254a0a104 100644
--- a/kresources/caldav/job.h
+++ b/kresources/caldav/job.h
@@ -17,10 +17,10 @@
#ifndef KCALDAV_JOB_H
#define KCALDAV_JOB_H
-#include <qthread.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qapplication.h>
+#include <tqthread.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
+#include <tqapplication.h>
extern "C" {
#include <libcaldav/caldav.h>
@@ -35,28 +35,28 @@ namespace KCal {
/**
* Calendar job.
*/
-class CalDavJob : public QThread {
+class CalDavJob : public TQThread {
public:
/**
* @param url URL to load.
*/
- CalDavJob(const QString& url = QString());
+ CalDavJob(const TQString& url = TQString());
virtual ~CalDavJob();
/**
* Sets a new URL to load.
*/
- virtual void setUrl(const QString& s) {
+ virtual void setUrl(const TQString& s) {
mUrl = s;
}
/**
* Sets the parent qobject.
*/
- virtual void setParent(QObject *s) {
+ virtual void setParent(TQObject *s) {
mParent = s;
}
@@ -70,14 +70,14 @@ public:
/**
* @return URL to load.
*/
- virtual QString url() const {
+ virtual TQString url() const {
return mUrl;
}
/**
* @return parent object
*/
- virtual QObject *parent() {
+ virtual TQObject *parent() {
return mParent;
}
@@ -98,7 +98,7 @@ public:
/**
* @return an error string.
*/
- virtual QString errorString() const {
+ virtual TQString errorString() const {
return mErrorString;
}
@@ -134,7 +134,7 @@ protected:
/**
* Sets an error string to @p err. Also sets an error flag.
*/
- void setErrorString(const QString& str, const long number);
+ void setErrorString(const TQString& str, const long number);
/**
* Process an error.
@@ -146,11 +146,11 @@ protected:
private:
- QString mUrl;
+ TQString mUrl;
bool mError;
- QString mErrorString;
+ TQString mErrorString;
long mErrorNumber;
- QObject *mParent;
+ TQObject *mParent;
int mType;
void enableCaldavDebug(runtime_info*);
diff --git a/kresources/caldav/preferences.cpp b/kresources/caldav/preferences.cpp
index 4be55e509..8e27b9df0 100644
--- a/kresources/caldav/preferences.cpp
+++ b/kresources/caldav/preferences.cpp
@@ -17,8 +17,8 @@
#include "preferences.h"
#include <kwallet.h>
-#include <qstring.h>
-#include <qurl.h>
+#include <tqstring.h>
+#include <tqurl.h>
#include <kdebug.h>
/*=========================================================================
@@ -32,15 +32,15 @@ using namespace KWallet;
| CONSTANTS
========================================================================*/
-const QString CalDavPrefs::NO_PASSWORD = "";
-const QString CalDavPrefs::WALLET_FOLDER = "CalDAV resource";
-const QString CalDavPrefs::WALLET_PWD_SUFFIX = ":caldav_password";
+const TQString CalDavPrefs::NO_PASSWORD = "";
+const TQString CalDavPrefs::WALLET_FOLDER = "CalDAV resource";
+const TQString CalDavPrefs::WALLET_PWD_SUFFIX = ":caldav_password";
/*=========================================================================
| METHODS
========================================================================*/
-bool CalDavPrefs::setWalletFolder(const QString& folder) {
+bool CalDavPrefs::setWalletFolder(const TQString& folder) {
bool ret = true;
if (!mNoWallet && NULL != mWallet) {
@@ -98,7 +98,7 @@ void CalDavPrefs::removeWallet(bool noWallet) {
mNoWallet = noWallet;
}
-void CalDavPrefs::addPrefix(const QString& prefix) {
+void CalDavPrefs::addPrefix(const TQString& prefix) {
KConfigSkeletonItem::List itemList = items();
KConfigSkeletonItem::List::Iterator it;
@@ -107,7 +107,7 @@ void CalDavPrefs::addPrefix(const QString& prefix) {
}
}
-bool CalDavPrefs::writePasswordToWallet(const QString& password) {
+bool CalDavPrefs::writePasswordToWallet(const TQString& password) {
Wallet* w = getWallet();
@@ -124,12 +124,12 @@ bool CalDavPrefs::writePasswordToWallet(const QString& password) {
return ret;
}
-bool CalDavPrefs::readPasswordFromWallet(QString& password) {
+bool CalDavPrefs::readPasswordFromWallet(TQString& password) {
Wallet* w = getWallet();
bool ret = false;
if (NULL != w) {
- QString p;
+ TQString p;
int rc = w->readPassword(mPrefix + WALLET_PWD_SUFFIX, p);
if (0 == rc) {
//CalDavPrefsSkel::setPassword(p);
@@ -161,7 +161,7 @@ bool CalDavPrefs::removePasswordFromWallet() {
return ret;
}
-void CalDavPrefs::setPassword(const QString& p) {
+void CalDavPrefs::setPassword(const TQString& p) {
mPassword = p;
@@ -170,14 +170,14 @@ void CalDavPrefs::setPassword(const QString& p) {
}
}
-QString CalDavPrefs::password() {
+TQString CalDavPrefs::password() {
if (NO_PASSWORD == mPassword) {
readPasswordFromWallet(mPassword);
}
return mPassword;
}
-QString CalDavPrefs::getusername() {
+TQString CalDavPrefs::getusername() {
return username();
}
@@ -207,10 +207,10 @@ void CalDavPrefs::readConfig() {
}*/
}
-QString CalDavPrefs::getFullUrl() {
+TQString CalDavPrefs::getFullUrl() {
- QUrl t(url());
- QString safeURL;
+ TQUrl t(url());
+ TQString safeURL;
int firstAt;
t.setUser(username());
diff --git a/kresources/caldav/preferences.h b/kresources/caldav/preferences.h
index b8c3bb191..3e1bc0f9c 100644
--- a/kresources/caldav/preferences.h
+++ b/kresources/caldav/preferences.h
@@ -44,7 +44,7 @@ public:
/**
* @param prefix Unique prefix of the resource instance (use identifier() method).
*/
- CalDavPrefs(const QString& prefix)
+ CalDavPrefs(const TQString& prefix)
: mWallet(NULL)
, mNoWallet(false)
, mPrefix(prefix)
@@ -67,25 +67,25 @@ public:
* to be properly saved, call this method after ensuring the remember flag
* is set.
*/
- void setPassword(const QString& p);
+ void setPassword(const TQString& p);
/**
* Returns password. The password is taken from the wallet.
* May return an empty string, if there is no password available.
*/
- QString password();
+ TQString password();
/**
* Returns the username.
*/
- QString getusername();
+ TQString getusername();
void setRememberPassword(bool v);
/**
* @return A full URL to connect to CalDAV server (including username and password).
*/
- QString getFullUrl();
+ TQString getFullUrl();
protected:
@@ -94,7 +94,7 @@ protected:
* can use the same config file.
* @param prefix Unique prefix of the resource instance.
*/
- void addPrefix(const QString& prefix);
+ void addPrefix(const TQString& prefix);
/**
* Returns the wallet or NULL, if the wallet can't be obtained.
@@ -106,7 +106,7 @@ protected:
* @param folder the wallet working folder
* @return true, if the folder has been set, and false otherwise.
*/
- bool setWalletFolder(const QString& folder);
+ bool setWalletFolder(const TQString& folder);
/**
* Removes the wallet. If @p noWallet is set, the wallet has been marked inaccessible, so that subsequent
@@ -119,14 +119,14 @@ protected:
* @param password password to write
* @return true on success, false on failure
*/
- bool writePasswordToWallet(const QString& password);
+ bool writePasswordToWallet(const TQString& password);
/**
* Extracts password from the wallet.
* @param password a variable to save read password to.
* @return true on success, false on failure
*/
- bool readPasswordFromWallet(QString& password);
+ bool readPasswordFromWallet(TQString& password);
/**
* Clears password in the wallet.
@@ -136,15 +136,15 @@ protected:
private:
- static const QString NO_PASSWORD;
- static const QString WALLET_FOLDER;
- static const QString WALLET_PWD_SUFFIX;
+ static const TQString NO_PASSWORD;
+ static const TQString WALLET_FOLDER;
+ static const TQString WALLET_PWD_SUFFIX;
KWallet::Wallet* mWallet;
bool mNoWallet;
- QString mPrefix;
- QString mPassword;
+ TQString mPrefix;
+ TQString mPassword;
};
} // namespace KCal
diff --git a/kresources/caldav/reader.h b/kresources/caldav/reader.h
index 070239fdd..191d28bad 100644
--- a/kresources/caldav/reader.h
+++ b/kresources/caldav/reader.h
@@ -19,8 +19,8 @@
#include "job.h"
-#include <qstring.h>
-#include <qdatetime.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
namespace KCal {
@@ -38,7 +38,7 @@ public:
/**
* @param url URL to load.
*/
- CalDavReader(const QString& url = QString()) :
+ CalDavReader(const TQString& url = TQString()) :
CalDavJob(url)
, mGetAll(true)
{
@@ -49,7 +49,7 @@ public:
* This method call disables the effect of setGetAll() call.
* setGetAll() call disables the effect of this method.
*/
- void setRange(const QDateTime& start, const QDateTime& end) {
+ void setRange(const TQDateTime& start, const TQDateTime& end) {
mGetAll = false;
mTimeStart = start;
mTimeEnd = end;
@@ -67,7 +67,7 @@ public:
/**
* @return downloaded calendar data in iCal format.
*/
- QString data() const {
+ TQString data() const {
return mData;
}
@@ -79,10 +79,10 @@ protected:
private:
- QString mData;
+ TQString mData;
bool mGetAll;
- QDateTime mTimeStart;
- QDateTime mTimeEnd;
+ TQDateTime mTimeStart;
+ TQDateTime mTimeEnd;
};
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index e5571ab99..1e52b3ec5 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -16,10 +16,10 @@
#include <string.h>
-#include <qurl.h>
-#include <qmessagebox.h>
-#include <qapplication.h>
-#include <qeventloop.h>
+#include <tqurl.h>
+#include <tqmessagebox.h>
+#include <tqapplication.h>
+#include <tqeventloop.h>
#include <libkcal/calendarlocal.h>
#include <libkcal/icalformat.h>
@@ -27,12 +27,12 @@
#include <klocale.h>
#include <kpassdlg.h>
-#include <qdatetime.h>
-#include <qmutex.h>
-#include <qthread.h>
+#include <tqdatetime.h>
+#include <tqmutex.h>
+#include <tqthread.h>
#ifdef KCALDAV_DEBUG
- #include <qfile.h>
+ #include <tqfile.h>
#endif
#include "resource.h"
@@ -105,7 +105,7 @@ ResourceCalDav::~ResourceCalDav() {
while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) {
readLockout = true;
sleep(1);
- qApp->processEvents(QEventLoop::ExcludeUserInput);
+ qApp->processEvents(TQEventLoop::ExcludeUserInput);
}
if (mWriter) {
@@ -147,7 +147,7 @@ bool ResourceCalDav::doLoad() {
return true; // Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them!
}
- log(QString("doLoad(%1)").arg(syncCache));
+ log(TQString("doLoad(%1)").arg(syncCache));
clearCache();
@@ -168,7 +168,7 @@ bool ResourceCalDav::doLoad() {
bool ResourceCalDav::doSave() {
bool syncCache = true;
- log(QString("doSave(%1)").arg(syncCache));
+ log(TQString("doSave(%1)").arg(syncCache));
if (!hasChanges()) {
log("no changes");
@@ -196,7 +196,7 @@ bool ResourceCalDav::doSave() {
clearChanges();
if (mWriteRetryTimer != NULL) {
if (mWriteRetryTimer->isActive() == false) {
- disconnect( mWriteRetryTimer, SIGNAL(timeout()), this, SLOT(doSave()) );
+ disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) );
delete mWriteRetryTimer;
mWriteRetryTimer = NULL;
}
@@ -253,8 +253,8 @@ void ResourceCalDav::init() {
// creating jobs
// Qt4 handles this quite differently, as shown below,
// whereas Qt3 needs events (see ::event())
-// connect(mLoader, SIGNAL(finished()), this, SLOT(loadFinished()));
-// connect(mWriter, SIGNAL(finished()), this, SLOT(writingFinished()));
+// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
+// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
setType("ResourceCalDav");
}
@@ -341,14 +341,14 @@ void ResourceCalDav::loadingQueuePop() {
mLoader->setParent(this);
mLoader->setType(0);
- QDateTime dt(QDate::currentDate());
+ TQDateTime dt(TQDate::currentDate());
mLoader->setRange(dt.addDays(-CACHE_DAYS), dt.addDays(CACHE_DAYS));
//mLoader->setGetAll();
mLoadingQueueReady = false;
log("starting actual download job");
- mLoader->start(QThread::LowestPriority);
+ mLoader->start(TQThread::LowestPriority);
// if all ok, removing the task from the queue
mLoadingQueue.dequeue();
@@ -357,7 +357,7 @@ void ResourceCalDav::loadingQueuePop() {
delete t;
}
-void ResourceCalDav::startLoading(const QString& url) {
+void ResourceCalDav::startLoading(const TQString& url) {
LoadingTask *t = new LoadingTask;
t->url = url;
loadingQueuePush(t);
@@ -376,29 +376,29 @@ void ResourceCalDav::loadFinished() {
if (loader->error()) {
if (loader->errorNumber() == -401) {
if (NULL != mPrefs) {
- QCString newpass;
- if (KPasswordDialog::getPassword (newpass, QString("<b>") + i18n("Remote authorization required") + QString("</b><p>") + i18n("Please input the password for") + QString(" ") + mPrefs->getusername(), NULL) != 1) {
+ TQCString newpass;
+ if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
log("load error: " + loader->errorString() );
- loadError(QString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
else {
// Set new password and try again
- mPrefs->setPassword(QString(newpass));
+ mPrefs->setPassword(TQString(newpass));
startLoading(mPrefs->getFullUrl());
}
}
else {
log("load error: " + loader->errorString() );
- loadError(QString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
}
else {
log("load error: " + loader->errorString() );
- loadError(QString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
} else {
log("successful load");
- QString data = loader->data();
+ TQString data = loader->data();
if (!data.isNull() && !data.isEmpty()) {
// TODO: I don't know why, but some schedules on http://caldav-test.ioda.net/ (I used it for testing)
@@ -430,7 +430,7 @@ void ResourceCalDav::loadFinished() {
loadingQueuePop();
}
-bool ResourceCalDav::checkData(const QString& data) {
+bool ResourceCalDav::checkData(const TQString& data) {
log("checking the data");
ICalFormat ical;
@@ -443,7 +443,7 @@ bool ResourceCalDav::checkData(const QString& data) {
return ret;
}
-bool ResourceCalDav::parseData(const QString& data) {
+bool ResourceCalDav::parseData(const TQString& data) {
log("parseData()");
bool ret = true;
@@ -470,11 +470,11 @@ bool ResourceCalDav::parseData(const QString& data) {
// debug code here -------------------------------------------------------
#ifdef KCALDAV_DEBUG
- const QString fout_path = "/tmp/kcaldav_download_" + identifier() + ".tmp";
+ const TQString fout_path = "/tmp/kcaldav_download_" + identifier() + ".tmp";
- QFile fout(fout_path);
+ TQFile fout(fout_path);
if (fout.open(IO_WriteOnly | IO_Append)) {
- QTextStream sout(&fout);
+ TQTextStream sout(&fout);
sout << "---------- " << resourceName() << ": --------------------------------\n";
sout << data << "\n";
fout.close();
@@ -504,13 +504,13 @@ bool ResourceCalDav::parseData(const QString& data) {
| WRITING METHODS
========================================================================*/
-QString ResourceCalDav::getICalString(const Incidence::List& inc) {
+TQString ResourceCalDav::getICalString(const Incidence::List& inc) {
if (inc.isEmpty()) {
return "";
}
CalendarLocal loc(timeZoneId());
- QString data = "";
+ TQString data = "";
ICalFormat ical;
// NOTE: This is very susceptible to invalid entries in added/changed/deletedIncidences
@@ -555,11 +555,11 @@ void ResourceCalDav::writingQueuePop() {
mWriter->setType(1);
#ifdef KCALDAV_DEBUG
- const QString fout_path = "/tmp/kcaldav_upload_" + identifier() + ".tmp";
+ const TQString fout_path = "/tmp/kcaldav_upload_" + identifier() + ".tmp";
- QFile fout(fout_path);
+ TQFile fout(fout_path);
if (fout.open(IO_WriteOnly | IO_Append)) {
- QTextStream sout(&fout);
+ TQTextStream sout(&fout);
sout << "---------- " << resourceName() << ": --------------------------------\n";
sout << "================== Added:\n" << t->added << "\n";
sout << "================== Changed:\n" << t->changed << "\n";
@@ -577,7 +577,7 @@ void ResourceCalDav::writingQueuePop() {
mWritingQueueReady = false;
log("starting actual write job");
- mWriter->start(QThread::LowestPriority);
+ mWriter->start(TQThread::LowestPriority);
// if all ok, remove the task from the queue
mWritingQueue.dequeue();
@@ -586,7 +586,7 @@ void ResourceCalDav::writingQueuePop() {
delete t;
}
-bool ResourceCalDav::event ( QEvent * e ) {
+bool ResourceCalDav::event ( TQEvent * e ) {
if (e->type() == 1000) {
// Read done
loadFinished();
@@ -604,7 +604,7 @@ void ResourceCalDav::releaseReadLockout() {
readLockout = false;
}
-bool ResourceCalDav::startWriting(const QString& url) {
+bool ResourceCalDav::startWriting(const TQString& url) {
log("startWriting: url = " + url);
// WARNING: This will segfault if a separate read or write thread
@@ -612,8 +612,8 @@ bool ResourceCalDav::startWriting(const QString& url) {
// Before these calls are made any existing read (and maybe write) threads should be finished
if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) {
if (mWriteRetryTimer == NULL) {
- mWriteRetryTimer = new QTimer(this);
- connect( mWriteRetryTimer, SIGNAL(timeout()), SLOT(doSave()) );
+ mWriteRetryTimer = new TQTimer(this);
+ connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) );
}
mWriteRetryTimer->start(1000, TRUE);
return false;
@@ -690,25 +690,25 @@ void ResourceCalDav::writingFinished() {
if (mWriter->error() && (abs(mWriter->errorNumber()) != 207)) {
if (mWriter->errorNumber() == -401) {
if (NULL != mPrefs) {
- QCString newpass;
- if (KPasswordDialog::getPassword (newpass, QString("<b>") + i18n("Remote authorization required") + QString("</b><p>") + i18n("Please input the password for") + QString(" ") + mPrefs->getusername(), NULL) != 1) {
+ TQCString newpass;
+ if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
log("write error: " + mWriter->errorString());
- saveError(QString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
else {
// Set new password and try again
- mPrefs->setPassword(QString(newpass));
+ mPrefs->setPassword(TQString(newpass));
startWriting(mPrefs->getFullUrl());
}
}
else {
log("write error: " + mWriter->errorString());
- saveError(QString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
}
else {
log("write error: " + mWriter->errorString());
- saveError(QString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
} else {
log("success");
@@ -716,7 +716,7 @@ void ResourceCalDav::writingFinished() {
}
// Give the remote system a few seconds to process the data before we allow any read operations
- QTimer::singleShot( 3000, this, SLOT(releaseReadLockout()) );
+ TQTimer::singleShot( 3000, this, TQT_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/kresources/caldav/resource.h b/kresources/caldav/resource.h
index b81e555c5..deba22b72 100644
--- a/kresources/caldav/resource.h
+++ b/kresources/caldav/resource.h
@@ -18,8 +18,8 @@
#define KCAL_RESOURCECALDAV_H
#include "preferences.h"
-#include <qthread.h>
-#include <qptrqueue.h>
+#include <tqthread.h>
+#include <tqptrqueue.h>
#include <libkcal/resourcecached.h>
#include <libkdepim/progressmanager.h>
@@ -84,14 +84,14 @@ protected slots:
protected:
struct LoadingTask {
- QString url;
+ TQString url;
};
struct WritingTask {
- QString url;
- QString added;
- QString changed;
- QString deleted;
+ TQString url;
+ TQString added;
+ TQString changed;
+ TQString deleted;
};
@@ -127,35 +127,35 @@ protected:
* Initiates calendar loading process.
* @param url URL to load calendar data from.
*/
- void startLoading(const QString& url);
+ void startLoading(const TQString& url);
/**
* Checks if the data is correct and can be parsed.
* @param data ical string to check.
* @return true if the data is correct, false otherwise.
*/
- bool checkData(const QString& data);
+ bool checkData(const TQString& data);
/**
* Parses the data and adds events to the calendar.
* @param data calendar data.
* @return true on success, false on fail.
*/
- bool parseData(const QString& data);
+ bool parseData(const TQString& data);
/**
* Initiates calendar writing process.
* @param url URL to save calendar data to.
* @return true if write was queued successfully, false if not
*/
- bool startWriting(const QString& url);
+ bool startWriting(const TQString& url);
/**
* Returns a list of incidences as a valid iCalendar string.
* @param inc list of incidences.
* @return a string in iCalendar format which describes the given incidences.
*/
- QString getICalString(const Incidence::List& inc);
+ TQString getICalString(const Incidence::List& inc);
/**
* Changes read-only status of incidences from a given list.
@@ -193,7 +193,7 @@ protected:
*/
void writingQueuePush(const WritingTask *task);
- virtual bool event ( QEvent * e );
+ virtual bool event ( TQEvent * e );
private:
@@ -224,12 +224,12 @@ private:
KPIM::ProgressItem *mProgress;
bool mLoadingQueueReady;
- QPtrQueue<LoadingTask> mLoadingQueue;
+ TQPtrQueue<LoadingTask> mLoadingQueue;
bool mWritingQueueReady;
- QPtrQueue<WritingTask> mWritingQueue;
+ TQPtrQueue<WritingTask> mWritingQueue;
- QTimer *mWriteRetryTimer;
+ TQTimer *mWriteRetryTimer;
};
diff --git a/kresources/caldav/writer.h b/kresources/caldav/writer.h
index 841fc4477..2d1d2d7bb 100644
--- a/kresources/caldav/writer.h
+++ b/kresources/caldav/writer.h
@@ -20,8 +20,8 @@
#include "job.h"
#include <string>
-#include <qstring.h>
-#include <qdatetime.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
namespace KCal {
@@ -39,7 +39,7 @@ public:
/**
* @param url URL to load.
*/
- CalDavWriter(const QString& url = QString()) :
+ CalDavWriter(const TQString& url = TQString()) :
CalDavJob(url)
{
clearObjects();
@@ -50,7 +50,7 @@ public:
* @param s icalendar-formatted string consists of all added incidences plus necessary calendar info.
* May be an empty string, which means there is no added incidences to send.
*/
- void setAddedObjects(const QString& s) {
+ void setAddedObjects(const TQString& s) {
mAdded = s;
}
@@ -59,7 +59,7 @@ public:
* @param s icalendar-formatted string consists of all changed incidences plus necessary calendar info.
* May be an empty string, which means there is no changed incidences to send.
*/
- void setChangedObjects(const QString& s) {
+ void setChangedObjects(const TQString& s) {
mChanged = s;
}
@@ -68,7 +68,7 @@ public:
* @param s icalendar-formatted string consists of all deleted incidences plus necessary calendar info.
* May be an empty string, which means there is no deleted incidences to send.
*/
- void setDeletedObjects(const QString& s) {
+ void setDeletedObjects(const TQString& s) {
mDeleted = s;
}
@@ -89,7 +89,7 @@ protected:
/// Just a wrapper above libcaldav functions.
template<typename Operation>
- int pushObjects(const QString& data, Operation op, int okCode, runtime_info* RT) {
+ int pushObjects(const TQString& data, Operation op, int okCode, runtime_info* RT) {
int r = okCode;
if (!data.isNull() && !data.isEmpty()) {
r = op(std::string(data.ascii()).c_str(), std::string(url().ascii()).c_str(), RT);
@@ -99,9 +99,9 @@ protected:
private:
- QString mAdded;
- QString mChanged;
- QString mDeleted;
+ TQString mAdded;
+ TQString mChanged;
+ TQString mDeleted;
};
} // namespace KCal
diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index 2fd583837..fb1ade761 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -25,9 +25,9 @@
#include <klistview.h>
#include <kurlrequester.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
/*=========================================================================
| NAMESPACE
@@ -69,7 +69,7 @@ CardDavPrefs* ResourceCardDavConfig::getPrefs(ResourceCardDav* res) {
| CONSTRUCTOR / DESTRUCTOR
========================================================================*/
-ResourceCardDavConfig::ResourceCardDavConfig( QWidget *parent )
+ResourceCardDavConfig::ResourceCardDavConfig( TQWidget *parent )
: KRES::ConfigWidget( parent )
{
setupUI();
@@ -112,38 +112,38 @@ void ResourceCardDavConfig::saveSettings( KRES::Resource *resource ) {
}
void ResourceCardDavConfig::setupUI() {
- QVBoxLayout *vertical = new QVBoxLayout(this);
+ TQVBoxLayout *vertical = new TQVBoxLayout(this);
- QGridLayout *mainLayout = new QGridLayout( this );
+ TQGridLayout *mainLayout = new TQGridLayout( this );
// URL
- QLabel *label = new QLabel( i18n( "URL:" ), this );
- mUrl = new QLineEdit( this );
+ TQLabel *label = new TQLabel( i18n( "URL:" ), this );
+ mUrl = new TQLineEdit( this );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mUrl, 1, 1 );
// Username
- label = new QLabel( i18n( "Username:" ), this );
- mUsername = new QLineEdit( this );
+ label = new TQLabel( i18n( "Username:" ), this );
+ mUsername = new TQLineEdit( this );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mUsername, 2, 1 );
// Password
- label = new QLabel( i18n( "Password:" ), this );
- mPassword = new QLineEdit( this );
- mPassword->setEchoMode( QLineEdit::Password );
+ label = new TQLabel( i18n( "Password:" ), this );
+ mPassword = new TQLineEdit( this );
+ mPassword->setEchoMode( TQLineEdit::Password );
mainLayout->addWidget( label, 3, 0 );
mainLayout->addWidget( mPassword, 3, 1 );
// Remember password checkbox
- mRememberPassword = new QCheckBox( i18n("Remember password"), this );
+ mRememberPassword = new TQCheckBox( i18n("Remember password"), this );
mainLayout->addWidget(mRememberPassword, 4, 1);
- mUseUriNotUID = new QCheckBox( i18n( "Use URI instead of UID when modifying existing contacts" ), this );
+ mUseUriNotUID = new TQCheckBox( i18n( "Use URI instead of UID when modifying existing contacts" ), this );
mainLayout->addWidget( mUseUriNotUID, 5, 1 );
// configs
- QHBoxLayout* horizontal = new QHBoxLayout(this);
+ TQHBoxLayout* horizontal = new TQHBoxLayout(this);
// Reload config
mReloadConfig = new CardDavReloadConfig(this);
diff --git a/kresources/carddav/config.h b/kresources/carddav/config.h
index f74cb07f9..05b190f4f 100644
--- a/kresources/carddav/config.h
+++ b/kresources/carddav/config.h
@@ -42,7 +42,7 @@ class KDE_EXPORT ResourceCardDavConfig : public KRES::ConfigWidget
public:
- ResourceCardDavConfig(QWidget *parent = 0);
+ ResourceCardDavConfig(TQWidget *parent = 0);
public slots:
@@ -55,11 +55,11 @@ protected:
private:
- QLineEdit *mUrl;
- QLineEdit *mUsername;
- QLineEdit *mPassword;
- QCheckBox *mRememberPassword;
- QCheckBox *mUseUriNotUID;
+ TQLineEdit *mUrl;
+ TQLineEdit *mUsername;
+ TQLineEdit *mPassword;
+ TQCheckBox *mRememberPassword;
+ TQCheckBox *mUseUriNotUID;
CardDavReloadConfig* mReloadConfig;
CardDavSaveConfig* mSaveConfig;
diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index e97a0a88d..baa70b403 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -39,14 +39,14 @@
#include <klocale.h>
#include <kdebug.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-#include <qbuttongroup.h>
-#include <qgroupbox.h>
-#include <qhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
+#include <tqbuttongroup.h>
+#include <tqgroupbox.h>
+#include <tqhbox.h>
using namespace KABC;
@@ -58,8 +58,8 @@ class CardDavConfigPrivate
: mGroup( 0 ),
mIntervalSpin( 0 ) {}
- QButtonGroup *mGroup;
- QSpinBox *mIntervalSpin;
+ TQButtonGroup *mGroup;
+ TQSpinBox *mIntervalSpin;
};
class CardDavReloadConfig::Private
@@ -73,47 +73,47 @@ class CardDavSaveConfig::Private
};
//@endcond
-CardDavReloadConfig::CardDavReloadConfig( QWidget *parent )
- : QWidget( parent ), d( new KABC::CardDavReloadConfig::Private() )
+CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
+ : TQWidget( parent ), d( new KABC::CardDavReloadConfig::Private() )
{
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ TQBoxLayout *topLayout = new TQVBoxLayout( this );
- //QGroupBox *groupBox = new QGroupBox( i18nc( "@title:group", "Automatic Reload" ), this );
- QGroupBox *groupBox = new QGroupBox( i18n( "Automatic Reload" ), this );
+ //TQGroupBox *groupBox = new TQGroupBox( i18nc( "@title:group", "Automatic Reload" ), this );
+ TQGroupBox *groupBox = new TQGroupBox( i18n( "Automatic Reload" ), this );
topLayout->addWidget( groupBox );
- QRadioButton *noAutomaticReload =
- new QRadioButton(
+ TQRadioButton *noAutomaticReload =
+ new TQRadioButton(
//i18nc( "@option:radio never reload the cache", "Never" ), groupBox );
i18n( "Never" ), groupBox );
- QRadioButton *automaticReloadOnStartup =
- new QRadioButton(
+ TQRadioButton *automaticReloadOnStartup =
+ new TQRadioButton(
//i18nc( "@option:radio reload the cache on startup", "Only on startup" ), groupBox );
i18n( "Only on startup" ), groupBox );
- QRadioButton *intervalRadio =
- new QRadioButton(
+ TQRadioButton *intervalRadio =
+ new TQRadioButton(
// i18nc( "@option:radio reload the cache at regular intervals",
// "Regular interval" ), groupBox );
i18n( "Regular interval" ), groupBox );
- d->mGroup = new QButtonGroup( this );
+ d->mGroup = new TQButtonGroup( this );
d->mGroup->hide();
d->mGroup->insert( intervalRadio, 2 );
d->mGroup->insert( automaticReloadOnStartup, 1 );
d->mGroup->insert( noAutomaticReload, 0 );
- connect( intervalRadio, SIGNAL( toggled( bool ) ),
- SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
+ TQT_SLOT( slotIntervalToggled( bool ) ) );
- QHBox *intervalBox = new QHBox( groupBox );
- //new QLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
- new QLabel( i18n( "Interval in minutes:" ), intervalBox );
- d->mIntervalSpin = new QSpinBox( intervalBox );
+ TQHBox *intervalBox = new TQHBox( groupBox );
+ //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
+ new TQLabel( i18n( "Interval in minutes:" ), intervalBox );
+ d->mIntervalSpin = new TQSpinBox( intervalBox );
d->mIntervalSpin->setRange( 1, 900 );
d->mIntervalSpin->setEnabled( false );
groupBox->setColumnLayout(1, Qt::Vertical);
- QVBoxLayout *vbox = new QVBoxLayout(groupBox->layout());
+ TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
vbox->addWidget(intervalRadio);
vbox->addWidget(intervalBox);
vbox->addWidget(automaticReloadOnStartup);
@@ -152,54 +152,54 @@ void CardDavReloadConfig::slotIntervalToggled( bool checked )
}
}
-CardDavSaveConfig::CardDavSaveConfig( QWidget *parent )
- : QWidget( parent ), d( new KABC::CardDavSaveConfig::Private() )
+CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
+ : TQWidget( parent ), d( new KABC::CardDavSaveConfig::Private() )
{
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ TQBoxLayout *topLayout = new TQVBoxLayout( this );
- //QGroupBox *groupBox = new QGroupBox( i18nc( "@title:group", "Automatic Save" ), this );
- QGroupBox *groupBox = new QGroupBox( i18n( "Automatic Save" ), this );
- d->mGroup = new QButtonGroup( this );
+ //TQGroupBox *groupBox = new TQGroupBox( i18nc( "@title:group", "Automatic Save" ), this );
+ TQGroupBox *groupBox = new TQGroupBox( i18n( "Automatic Save" ), this );
+ d->mGroup = new TQButtonGroup( this );
d->mGroup->hide();
topLayout->addWidget( groupBox );
- QRadioButton *never =
- new QRadioButton(
+ TQRadioButton *never =
+ new TQRadioButton(
//i18nc( "@option:radio never save the cache automatically", "Never" ), groupBox );
i18n( "Never" ), groupBox );
- QRadioButton *onExit =
- new QRadioButton(
+ TQRadioButton *onExit =
+ new TQRadioButton(
//i18nc( "@option:radio save the cache on exit", "Only on exit" ), groupBox );
i18n( "Only on exit" ), groupBox );
- QRadioButton *intervalRadio =
- new QRadioButton(
+ TQRadioButton *intervalRadio =
+ new TQRadioButton(
//i18nc( "@option:radio save the cache at regular intervals", "Regular interval" ), groupBox );
i18n( "Regular interval" ), groupBox );
- d->mGroup = new QButtonGroup( this );
+ d->mGroup = new TQButtonGroup( this );
d->mGroup->hide();
d->mGroup->insert( never, 0 );
d->mGroup->insert( onExit, 1 );
d->mGroup->insert( intervalRadio, 2 );
- connect( intervalRadio, SIGNAL( toggled( bool ) ),
- SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
+ TQT_SLOT( slotIntervalToggled( bool ) ) );
- QHBox *intervalBox = new QHBox( groupBox );
- //new QLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
- new QLabel( i18n( "Interval in minutes:" ), intervalBox );
- d->mIntervalSpin = new QSpinBox( intervalBox );
+ TQHBox *intervalBox = new TQHBox( groupBox );
+ //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
+ new TQLabel( i18n( "Interval in minutes:" ), intervalBox );
+ d->mIntervalSpin = new TQSpinBox( intervalBox );
d->mIntervalSpin->setRange( 1, 900 );
d->mIntervalSpin->setEnabled( false );
- QRadioButton *delay =
- new QRadioButton(
+ TQRadioButton *delay =
+ new TQRadioButton(
// i18nc( "@option:radio save the cache after some delay",
// "Delayed after changes" ), groupBox );
i18n( "Delayed after changes" ), groupBox );
- QRadioButton *every =
- new QRadioButton(
+ TQRadioButton *every =
+ new TQRadioButton(
// i18nc( "@option:radio save the cache after every modification",
// "Immediately after changes" ), groupBox );
i18n( "Immediately after changes" ), groupBox );
@@ -211,7 +211,7 @@ CardDavSaveConfig::CardDavSaveConfig( QWidget *parent )
intervalBox->hide();
groupBox->setColumnLayout(1, Qt::Vertical);
- QVBoxLayout *vbox = new QVBoxLayout(groupBox->layout());
+ TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
vbox->addWidget(delay);
vbox->addWidget(every);
vbox->addWidget(intervalRadio);
diff --git a/kresources/carddav/configwidgets.h b/kresources/carddav/configwidgets.h
index 3cfd8a699..f50c58dd5 100644
--- a/kresources/carddav/configwidgets.h
+++ b/kresources/carddav/configwidgets.h
@@ -34,7 +34,7 @@
#ifndef KCARDDAV_AUTOWIDGETS_H
#define KCARDDAV_AUTOWIDGETS_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include <kdemacros.h>
namespace KABC {
@@ -50,7 +50,7 @@ class KDE_EXPORT CardDavReloadConfig : public QWidget
{
Q_OBJECT
public:
- explicit CardDavReloadConfig( QWidget *parent = 0 );
+ explicit CardDavReloadConfig( TQWidget *parent = 0 );
~CardDavReloadConfig();
public slots:
void loadSettings( ResourceCached *resource );
@@ -76,7 +76,7 @@ class KDE_EXPORT CardDavSaveConfig : public QWidget
{
Q_OBJECT
public:
- explicit CardDavSaveConfig( QWidget *parent = 0 );
+ explicit CardDavSaveConfig( TQWidget *parent = 0 );
~CardDavSaveConfig();
public slots:
diff --git a/kresources/carddav/job.cpp b/kresources/carddav/job.cpp
index ce5141f06..994964afb 100644
--- a/kresources/carddav/job.cpp
+++ b/kresources/carddav/job.cpp
@@ -17,7 +17,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qmutex.h>
+#include <tqmutex.h>
#define log(s) kdDebug() << s;
@@ -35,7 +35,7 @@ using namespace KABC;
| CONSTRUCTOR AND DESTRUCTOR
========================================================================*/
-CardDavJob::CardDavJob(const QString& url) : mUseURI(false) {
+CardDavJob::CardDavJob(const TQString& url) : mUseURI(false) {
cleanJob();
setUrl(url);
}
@@ -55,14 +55,14 @@ void CardDavJob::enableCarddavDebug(runtime_info* rt) {
}
}
-void CardDavJob::setErrorString(const QString& err, const long number) {
+void CardDavJob::setErrorString(const TQString& err, const long number) {
mError = true;
mErrorString = err;
mErrorNumber = number;
}
void CardDavJob::processError(const carddav_error* err) {
- QString error_string;
+ TQString error_string;
long code = err->code;
@@ -103,8 +103,8 @@ void CardDavJob::run() {
// Signal done
// 1000 is read, 1001 is write
- if (type() == 0) QApplication::postEvent ( parent(), new QEvent( static_cast<QEvent::Type>(1000) ) );
- if (type() == 1) QApplication::postEvent ( parent(), new QEvent( static_cast<QEvent::Type>(1001) ) );
+ if (type() == 0) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) );
+ if (type() == 1) TQApplication::postEvent ( parent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) );
}
// EOF ========================================================================
diff --git a/kresources/carddav/job.h b/kresources/carddav/job.h
index 79e12f828..75626abf3 100644
--- a/kresources/carddav/job.h
+++ b/kresources/carddav/job.h
@@ -16,10 +16,10 @@
#ifndef KABCDAV_JOB_H
#define KABCDAV_JOB_H
-#include <qthread.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qapplication.h>
+#include <tqthread.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
+#include <tqapplication.h>
extern "C" {
#include <libcarddav/carddav.h>
@@ -34,21 +34,21 @@ namespace KABC {
/**
* Calendar job.
*/
-class CardDavJob : public QThread {
+class CardDavJob : public TQThread {
public:
/**
* @param url URL to load.
*/
- CardDavJob(const QString& url = QString());
+ CardDavJob(const TQString& url = TQString());
virtual ~CardDavJob();
/**
* Sets a new URL to load.
*/
- virtual void setUrl(const QString& s) {
+ virtual void setUrl(const TQString& s) {
mUrl = s;
}
@@ -62,7 +62,7 @@ public:
/**
* Sets the parent qobject.
*/
- virtual void setParent(QObject *s) {
+ virtual void setParent(TQObject *s) {
mParent = s;
}
@@ -76,7 +76,7 @@ public:
/**
* @return URL to load.
*/
- virtual QString url() const {
+ virtual TQString url() const {
return mUrl;
}
@@ -90,7 +90,7 @@ public:
/**
* @return parent object
*/
- virtual QObject *parent() {
+ virtual TQObject *parent() {
return mParent;
}
@@ -111,7 +111,7 @@ public:
/**
* @return an error string.
*/
- virtual QString errorString() const {
+ virtual TQString errorString() const {
return mErrorString;
}
@@ -147,7 +147,7 @@ protected:
/**
* Sets an error string to @p err. Also sets an error flag.
*/
- void setErrorString(const QString& str, const long number);
+ void setErrorString(const TQString& str, const long number);
/**
* Process an error.
@@ -159,11 +159,11 @@ protected:
private:
- QString mUrl;
+ TQString mUrl;
bool mError;
- QString mErrorString;
+ TQString mErrorString;
long mErrorNumber;
- QObject *mParent;
+ TQObject *mParent;
int mType;
bool mUseURI;
diff --git a/kresources/carddav/preferences.cpp b/kresources/carddav/preferences.cpp
index e95041195..cf2cdbc5a 100644
--- a/kresources/carddav/preferences.cpp
+++ b/kresources/carddav/preferences.cpp
@@ -16,8 +16,8 @@
#include "preferences.h"
#include <kwallet.h>
-#include <qstring.h>
-#include <qurl.h>
+#include <tqstring.h>
+#include <tqurl.h>
#include <kdebug.h>
/*=========================================================================
@@ -31,15 +31,15 @@ using namespace KWallet;
| CONSTANTS
========================================================================*/
-const QString CardDavPrefs::NO_PASSWORD = "";
-const QString CardDavPrefs::WALLET_FOLDER = "CardDAV resource";
-const QString CardDavPrefs::WALLET_PWD_SUFFIX = ":carddav_password";
+const TQString CardDavPrefs::NO_PASSWORD = "";
+const TQString CardDavPrefs::WALLET_FOLDER = "CardDAV resource";
+const TQString CardDavPrefs::WALLET_PWD_SUFFIX = ":carddav_password";
/*=========================================================================
| METHODS
========================================================================*/
-bool CardDavPrefs::setWalletFolder(const QString& folder) {
+bool CardDavPrefs::setWalletFolder(const TQString& folder) {
bool ret = true;
if (!mNoWallet && NULL != mWallet) {
@@ -97,7 +97,7 @@ void CardDavPrefs::removeWallet(bool noWallet) {
mNoWallet = noWallet;
}
-void CardDavPrefs::addPrefix(const QString& prefix) {
+void CardDavPrefs::addPrefix(const TQString& prefix) {
KConfigSkeletonItem::List itemList = items();
KConfigSkeletonItem::List::Iterator it;
@@ -106,7 +106,7 @@ void CardDavPrefs::addPrefix(const QString& prefix) {
}
}
-bool CardDavPrefs::writePasswordToWallet(const QString& password) {
+bool CardDavPrefs::writePasswordToWallet(const TQString& password) {
Wallet* w = getWallet();
@@ -123,12 +123,12 @@ bool CardDavPrefs::writePasswordToWallet(const QString& password) {
return ret;
}
-bool CardDavPrefs::readPasswordFromWallet(QString& password) {
+bool CardDavPrefs::readPasswordFromWallet(TQString& password) {
Wallet* w = getWallet();
bool ret = false;
if (NULL != w) {
- QString p;
+ TQString p;
int rc = w->readPassword(mPrefix + WALLET_PWD_SUFFIX, p);
if (0 == rc) {
//CardDavPrefsSkel::setPassword(p);
@@ -160,7 +160,7 @@ bool CardDavPrefs::removePasswordFromWallet() {
return ret;
}
-void CardDavPrefs::setPassword(const QString& p) {
+void CardDavPrefs::setPassword(const TQString& p) {
mPassword = p;
@@ -169,14 +169,14 @@ void CardDavPrefs::setPassword(const QString& p) {
}
}
-QString CardDavPrefs::password() {
+TQString CardDavPrefs::password() {
if (NO_PASSWORD == mPassword) {
readPasswordFromWallet(mPassword);
}
return mPassword;
}
-QString CardDavPrefs::getusername() {
+TQString CardDavPrefs::getusername() {
return username();
}
@@ -210,10 +210,10 @@ bool CardDavPrefs::getUseURI() {
return useURI();
}
-QString CardDavPrefs::getFullUrl() {
+TQString CardDavPrefs::getFullUrl() {
- QUrl t(url());
- QString safeURL;
+ TQUrl t(url());
+ TQString safeURL;
int firstAt;
t.setUser(username());
diff --git a/kresources/carddav/preferences.h b/kresources/carddav/preferences.h
index 6035efe2d..a01ee041b 100644
--- a/kresources/carddav/preferences.h
+++ b/kresources/carddav/preferences.h
@@ -43,7 +43,7 @@ public:
/**
* @param prefix Unique prefix of the resource instance (use identifier() method).
*/
- CardDavPrefs(const QString& prefix)
+ CardDavPrefs(const TQString& prefix)
: mWallet(NULL)
, mNoWallet(false)
, mPrefix(prefix)
@@ -66,25 +66,25 @@ public:
* to be properly saved, call this method after ensuring the remember flag
* is set.
*/
- void setPassword(const QString& p);
+ void setPassword(const TQString& p);
/**
* Returns password. The password is taken from the wallet.
* May return an empty string, if there is no password available.
*/
- QString password();
+ TQString password();
/**
* Returns the username.
*/
- QString getusername();
+ TQString getusername();
void setRememberPassword(bool v);
/**
* @return A full URL to connect to CardDAV server (including username and password).
*/
- QString getFullUrl();
+ TQString getFullUrl();
bool getUseURI();
@@ -95,7 +95,7 @@ protected:
* can use the same config file.
* @param prefix Unique prefix of the resource instance.
*/
- void addPrefix(const QString& prefix);
+ void addPrefix(const TQString& prefix);
/**
* Returns the wallet or NULL, if the wallet can't be obtained.
@@ -107,7 +107,7 @@ protected:
* @param folder the wallet working folder
* @return true, if the folder has been set, and false otherwise.
*/
- bool setWalletFolder(const QString& folder);
+ bool setWalletFolder(const TQString& folder);
/**
* Removes the wallet. If @p noWallet is set, the wallet has been marked inaccessible, so that subsequent
@@ -120,14 +120,14 @@ protected:
* @param password password to write
* @return true on success, false on failure
*/
- bool writePasswordToWallet(const QString& password);
+ bool writePasswordToWallet(const TQString& password);
/**
* Extracts password from the wallet.
* @param password a variable to save read password to.
* @return true on success, false on failure
*/
- bool readPasswordFromWallet(QString& password);
+ bool readPasswordFromWallet(TQString& password);
/**
* Clears password in the wallet.
@@ -137,15 +137,15 @@ protected:
private:
- static const QString NO_PASSWORD;
- static const QString WALLET_FOLDER;
- static const QString WALLET_PWD_SUFFIX;
+ static const TQString NO_PASSWORD;
+ static const TQString WALLET_FOLDER;
+ static const TQString WALLET_PWD_SUFFIX;
KWallet::Wallet* mWallet;
bool mNoWallet;
- QString mPrefix;
- QString mPassword;
+ TQString mPrefix;
+ TQString mPassword;
};
} // namespace KABC
diff --git a/kresources/carddav/reader.h b/kresources/carddav/reader.h
index f4c1eb84d..181d4eb6a 100644
--- a/kresources/carddav/reader.h
+++ b/kresources/carddav/reader.h
@@ -18,8 +18,8 @@
#include "job.h"
-#include <qstring.h>
-#include <qdatetime.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
namespace KABC {
@@ -37,7 +37,7 @@ public:
/**
* @param url URL to load.
*/
- CardDavReader(const QString& url = QString()) :
+ CardDavReader(const TQString& url = TQString()) :
CardDavJob(url)
, mGetAll(true)
{
@@ -48,7 +48,7 @@ public:
* This method call disables the effect of setGetAll() call.
* setGetAll() call disables the effect of this method.
*/
- void setRange(const QDateTime& start, const QDateTime& end) {
+ void setRange(const TQDateTime& start, const TQDateTime& end) {
mGetAll = false;
mTimeStart = start;
mTimeEnd = end;
@@ -66,7 +66,7 @@ public:
/**
* @return downloaded calendar data in iCal format.
*/
- QString data() const {
+ TQString data() const {
return mData;
}
@@ -78,10 +78,10 @@ protected:
private:
- QString mData;
+ TQString mData;
bool mGetAll;
- QDateTime mTimeStart;
- QDateTime mTimeEnd;
+ TQDateTime mTimeStart;
+ TQDateTime mTimeEnd;
};
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index f79d82235..315b6270d 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -15,10 +15,10 @@
#include <string.h>
-#include <qurl.h>
-#include <qmessagebox.h>
-#include <qapplication.h>
-#include <qeventloop.h>
+#include <tqurl.h>
+#include <tqmessagebox.h>
+#include <tqapplication.h>
+#include <tqeventloop.h>
#include <kabc/addressee.h>
#include <kabc/vcardconverter.h>
@@ -26,13 +26,13 @@
#include <klocale.h>
#include <kpassdlg.h>
-#include <qdatetime.h>
-#include <qmutex.h>
-#include <qthread.h>
-#include <qtimer.h>
+#include <tqdatetime.h>
+#include <tqmutex.h>
+#include <tqthread.h>
+#include <tqtimer.h>
#ifdef KCARDDAV_DEBUG
- #include <qfile.h>
+ #include <tqfile.h>
#endif
#include "resource.h"
@@ -105,7 +105,7 @@ ResourceCardDav::~ResourceCardDav() {
while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) {
readLockout = true;
sleep(1);
- qApp->processEvents(QEventLoop::ExcludeUserInput);
+ qApp->processEvents(TQEventLoop::ExcludeUserInput);
}
if (mWriter) {
@@ -144,7 +144,7 @@ bool ResourceCardDav::load() {
return true; // Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them!
}
- log(QString("doLoad(%1)").arg(syncCache));
+ log(TQString("doLoad(%1)").arg(syncCache));
// FIXME KABC
//clearCache();
@@ -166,7 +166,7 @@ bool ResourceCardDav::load() {
bool ResourceCardDav::doSave() {
bool syncCache = true;
- log(QString("doSave(%1)").arg(syncCache));
+ log(TQString("doSave(%1)").arg(syncCache));
if (!hasChanges()) {
log("no changes");
@@ -194,7 +194,7 @@ bool ResourceCardDav::doSave() {
clearChanges();
if (mWriteRetryTimer != NULL) {
if (mWriteRetryTimer->isActive() == false) {
- disconnect( mWriteRetryTimer, SIGNAL(timeout()), this, SLOT(doSave()) );
+ disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) );
delete mWriteRetryTimer;
mWriteRetryTimer = NULL;
}
@@ -253,8 +253,8 @@ void ResourceCardDav::init() {
// creating jobs
// Qt4 handles this quite differently, as shown below,
// whereas Qt3 needs events (see ::event())
-// connect(mLoader, SIGNAL(finished()), this, SLOT(loadFinished()));
-// connect(mWriter, SIGNAL(finished()), this, SLOT(writingFinished()));
+// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
+// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
setType("ResourceCardDav");
}
@@ -338,14 +338,14 @@ void ResourceCardDav::loadingQueuePop() {
mLoader->setType(0);
mLoader->setUseURI(mPrefs->getUseURI());
- //QDateTime dt(QDate::currentDate());
+ //TQDateTime dt(TQDate::currentDate());
//mLoader->setRange(dt.addDays(-CACHE_DAYS), dt.addDays(CACHE_DAYS));
//mLoader->setGetAll();
mLoadingQueueReady = false;
log("starting actual download job");
- mLoader->start(QThread::LowestPriority);
+ mLoader->start(TQThread::LowestPriority);
// if all ok, removing the task from the queue
mLoadingQueue.dequeue();
@@ -354,7 +354,7 @@ void ResourceCardDav::loadingQueuePop() {
delete t;
}
-void ResourceCardDav::startLoading(const QString& url) {
+void ResourceCardDav::startLoading(const TQString& url) {
LoadingTask *t = new LoadingTask;
t->url = url;
loadingQueuePush(t);
@@ -373,29 +373,29 @@ void ResourceCardDav::loadFinished() {
if (loader->error()) {
if (loader->errorNumber() == -401) {
if (NULL != mPrefs) {
- QCString newpass;
- if (KPasswordDialog::getPassword (newpass, QString("<b>") + i18n("Remote authorization required") + QString("</b><p>") + i18n("Please input the password for") + QString(" ") + mPrefs->getusername(), NULL) != 1) {
+ TQCString newpass;
+ if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
log("load error: " + loader->errorString() );
- addressBook()->error(QString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
else {
// Set new password and try again
- mPrefs->setPassword(QString(newpass));
+ mPrefs->setPassword(TQString(newpass));
startLoading(mPrefs->getFullUrl());
}
}
else {
log("load error: " + loader->errorString() );
- addressBook()->error(QString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
}
else {
log("load error: " + loader->errorString() );
- addressBook()->error(QString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
}
} else {
log("successful load");
- QString data = loader->data();
+ TQString data = loader->data();
if (!data.isNull() && !data.isEmpty()) {
data.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
@@ -422,7 +422,7 @@ void ResourceCardDav::loadFinished() {
loadingQueuePop();
}
-bool ResourceCardDav::checkData(const QString& data) {
+bool ResourceCardDav::checkData(const TQString& data) {
log("checking the data");
KABC::VCardConverter converter;
@@ -436,7 +436,7 @@ bool ResourceCardDav::checkData(const QString& data) {
return ret;
}
-bool ResourceCardDav::parseData(const QString& data) {
+bool ResourceCardDav::parseData(const TQString& data) {
log("parseData()");
bool ret = true;
@@ -471,11 +471,11 @@ bool ResourceCardDav::parseData(const QString& data) {
// debug code here -------------------------------------------------------
#ifdef KCARDDAV_DEBUG
- const QString fout_path = "/tmp/kcarddav_download_" + identifier() + ".tmp";
+ const TQString fout_path = "/tmp/kcarddav_download_" + identifier() + ".tmp";
- QFile fout(fout_path);
+ TQFile fout(fout_path);
if (fout.open(IO_WriteOnly | IO_Append)) {
- QTextStream sout(&fout);
+ TQTextStream sout(&fout);
sout << "---------- " << resourceName() << ": --------------------------------\n";
sout << data << "\n";
fout.close();
@@ -553,11 +553,11 @@ void ResourceCardDav::writingQueuePop() {
mWriter->setUseURI(mPrefs->getUseURI());
#ifdef KCARDDAV_DEBUG
- const QString fout_path = "/tmp/kcarddav_upload_" + identifier() + ".tmp";
+ const TQString fout_path = "/tmp/kcarddav_upload_" + identifier() + ".tmp";
- QFile fout(fout_path);
+ TQFile fout(fout_path);
if (fout.open(IO_WriteOnly | IO_Append)) {
- QTextStream sout(&fout);
+ TQTextStream sout(&fout);
sout << "---------- " << resourceName() << ": --------------------------------\n";
sout << "================== Added:\n" << t->added << "\n";
sout << "================== Changed:\n" << t->changed << "\n";
@@ -575,7 +575,7 @@ void ResourceCardDav::writingQueuePop() {
mWritingQueueReady = false;
log("starting actual write job");
- mWriter->start(QThread::LowestPriority);
+ mWriter->start(TQThread::LowestPriority);
// if all ok, remove the task from the queue
mWritingQueue.dequeue();
@@ -584,7 +584,7 @@ void ResourceCardDav::writingQueuePop() {
delete t;
}
-bool ResourceCardDav::event ( QEvent * e ) {
+bool ResourceCardDav::event ( TQEvent * e ) {
if (e->type() == 1000) {
// Read done
loadFinished();
@@ -598,7 +598,7 @@ bool ResourceCardDav::event ( QEvent * e ) {
else return FALSE;
}
-bool ResourceCardDav::startWriting(const QString& url) {
+bool ResourceCardDav::startWriting(const TQString& url) {
log("startWriting: url = " + url);
WritingTask *t = new WritingTask;
@@ -609,8 +609,8 @@ bool ResourceCardDav::startWriting(const QString& url) {
// Before these calls are made any existing read (and maybe write) threads should be finished
if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) {
if (mWriteRetryTimer == NULL) {
- mWriteRetryTimer = new QTimer(this);
- connect( mWriteRetryTimer, SIGNAL(timeout()), SLOT(doSave()) );
+ mWriteRetryTimer = new TQTimer(this);
+ connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) );
}
mWriteRetryTimer->start(1000, TRUE);
return false;
@@ -642,25 +642,25 @@ void ResourceCardDav::writingFinished() {
if (mWriter->error() && (abs(mWriter->errorNumber()) != 207)) {
if (mWriter->errorNumber() == -401) {
if (NULL != mPrefs) {
- QCString newpass;
- if (KPasswordDialog::getPassword (newpass, QString("<b>") + i18n("Remote authorization required") + QString("</b><p>") + i18n("Please input the password for") + QString(" ") + mPrefs->getusername(), NULL) != 1) {
+ TQCString newpass;
+ if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
log("write error: " + mWriter->errorString());
- addressBook()->error(QString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
else {
// Set new password and try again
- mPrefs->setPassword(QString(newpass));
+ mPrefs->setPassword(TQString(newpass));
startWriting(mPrefs->getFullUrl());
}
}
else {
log("write error: " + mWriter->errorString());
- addressBook()->error(QString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
}
else {
log("write error: " + mWriter->errorString());
- addressBook()->error(QString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
+ addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
}
} else {
log("success");
diff --git a/kresources/carddav/resource.h b/kresources/carddav/resource.h
index d855f6529..b23008132 100644
--- a/kresources/carddav/resource.h
+++ b/kresources/carddav/resource.h
@@ -17,8 +17,8 @@
#define KABC_RESOURCECARDDAV_H
#include "preferences.h"
-#include <qthread.h>
-#include <qptrqueue.h>
+#include <tqthread.h>
+#include <tqptrqueue.h>
#include <kabcresourcecached.h>
#include <libkdepim/progressmanager.h>
@@ -84,14 +84,14 @@ protected slots:
protected:
struct LoadingTask {
- QString url;
+ TQString url;
};
struct WritingTask {
- QString url;
- QString added;
- QString changed;
- QString deleted;
+ TQString url;
+ TQString added;
+ TQString changed;
+ TQString deleted;
};
@@ -126,28 +126,28 @@ protected:
* Initiates calendar loading process.
* @param url URL to load calendar data from.
*/
- void startLoading(const QString& url);
+ void startLoading(const TQString& url);
/**
* Checks if the data is correct and can be parsed.
* @param data ical string to check.
* @return true if the data is correct, false otherwise.
*/
- bool checkData(const QString& data);
+ bool checkData(const TQString& data);
/**
* Parses the data and adds events to the calendar.
* @param data calendar data.
* @return true on success, false on fail.
*/
- bool parseData(const QString& data);
+ bool parseData(const TQString& data);
/**
* Initiates calendar writing process.
* @param url URL to save calendar data to.
* @return true if write was queued successfully, false if not
*/
- bool startWriting(const QString& url);
+ bool startWriting(const TQString& url);
/**
* Ensures incidences' read-only states are the same as the calendar's read-only state.
@@ -178,7 +178,7 @@ protected:
*/
void writingQueuePush(const WritingTask *task);
- virtual bool event ( QEvent * e );
+ virtual bool event ( TQEvent * e );
private:
@@ -209,12 +209,12 @@ private:
KPIM::ProgressItem *mProgress;
bool mLoadingQueueReady;
- QPtrQueue<LoadingTask> mLoadingQueue;
+ TQPtrQueue<LoadingTask> mLoadingQueue;
bool mWritingQueueReady;
- QPtrQueue<WritingTask> mWritingQueue;
+ TQPtrQueue<WritingTask> mWritingQueue;
- QTimer *mWriteRetryTimer;
+ TQTimer *mWriteRetryTimer;
};
diff --git a/kresources/carddav/writer.h b/kresources/carddav/writer.h
index c35e185a8..4af3fe36b 100644
--- a/kresources/carddav/writer.h
+++ b/kresources/carddav/writer.h
@@ -19,8 +19,8 @@
#include "job.h"
#include <string>
-#include <qstring.h>
-#include <qdatetime.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
namespace KABC {
@@ -38,7 +38,7 @@ public:
/**
* @param url URL to load.
*/
- CardDavWriter(const QString& url = QString()) :
+ CardDavWriter(const TQString& url = TQString()) :
CardDavJob(url)
{
clearObjects();
@@ -49,7 +49,7 @@ public:
* @param s icalendar-formatted string consists of all added incidences plus necessary calendar info.
* May be an empty string, which means there is no added incidences to send.
*/
- void setAddedObjects(const QString& s) {
+ void setAddedObjects(const TQString& s) {
mAdded = s;
}
@@ -58,7 +58,7 @@ public:
* @param s icalendar-formatted string consists of all changed incidences plus necessary calendar info.
* May be an empty string, which means there is no changed incidences to send.
*/
- void setChangedObjects(const QString& s) {
+ void setChangedObjects(const TQString& s) {
mChanged = s;
}
@@ -67,7 +67,7 @@ public:
* @param s icalendar-formatted string consists of all deleted incidences plus necessary calendar info.
* May be an empty string, which means there is no deleted incidences to send.
*/
- void setDeletedObjects(const QString& s) {
+ void setDeletedObjects(const TQString& s) {
mDeleted = s;
}
@@ -88,7 +88,7 @@ protected:
/// Just a wrapper above libcaldav functions.
template<typename Operation>
- int pushObjects(const QString& data, Operation op, int okCode, runtime_info* RT) {
+ int pushObjects(const TQString& data, Operation op, int okCode, runtime_info* RT) {
int r = okCode;
if (!data.isNull() && !data.isEmpty()) {
r = op(std::string(data.ascii()).c_str(), std::string(url().ascii()).c_str(), RT);
@@ -98,9 +98,9 @@ protected:
private:
- QString mAdded;
- QString mChanged;
- QString mDeleted;
+ TQString mAdded;
+ TQString mChanged;
+ TQString mDeleted;
};
} // namespace KABC
diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp
index 117db3243..9d45dab75 100644
--- a/kresources/egroupware/debugdialog.cpp
+++ b/kresources/egroupware/debugdialog.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
-#include <qfiledialog.h>
-#include <qlayout.h>
+#include <tqfile.h>
+#include <tqfiledialog.h>
+#include <tqlayout.h>
#include <ktextbrowser.h>
#include <kstaticdeleter.h>
@@ -37,8 +37,8 @@ DebugDialog::DebugDialog()
"Debug Dialog", false, i18n("Debug Dialog"),
User1 | User2 | Ok, Ok, true )
{
- QWidget *page = plainPage();
- QVBoxLayout *layout = new QVBoxLayout( page, marginHint(), spacingHint() );
+ TQWidget *page = plainPage();
+ TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
mView = new KTextBrowser( page );
layout->addWidget( mView );
@@ -68,7 +68,7 @@ DebugDialog::~DebugDialog()
mSelf = 0;
}
-void DebugDialog::addMessage( const QString &msg, Type type )
+void DebugDialog::addMessage( const TQString &msg, Type type )
{
if ( mSelf )
mSelf->addText( msg, type );
@@ -82,11 +82,11 @@ void DebugDialog::clear()
void DebugDialog::save()
{
- QString fileName = QFileDialog::getSaveFileName();
+ TQString fileName = TQFileDialog::getSaveFileName();
if ( fileName.isEmpty() )
return;
- QFile file( fileName );
+ TQFile file( fileName );
if ( !file.open( IO_WriteOnly ) ) {
qWarning( "Couldn't open file %s", file.name().latin1() );
return;
@@ -106,9 +106,9 @@ void DebugDialog::slotUser2()
clear();
}
-void DebugDialog::addText( const QString &text, Type type )
+void DebugDialog::addText( const TQString &text, Type type )
{
- QString htmlCode( text );
+ TQString htmlCode( text );
htmlCode.replace( "<", "&lt;" );
htmlCode.replace( ">", "&gt;" );
htmlCode.replace( "\n", "<br>" );
diff --git a/kresources/egroupware/debugdialog.h b/kresources/egroupware/debugdialog.h
index c5f91377f..c28987711 100644
--- a/kresources/egroupware/debugdialog.h
+++ b/kresources/egroupware/debugdialog.h
@@ -53,7 +53,7 @@ class DebugDialog : public KDialogBase
/**
Adds a message, which will be shown by the dialog.
*/
- static void addMessage( const QString &msg, Type type );
+ static void addMessage( const TQString &msg, Type type );
private slots:
void clear();
@@ -67,10 +67,10 @@ class DebugDialog : public KDialogBase
DebugDialog();
static DebugDialog *mSelf;
- void addText( const QString&, Type );
+ void addText( const TQString&, Type );
- QStringList mMessages;
- QStringList mHTMLMessages;
+ TQStringList mMessages;
+ TQStringList mHTMLMessages;
KTextBrowser *mView;
};
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp
index eba630cc3..ee1e74bea 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
+#include <tqapplication.h>
#include <kabc/addressee.h>
#include <kabprefs.h>
@@ -41,15 +41,15 @@
using namespace KABC;
-static const QString SearchContactsCommand = "addressbook.boaddressbook.search";
-static const QString AddContactCommand = "addressbook.boaddressbook.write";
-static const QString DeleteContactCommand = "addressbook.boaddressbook.delete";
-static const QString LoadCategoriesCommand = "addressbook.boaddressbook.categories";
-static const QString LoadCustomFieldsCommand = "addressbook.boaddressbook.customfields";
+static const TQString SearchContactsCommand = "addressbook.boaddressbook.search";
+static const TQString AddContactCommand = "addressbook.boaddressbook.write";
+static const TQString DeleteContactCommand = "addressbook.boaddressbook.delete";
+static const TQString LoadCategoriesCommand = "addressbook.boaddressbook.categories";
+static const TQString LoadCustomFieldsCommand = "addressbook.boaddressbook.customfields";
static void setRights( KABC::Addressee &addr, int rights )
{
- addr.insertCustom( "EGWRESOURCE", "RIGHTS", QString::number( rights ) );
+ addr.insertCustom( "EGWRESOURCE", "RIGHTS", TQString::number( rights ) );
}
static int rights( const KABC::Addressee &addr )
@@ -70,8 +70,8 @@ ResourceXMLRPC::ResourceXMLRPC( const KConfig *config )
initEGroupware();
}
-ResourceXMLRPC::ResourceXMLRPC( const QString &url, const QString &domain,
- const QString &user, const QString &password )
+ResourceXMLRPC::ResourceXMLRPC( const TQString &url, const TQString &domain,
+ const TQString &user, const TQString &password )
: ResourceCached( 0 ), mServer( 0 )
{
init();
@@ -150,14 +150,14 @@ bool ResourceXMLRPC::doOpen()
mServer->setUrl( KURL( mPrefs->url() ) );
mServer->setUserAgent( "KDE-AddressBook" );
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
args.insert( "domain", mPrefs->domain() );
args.insert( "username", mPrefs->user() );
args.insert( "password", mPrefs->password() );
- mServer->call( "system.login", QVariant( args ),
- this, SLOT( loginFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( "system.login", TQVariant( args ),
+ this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -166,13 +166,13 @@ bool ResourceXMLRPC::doOpen()
void ResourceXMLRPC::doClose()
{
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
args.insert( "sessionid", mSessionID );
args.insert( "kp3", mKp3 );
- mServer->call( "system.logout", QVariant( args ),
- this, SLOT( logoutFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( "system.logout", TQVariant( args ),
+ this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
}
@@ -193,7 +193,7 @@ bool ResourceXMLRPC::asyncLoad()
loadCache();
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
args.insert( "start", "0" );
args.insert( "query", "" );
args.insert( "filter", "" );
@@ -202,16 +202,16 @@ bool ResourceXMLRPC::asyncLoad()
args.insert( "include_users", "calendar" );
mServer->call( SearchContactsCommand, args,
- this, SLOT( listContactsFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ this, TQT_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
- mServer->call( LoadCategoriesCommand, QVariant( false, 0 ),
- this, SLOT( loadCategoriesFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( LoadCategoriesCommand, TQVariant( false, 0 ),
+ this, TQT_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
- mServer->call( LoadCustomFieldsCommand, QVariant( QValueList<QVariant>() ),
- this, SLOT( loadCustomFieldsFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( LoadCustomFieldsCommand, TQVariant( TQValueList<TQVariant>() ),
+ this, TQT_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
return true;
}
@@ -246,13 +246,13 @@ bool ResourceXMLRPC::asyncSave( Ticket* )
void ResourceXMLRPC::addContact( const Addressee& addr )
{
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
writeContact( addr, args );
mServer->call( AddContactCommand, args,
- this, SLOT( addContactFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( addContactFault( int, const QString&, const QVariant& ) ),
- QVariant( addr.uid() ) );
+ this, TQT_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ),
+ TQVariant( addr.uid() ) );
}
void ResourceXMLRPC::updateContact( const Addressee& addr )
@@ -262,14 +262,14 @@ void ResourceXMLRPC::updateContact( const Addressee& addr )
return;
}
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
writeContact( addr, args );
args.insert( "id", idMapper().remoteId( addr.uid() ) );
mServer->call( AddContactCommand, args,
- this, SLOT( updateContactFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( updateContactFault( int, const QString&, const QVariant& ) ),
- QVariant( addr.uid() ) );
+ this, TQT_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ),
+ TQVariant( addr.uid() ) );
}
void ResourceXMLRPC::deleteContact( const Addressee& addr )
@@ -281,15 +281,15 @@ void ResourceXMLRPC::deleteContact( const Addressee& addr )
}
mServer->call( DeleteContactCommand, idMapper().remoteId( addr.uid() ),
- this, SLOT( deleteContactFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( deleteContactFault( int, const QString&, const QVariant& ) ),
- QVariant( addr.uid() ) );
+ this, TQT_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ),
+ TQVariant( addr.uid() ) );
}
-void ResourceXMLRPC::loginFinished( const QValueList<QVariant> &variant,
- const QVariant& )
+void ResourceXMLRPC::loginFinished( const TQValueList<TQVariant> &variant,
+ const TQVariant& )
{
- QMap<QString, QVariant> map = variant[0].toMap();
+ TQMap<TQString, TQVariant> map = variant[0].toMap();
KURL url( mPrefs->url() );
if ( map[ "GOAWAY" ].toString() == "XOXO" ) { // failed
@@ -307,10 +307,10 @@ void ResourceXMLRPC::loginFinished( const QValueList<QVariant> &variant,
mSynchronizer->stop();
}
-void ResourceXMLRPC::logoutFinished( const QValueList<QVariant> &variant,
- const QVariant& )
+void ResourceXMLRPC::logoutFinished( const TQValueList<TQVariant> &variant,
+ const TQVariant& )
{
- QMap<QString, QVariant> map = variant[0].toMap();
+ TQMap<TQString, TQVariant> map = variant[0].toMap();
if ( map[ "GOODBYE" ].toString() != "XOXO" )
addressBook()->error( i18n( "Logout failed, please check your username and password." ) );
@@ -324,18 +324,18 @@ void ResourceXMLRPC::logoutFinished( const QValueList<QVariant> &variant,
mSynchronizer->stop();
}
-void ResourceXMLRPC::listContactsFinished( const QValueList<QVariant> &mapList,
- const QVariant& )
+void ResourceXMLRPC::listContactsFinished( const TQValueList<TQVariant> &mapList,
+ const TQVariant& )
{
- const QValueList<QVariant> contactList = mapList[ 0 ].toList();
- QValueList<QVariant>::ConstIterator contactIt;
+ const TQValueList<TQVariant> contactList = mapList[ 0 ].toList();
+ TQValueList<TQVariant>::ConstIterator contactIt;
KABC::Addressee::List serverContacts;
for ( contactIt = contactList.begin(); contactIt != contactList.end(); ++contactIt ) {
- const QMap<QString, QVariant> map = (*contactIt).toMap();
+ const TQMap<TQString, TQVariant> map = (*contactIt).toMap();
Addressee addr;
- QString uid;
+ TQString uid;
readContact( map, addr, uid );
@@ -343,7 +343,7 @@ void ResourceXMLRPC::listContactsFinished( const QValueList<QVariant> &mapList,
addr.setResource( this );
addr.setChanged( false );
- QString local = idMapper().localId( uid );
+ TQString local = idMapper().localId( uid );
if ( local.isEmpty() ) { // new entry
idMapper().setRemoteId( addr.uid(), uid );
} else {
@@ -361,8 +361,8 @@ void ResourceXMLRPC::listContactsFinished( const QValueList<QVariant> &mapList,
emit loadingFinished( this );
}
-void ResourceXMLRPC::addContactFinished( const QValueList<QVariant> &list,
- const QVariant &id )
+void ResourceXMLRPC::addContactFinished( const TQValueList<TQVariant> &list,
+ const TQVariant &id )
{
clearChange( id.toString() );
idMapper().setRemoteId( id.toString(), list[ 0 ].toString() );
@@ -370,16 +370,16 @@ void ResourceXMLRPC::addContactFinished( const QValueList<QVariant> &list,
saveCache();
}
-void ResourceXMLRPC::updateContactFinished( const QValueList<QVariant>&,
- const QVariant &id )
+void ResourceXMLRPC::updateContactFinished( const TQValueList<TQVariant>&,
+ const TQVariant &id )
{
clearChange( id.toString() );
saveCache();
}
-void ResourceXMLRPC::deleteContactFinished( const QValueList<QVariant>&,
- const QVariant &id )
+void ResourceXMLRPC::deleteContactFinished( const TQValueList<TQVariant>&,
+ const TQVariant &id )
{
clearChange( id.toString() );
idMapper().removeRemoteId( idMapper().remoteId( id.toString() ) );
@@ -387,38 +387,38 @@ void ResourceXMLRPC::deleteContactFinished( const QValueList<QVariant>&,
saveCache();
}
-void ResourceXMLRPC::fault( int error, const QString &errorMsg,
- const QVariant& )
+void ResourceXMLRPC::fault( int error, const TQString &errorMsg,
+ const TQVariant& )
{
- QString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).arg( error ).arg( errorMsg );
+ TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).arg( error ).arg( errorMsg );
if ( addressBook() )
addressBook()->error( msg );
mSynchronizer->stop();
}
-void ResourceXMLRPC::addContactFault( int, const QString &errorMsg,
- const QVariant &id )
+void ResourceXMLRPC::addContactFault( int, const TQString &errorMsg,
+ const TQVariant &id )
{
KABC::Addressee addr = mAddrMap[ id.toString() ];
mAddrMap.remove( addr.uid() );
- QString msg = i18n( "Unable to add contact %1 to server. (%2)" );
+ TQString msg = i18n( "Unable to add contact %1 to server. (%2)" );
addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
}
-void ResourceXMLRPC::updateContactFault( int, const QString &errorMsg,
- const QVariant &id )
+void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg,
+ const TQVariant &id )
{
KABC::Addressee addr = mAddrMap[ id.toString() ];
- QString msg = i18n( "Unable to update contact %1 on server. (%2)" );
+ TQString msg = i18n( "Unable to update contact %1 on server. (%2)" );
addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
}
-void ResourceXMLRPC::deleteContactFault( int, const QString &errorMsg,
- const QVariant &id )
+void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg,
+ const TQVariant &id )
{
KABC::Addressee addr;
@@ -433,14 +433,14 @@ void ResourceXMLRPC::deleteContactFault( int, const QString &errorMsg,
mAddrMap.insert( addr.uid(), addr );
- QString msg = i18n( "Unable to delete contact %1 from server. (%2)" );
+ TQString msg = i18n( "Unable to delete contact %1 from server. (%2)" );
addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
}
-QString ResourceXMLRPC::addrTypesToTypeStr( int typeMask )
+TQString ResourceXMLRPC::addrTypesToTypeStr( int typeMask )
{
- QStringList types;
- QMap<QString, int>::ConstIterator it;
+ TQStringList types;
+ TQMap<TQString, int>::ConstIterator it;
for ( it = mAddrTypes.begin(); it != mAddrTypes.end(); ++it )
if ( it.data() & typeMask )
types.append( it.key() );
@@ -448,7 +448,7 @@ QString ResourceXMLRPC::addrTypesToTypeStr( int typeMask )
return types.join( ";" );
}
-void ResourceXMLRPC::writeContact( const Addressee &addr, QMap<QString, QVariant> &args )
+void ResourceXMLRPC::writeContact( const Addressee &addr, TQMap<TQString, TQVariant> &args )
{
args.insert( "access", ( addr.secrecy().type() == Secrecy::Private ? "private" : "public" ) );
args.insert( "fn", addr.formattedName() );
@@ -470,17 +470,17 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, QMap<QString, QVariant
args.insert( "title", addr.title() );
// CATEGORIES
- QStringList::ConstIterator catIt;
- const QStringList categories = addr.categories();
+ TQStringList::ConstIterator catIt;
+ const TQStringList categories = addr.categories();
- QMap<QString, QVariant> catMap;
+ TQMap<TQString, TQVariant> catMap;
int counter = 0;
for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
- QMap<QString, int>::ConstIterator it = mCategoryMap.find( *catIt );
+ TQMap<TQString, int>::ConstIterator it = mCategoryMap.find( *catIt );
if ( it == mCategoryMap.end() ) // new category
- catMap.insert( QString::number( counter-- ), *catIt );
+ catMap.insert( TQString::number( counter-- ), *catIt );
else
- catMap.insert( QString::number( it.data() ), *catIt );
+ catMap.insert( TQString::number( it.data() ), *catIt );
}
args.insert( "cat_id", catMap );
@@ -569,15 +569,15 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, QMap<QString, QVariant
}
- const QStringList customFields = addr.customs();
- QStringList::ConstIterator it;
+ const TQStringList customFields = addr.customs();
+ TQStringList::ConstIterator it;
for ( it = customFields.begin(); it != customFields.end(); ++it ) {
int colon = (*it).find( ":" );
- QString identifier = (*it).left( colon );
+ TQString identifier = (*it).left( colon );
int dash = identifier.find( "-" );
- QString app = identifier.left( dash );
- QString name = identifier.mid( dash + 1 );
- QString value = (*it).mid( colon + 1 );
+ TQString app = identifier.left( dash );
+ TQString name = identifier.mid( dash + 1 );
+ TQString value = (*it).mid( colon + 1 );
if ( value.isEmpty() )
continue;
@@ -585,16 +585,16 @@ void ResourceXMLRPC::writeContact( const Addressee &addr, QMap<QString, QVariant
args.insert( name, value );
}
- QString url = KCal::FreeBusyUrlStore::self()->readUrl( addr.preferredEmail() );
+ TQString url = KCal::FreeBusyUrlStore::self()->readUrl( addr.preferredEmail() );
if ( !url.isEmpty() )
args.insert( "freebusy_url", url );
}
-void ResourceXMLRPC::readContact( const QMap<QString, QVariant> &args, Addressee &addr, QString &uid )
+void ResourceXMLRPC::readContact( const TQMap<TQString, TQVariant> &args, Addressee &addr, TQString &uid )
{
Address addrOne, addrTwo;
- QMap<QString, QVariant>::ConstIterator it;
+ TQMap<TQString, TQVariant>::ConstIterator it;
for ( it = args.begin(); it != args.end(); ++it ) {
if ( it.key() == "id" ) {
uid = it.data().toString();
@@ -647,7 +647,7 @@ void ResourceXMLRPC::readContact( const QMap<QString, QVariant> &args, Addressee
} else if ( it.key() == "adr_one_countryname" ) {
addrOne.setCountry( it.data().toString() );
} else if ( it.key() == "adr_one_type" ) {
- QStringList types = QStringList::split( ';', it.data().toString() );
+ TQStringList types = TQStringList::split( ';', it.data().toString() );
int type = Address::Work;
for ( uint i = 0; i < types.count(); ++i )
@@ -667,7 +667,7 @@ void ResourceXMLRPC::readContact( const QMap<QString, QVariant> &args, Addressee
} else if ( it.key() == "adr_two_countryname" ) {
addrTwo.setCountry( it.data().toString() );
} else if ( it.key() == "adr_two_type" ) {
- QStringList types = QStringList::split( ';', it.data().toString() );
+ TQStringList types = TQStringList::split( ';', it.data().toString() );
int type = Address::Home;
for ( uint i = 0; i < types.count(); ++i )
@@ -707,8 +707,8 @@ void ResourceXMLRPC::readContact( const QMap<QString, QVariant> &args, Addressee
addr.insertEmail( it.data().toString(), false );
} else if ( it.key() == "email_home_type" ) {
} else if ( it.key() == "cat_id" ) {
- const QMap<QString, QVariant> categories = it.data().toMap();
- QMap<QString, QVariant>::ConstIterator it;
+ const TQMap<TQString, TQVariant> categories = it.data().toMap();
+ TQMap<TQString, TQVariant>::ConstIterator it;
for ( it = categories.begin(); it != categories.end(); ++it )
addr.insertCategory( it.data().toString() );
@@ -717,7 +717,7 @@ void ResourceXMLRPC::readContact( const QMap<QString, QVariant> &args, Addressee
}
}
- QMap<QString, QString>::ConstIterator cfIt;
+ TQMap<TQString, TQString>::ConstIterator cfIt;
for ( cfIt = mCustomFieldsMap.begin(); cfIt != mCustomFieldsMap.end(); ++cfIt ) {
if ( args[ cfIt.key() ].toString().isEmpty() )
continue;
@@ -736,19 +736,19 @@ void ResourceXMLRPC::readContact( const QMap<QString, QVariant> &args, Addressee
addr.insertAddress( addrTwo );
}
-void ResourceXMLRPC::loadCategoriesFinished( const QValueList<QVariant> &mapList,
- const QVariant& )
+void ResourceXMLRPC::loadCategoriesFinished( const TQValueList<TQVariant> &mapList,
+ const TQVariant& )
{
mCategoryMap.clear();
- const QMap<QString, QVariant> map = mapList[ 0 ].toMap();
- QMap<QString, QVariant>::ConstIterator it;
+ const TQMap<TQString, TQVariant> map = mapList[ 0 ].toMap();
+ TQMap<TQString, TQVariant>::ConstIterator it;
KABPrefs *prefs = KABPrefs::instance();
for ( it = map.begin(); it != map.end(); ++it ) {
mCategoryMap.insert( it.data().toString(), it.key().toInt() );
- QStringList categories = prefs->customCategories();
+ TQStringList categories = prefs->customCategories();
if ( categories.find( it.data().toString() ) == categories.end() )
categories.append( it.data().toString() );
@@ -756,13 +756,13 @@ void ResourceXMLRPC::loadCategoriesFinished( const QValueList<QVariant> &mapList
}
}
-void ResourceXMLRPC::loadCustomFieldsFinished( const QValueList<QVariant> &mapList,
- const QVariant& )
+void ResourceXMLRPC::loadCustomFieldsFinished( const TQValueList<TQVariant> &mapList,
+ const TQVariant& )
{
mCustomFieldsMap.clear();
- const QMap<QString, QVariant> map = mapList[ 0 ].toMap();
- QMap<QString, QVariant>::ConstIterator it;
+ const TQMap<TQString, TQVariant> map = mapList[ 0 ].toMap();
+ TQMap<TQString, TQVariant>::ConstIterator it;
for ( it = map.begin(); it != map.end(); ++it )
mCustomFieldsMap.insert( it.key(), it.data().toString() );
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/kresources/egroupware/kabc_resourcexmlrpc.h
index 57bbd903a..0ce56a038 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.h
+++ b/kresources/egroupware/kabc_resourcexmlrpc.h
@@ -21,7 +21,7 @@
#ifndef KABC_RESOURCEXMLRPC_H
#define KABC_RESOURCEXMLRPC_H
-#include <qmap.h>
+#include <tqmap.h>
#include <kdepimmacros.h>
#include "libkdepim/kabcresourcecached.h"
@@ -43,8 +43,8 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
public:
ResourceXMLRPC( const KConfig* );
- ResourceXMLRPC( const QString &url, const QString &domain,
- const QString &user, const QString &password );
+ ResourceXMLRPC( const TQString &url, const TQString &domain,
+ const TQString &user, const TQString &password );
~ResourceXMLRPC();
virtual void writeConfig( KConfig* );
@@ -66,20 +66,20 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
void init();
protected slots:
- void loginFinished( const QValueList<QVariant>&, const QVariant& );
- void logoutFinished( const QValueList<QVariant>&, const QVariant& );
+ void loginFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void logoutFinished( const TQValueList<TQVariant>&, const TQVariant& );
- void listContactsFinished( const QValueList<QVariant>&, const QVariant& );
- void addContactFinished( const QValueList<QVariant>&, const QVariant& );
- void updateContactFinished( const QValueList<QVariant>&, const QVariant& );
- void deleteContactFinished( const QValueList<QVariant>&, const QVariant& );
- void loadCategoriesFinished( const QValueList<QVariant>&, const QVariant& );
- void loadCustomFieldsFinished( const QValueList<QVariant>&, const QVariant& );
+ void listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void addContactFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& );
- void fault( int, const QString&, const QVariant& );
- void addContactFault( int, const QString&, const QVariant& );
- void updateContactFault( int, const QString&, const QVariant& );
- void deleteContactFault( int, const QString&, const QVariant& );
+ void fault( int, const TQString&, const TQVariant& );
+ void addContactFault( int, const TQString&, const TQVariant& );
+ void updateContactFault( int, const TQString&, const TQVariant& );
+ void deleteContactFault( int, const TQString&, const TQVariant& );
void addContact( const KABC::Addressee& );
void updateContact( const KABC::Addressee& );
@@ -88,19 +88,19 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
private:
void initEGroupware();
- QString addrTypesToTypeStr( int );
+ TQString addrTypesToTypeStr( int );
- void writeContact( const Addressee&, QMap<QString, QVariant>& );
- void readContact( const QMap<QString, QVariant>&, Addressee &addr, QString& );
+ void writeContact( const Addressee&, TQMap<TQString, TQVariant>& );
+ void readContact( const TQMap<TQString, TQVariant>&, Addressee &addr, TQString& );
EGroupwarePrefs *mPrefs;
- QString mSessionID;
- QString mKp3;
+ TQString mSessionID;
+ TQString mKp3;
- QMap<QString, int> mCategoryMap;
- QMap<QString, int> mAddrTypes;
- QMap<QString, QString> mCustomFieldsMap;
+ TQMap<TQString, int> mCategoryMap;
+ TQMap<TQString, int> mAddrTypes;
+ TQMap<TQString, TQString> mCustomFieldsMap;
KXMLRPC::Server *mServer;
Synchronizer *mSynchronizer;
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
index cd2075c71..02a2f1ad3 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <kdialog.h>
@@ -33,32 +33,32 @@
using namespace KABC;
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( QWidget* parent, const char* name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
- QGridLayout *mainLayout = new QGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "URL:" ), this );
+ TQLabel *label = new TQLabel( i18n( "URL:" ), this );
mURL = new KURLRequester( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mURL, 0, 1 );
- label = new QLabel( i18n( "Domain:" ), this );
+ label = new TQLabel( i18n( "Domain:" ), this );
mDomain = new KLineEdit( this );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mDomain, 1, 1 );
- label = new QLabel( i18n( "User:" ), this );
+ label = new TQLabel( i18n( "User:" ), this );
mUser = new KLineEdit( this );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mUser, 2, 1 );
- label = new QLabel( i18n( "Password:" ), this );
+ label = new TQLabel( i18n( "Password:" ), this );
mPassword = new KLineEdit( this );
- mPassword->setEchoMode( QLineEdit::Password );
+ mPassword->setEchoMode( TQLineEdit::Password );
mainLayout->addWidget( label, 3, 0 );
mainLayout->addWidget( mPassword, 3, 1 );
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.h b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
index 6e0ddfdb8..f73b2e0aa 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
@@ -34,7 +34,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceXMLRPCConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index af4f019c1..bb92b2d5f 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -22,11 +22,11 @@
#include <stdlib.h>
#include <typeinfo>
-#include <qapplication.h>
-#include <qdatetime.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <tqapplication.h>
+#include <tqdatetime.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
#include <kabc/locknull.h>
#include <kdebug.h>
@@ -83,19 +83,19 @@ typedef KRES::PluginFactory<ResourceXMLRPC, ResourceXMLRPCConfig> XMLRPCFactory;
K_EXPORT_COMPONENT_FACTORY( kcal_xmlrpc, XMLRPCFactory )
-static const QString SearchEventsCommand = "calendar.bocalendar.search";
-static const QString AddEventCommand = "calendar.bocalendar.write";
-static const QString DeleteEventCommand = "calendar.bocalendar.delete";
-static const QString LoadEventCategoriesCommand = "calendar.bocalendar.categories";
+static const TQString SearchEventsCommand = "calendar.bocalendar.search";
+static const TQString AddEventCommand = "calendar.bocalendar.write";
+static const TQString DeleteEventCommand = "calendar.bocalendar.delete";
+static const TQString LoadEventCategoriesCommand = "calendar.bocalendar.categories";
-static const QString SearchTodosCommand = "infolog.boinfolog.search";
-static const QString AddTodoCommand = "infolog.boinfolog.write";
-static const QString DeleteTodoCommand = "infolog.boinfolog.delete";
-static const QString LoadTodoCategoriesCommand = "infolog.boinfolog.categories";
+static const TQString SearchTodosCommand = "infolog.boinfolog.search";
+static const TQString AddTodoCommand = "infolog.boinfolog.write";
+static const TQString DeleteTodoCommand = "infolog.boinfolog.delete";
+static const TQString LoadTodoCategoriesCommand = "infolog.boinfolog.categories";
static void setRights( Incidence *incidence, int rights )
{
- incidence->setCustomProperty( "EGWRESOURCE", "RIGHTS", QString::number( rights ) );
+ incidence->setCustomProperty( "EGWRESOURCE", "RIGHTS", TQString::number( rights ) );
}
static int rights( Incidence *incidence )
@@ -188,14 +188,14 @@ bool ResourceXMLRPC::doOpen()
mServer->setUrl( KURL( mPrefs->url() ) );
mServer->setUserAgent( "KDE-Calendar" );
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
args.insert( "domain", mPrefs->domain() );
args.insert( "username", mPrefs->user() );
args.insert( "password", mPrefs->password() );
- mServer->call( "system.login", QVariant( args ),
- this, SLOT( loginFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( "system.login", TQVariant( args ),
+ this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -206,13 +206,13 @@ void ResourceXMLRPC::doClose()
{
kdDebug(5800) << "ResourceXMLRPC::doClose()" << endl;
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
args.insert( "sessionid", mSessionID );
args.insert( "kp3", mKp3 );
- mServer->call( "system.logout", QVariant( args ),
- this, SLOT( logoutFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( "system.logout", TQVariant( args ),
+ this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
}
@@ -235,13 +235,13 @@ bool ResourceXMLRPC::doLoad()
mTodoStateMapper.setIdentifier( type() + "_" + identifier() );
mTodoStateMapper.load();
- QMap<QString, QVariant> args, columns;
- args.insert( "start", QDateTime( QDate::currentDate().addDays( -12 ) ) );
- args.insert( "end", QDateTime( QDate::currentDate().addDays( 2000 ) ) );
+ TQMap<TQString, TQVariant> args, columns;
+ args.insert( "start", TQDateTime( TQDate::currentDate().addDays( -12 ) ) );
+ args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) );
mServer->call( SearchEventsCommand, args,
- this, SLOT( listEventsFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
args.clear();
columns.insert( "type", "task" );
@@ -250,16 +250,16 @@ bool ResourceXMLRPC::doLoad()
args.insert( "order", "id_parent" );
mServer->call( SearchTodosCommand, args,
- this, SLOT( listTodosFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
- mServer->call( LoadEventCategoriesCommand, QVariant( QMap<QString, QVariant>() ),
- this, SLOT( loadEventCategoriesFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( LoadEventCategoriesCommand, TQVariant( TQMap<TQString, TQVariant>() ),
+ this, TQT_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
- mServer->call( LoadTodoCategoriesCommand, QVariant( false, 0 ),
- this, SLOT( loadTodoCategoriesFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( LoadTodoCategoriesCommand, TQVariant( false, 0 ),
+ this, TQT_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
return true;
}
@@ -278,13 +278,13 @@ bool ResourceXMLRPC::doSave()
uint counter = 0;
for ( evIt = events.begin(); evIt != events.end(); ++evIt ) {
if ( !(*evIt)->isReadOnly() ) {
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
writeEvent( (*evIt), args );
args.insert( "id", idMapper().remoteId( (*evIt)->uid() ).toInt() );
- mServer->call( AddEventCommand, QVariant( args ),
- this, SLOT( updateEventFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( AddEventCommand, TQVariant( args ),
+ this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
counter++;
}
}
@@ -294,13 +294,13 @@ bool ResourceXMLRPC::doSave()
for ( todoIt = todos.begin(); todoIt != todos.end(); ++todoIt ) {
if ( !(*todoIt)->isReadOnly() ) {
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
writeTodo( (*todoIt), args );
args.insert( "id", idMapper().remoteId( (*todoIt)->uid() ).toInt() );
- mServer->call( AddTodoCommand, QVariant( args ),
- this, SLOT( updateTodoFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( AddTodoCommand, TQVariant( args ),
+ this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
counter++;
}
}
@@ -326,7 +326,7 @@ KABC::Lock *ResourceXMLRPC::lock()
bool ResourceXMLRPC::addEvent( Event* ev )
{
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
disableChangeNotification();
@@ -336,9 +336,9 @@ bool ResourceXMLRPC::addEvent( Event* ev )
if ( !oldEvent->isReadOnly() ) {
writeEvent( ev, args );
args.insert( "id", idMapper().remoteId( ev->uid() ).toInt() );
- mServer->call( AddEventCommand, QVariant( args ),
- this, SLOT( updateEventFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( AddEventCommand, TQVariant( args ),
+ this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mCalendar.deleteIncidence( oldEvent );
mCalendar.addIncidence( ev );
@@ -346,10 +346,10 @@ bool ResourceXMLRPC::addEvent( Event* ev )
}
} else { // new event
writeEvent( ev, args );
- mServer->call( AddEventCommand, QVariant( args ),
- this, SLOT( addEventFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ),
- QVariant( ev->uid() ) );
+ mServer->call( AddEventCommand, TQVariant( args ),
+ this, TQT_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ TQVariant( ev->uid() ) );
mCalendar.addEvent( ev );
saveCache();
@@ -366,20 +366,20 @@ bool ResourceXMLRPC::deleteEvent( Event* ev )
return false;
mServer->call( DeleteEventCommand, idMapper().remoteId( ev->uid() ).toInt(),
- this, SLOT( deleteEventFinished( const QValueList<QVariant>&,
- const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ),
- QVariant( ev->uid() ) );
+ this, TQT_SLOT( deleteEventFinished( const TQValueList<TQVariant>&,
+ const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ TQVariant( ev->uid() ) );
return true;
}
-Event *ResourceXMLRPC::event( const QString& uid )
+Event *ResourceXMLRPC::event( const TQString& uid )
{
return mCalendar.event( uid );
}
-Event::List ResourceXMLRPC::rawEventsForDate( const QDate& qd,
+Event::List ResourceXMLRPC::rawEventsForDate( const TQDate& qd,
EventSortField sortField,
SortDirection sortDirection )
{
@@ -387,13 +387,13 @@ Event::List ResourceXMLRPC::rawEventsForDate( const QDate& qd,
}
-Event::List ResourceXMLRPC::rawEvents( const QDate& start, const QDate& end,
+Event::List ResourceXMLRPC::rawEvents( const TQDate& start, const TQDate& end,
bool inclusive )
{
return mCalendar.rawEvents( start, end, inclusive );
}
-Event::List ResourceXMLRPC::rawEventsForDate( const QDateTime& qdt )
+Event::List ResourceXMLRPC::rawEventsForDate( const TQDateTime& qdt )
{
return mCalendar.rawEventsForDate( qdt.date() );
}
@@ -406,7 +406,7 @@ Event::List ResourceXMLRPC::rawEvents()
bool ResourceXMLRPC::addTodo( Todo *todo )
{
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
disableChangeNotification();
@@ -416,9 +416,9 @@ bool ResourceXMLRPC::addTodo( Todo *todo )
if ( !oldTodo->isReadOnly() ) {
writeTodo( todo, args );
args.insert( "id", idMapper().remoteId( todo->uid() ).toInt() );
- mServer->call( AddTodoCommand, QVariant( args ),
- this, SLOT( updateTodoFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( AddTodoCommand, TQVariant( args ),
+ this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mCalendar.deleteIncidence( oldTodo );
mCalendar.addIncidence( todo );
@@ -426,10 +426,10 @@ bool ResourceXMLRPC::addTodo( Todo *todo )
}
} else { // new todo
writeTodo( todo, args );
- mServer->call( AddTodoCommand, QVariant( args ),
- this, SLOT( addTodoFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ),
- QVariant( todo->uid() ) );
+ mServer->call( AddTodoCommand, TQVariant( args ),
+ this, TQT_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ TQVariant( todo->uid() ) );
mCalendar.addTodo( todo );
saveCache();
@@ -446,10 +446,10 @@ bool ResourceXMLRPC::deleteTodo( Todo *todo )
return false;
mServer->call( DeleteTodoCommand, idMapper().remoteId( todo->uid() ).toInt(),
- this, SLOT( deleteTodoFinished( const QValueList<QVariant>&,
- const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ),
- QVariant( todo->uid() ) );
+ this, TQT_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&,
+ const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ TQVariant( todo->uid() ) );
return true;
}
@@ -458,12 +458,12 @@ Todo::List ResourceXMLRPC::rawTodos()
return mCalendar.rawTodos();
}
-Todo *ResourceXMLRPC::todo( const QString& uid )
+Todo *ResourceXMLRPC::todo( const TQString& uid )
{
return mCalendar.todo( uid );
}
-Todo::List ResourceXMLRPC::rawTodosForDate( const QDate& date )
+Todo::List ResourceXMLRPC::rawTodosForDate( const TQDate& date )
{
return mCalendar.rawTodosForDate( date );
}
@@ -478,23 +478,23 @@ bool ResourceXMLRPC::deleteJournal( Journal* journal )
return mCalendar.deleteJournal( journal );
}
-Journal::List ResourceXMLRPC::journals( const QDate& date )
+Journal::List ResourceXMLRPC::journals( const TQDate& date )
{
return mCalendar.journals( date );
}
-Journal *ResourceXMLRPC::journal( const QString& uid )
+Journal *ResourceXMLRPC::journal( const TQString& uid )
{
return mCalendar.journal( uid );
}
-Alarm::List ResourceXMLRPC::alarmsTo( const QDateTime& to )
+Alarm::List ResourceXMLRPC::alarmsTo( const TQDateTime& to )
{
return mCalendar.alarmsTo( to );
}
-Alarm::List ResourceXMLRPC::alarms( const QDateTime& from, const QDateTime& to )
+Alarm::List ResourceXMLRPC::alarms( const TQDateTime& from, const TQDateTime& to )
{
return mCalendar.alarms( from, to );
}
@@ -510,10 +510,10 @@ void ResourceXMLRPC::reload()
}
-void ResourceXMLRPC::loginFinished( const QValueList<QVariant>& variant,
- const QVariant& )
+void ResourceXMLRPC::loginFinished( const TQValueList<TQVariant>& variant,
+ const TQVariant& )
{
- QMap<QString, QVariant> map = variant[ 0 ].toMap();
+ TQMap<TQString, TQVariant> map = variant[ 0 ].toMap();
KURL url = KURL( mPrefs->url() );
if ( map[ "GOAWAY" ].toString() == "XOXO" ) { // failed
@@ -530,10 +530,10 @@ void ResourceXMLRPC::loginFinished( const QValueList<QVariant>& variant,
mSynchronizer->stop();
}
-void ResourceXMLRPC::logoutFinished( const QValueList<QVariant>& variant,
- const QVariant& )
+void ResourceXMLRPC::logoutFinished( const TQValueList<TQVariant>& variant,
+ const TQVariant& )
{
- QMap<QString, QVariant> map = variant[ 0 ].toMap();
+ TQMap<TQString, TQVariant> map = variant[ 0 ].toMap();
if ( map[ "GOODBYE" ].toString() != "XOXO" )
kdError() << "logout failed" << endl;
@@ -547,11 +547,11 @@ void ResourceXMLRPC::logoutFinished( const QValueList<QVariant>& variant,
mSynchronizer->stop();
}
-void ResourceXMLRPC::listEventsFinished( const QValueList<QVariant>& list,
- const QVariant& )
+void ResourceXMLRPC::listEventsFinished( const TQValueList<TQVariant>& list,
+ const TQVariant& )
{
- const QValueList<QVariant> eventList = list[ 0 ].toList();
- QValueList<QVariant>::ConstIterator eventIt;
+ const TQValueList<TQVariant> eventList = list[ 0 ].toList();
+ TQValueList<TQVariant>::ConstIterator eventIt;
disableChangeNotification();
@@ -559,17 +559,17 @@ void ResourceXMLRPC::listEventsFinished( const QValueList<QVariant>& list,
bool changed = false;
for ( eventIt = eventList.begin(); eventIt != eventList.end(); ++eventIt ) {
- QMap<QString, QVariant> map = (*eventIt).toMap();
+ TQMap<TQString, TQVariant> map = (*eventIt).toMap();
Event *event = new Event;
event->setFloats( false );
- QString uid;
+ TQString uid;
readEvent( map, event, uid );
// do we already have this event?
Event *oldEvent = 0;
- QString localUid = idMapper().localId( uid );
+ TQString localUid = idMapper().localId( uid );
if ( !localUid.isEmpty() )
oldEvent = mCalendar.event( localUid );
@@ -608,8 +608,8 @@ void ResourceXMLRPC::listEventsFinished( const QValueList<QVariant>& list,
checkLoadingFinished();
}
-void ResourceXMLRPC::deleteEventFinished( const QValueList<QVariant>&,
- const QVariant& id )
+void ResourceXMLRPC::deleteEventFinished( const TQValueList<TQVariant>&,
+ const TQVariant& id )
{
idMapper().removeRemoteId( idMapper().remoteId( id.toString() ) );
@@ -623,26 +623,26 @@ void ResourceXMLRPC::deleteEventFinished( const QValueList<QVariant>&,
emit resourceChanged( this );
}
-void ResourceXMLRPC::updateEventFinished( const QValueList<QVariant>&,
- const QVariant& )
+void ResourceXMLRPC::updateEventFinished( const TQValueList<TQVariant>&,
+ const TQVariant& )
{
mSynchronizer->stop();
}
-void ResourceXMLRPC::addEventFinished( const QValueList<QVariant>& list,
- const QVariant& id )
+void ResourceXMLRPC::addEventFinished( const TQValueList<TQVariant>& list,
+ const TQVariant& id )
{
idMapper().setRemoteId( id.toString(), list[ 0 ].toString() );
emit resourceChanged( this );
}
-void ResourceXMLRPC::loadEventCategoriesFinished( const QValueList<QVariant> &mapList, const QVariant& )
+void ResourceXMLRPC::loadEventCategoriesFinished( const TQValueList<TQVariant> &mapList, const TQVariant& )
{
mEventCategoryMap.clear();
- const QMap<QString, QVariant> map = mapList[ 0 ].toMap();
- QMap<QString, QVariant>::ConstIterator it;
+ const TQMap<TQString, TQVariant> map = mapList[ 0 ].toMap();
+ TQMap<TQString, TQVariant>::ConstIterator it;
KPimPrefs prefs( "korganizerrc" );
for ( it = map.begin(); it != map.end(); ++it ) {
@@ -658,11 +658,11 @@ void ResourceXMLRPC::loadEventCategoriesFinished( const QValueList<QVariant> &ma
checkLoadingFinished();
}
-void ResourceXMLRPC::listTodosFinished( const QValueList<QVariant>& list,
- const QVariant& )
+void ResourceXMLRPC::listTodosFinished( const TQValueList<TQVariant>& list,
+ const TQVariant& )
{
- const QValueList<QVariant> todoList = list[ 0 ].toList();
- QValueList<QVariant>::ConstIterator todoIt;
+ const TQValueList<TQVariant> todoList = list[ 0 ].toList();
+ TQValueList<TQVariant>::ConstIterator todoIt;
disableChangeNotification();
@@ -670,16 +670,16 @@ void ResourceXMLRPC::listTodosFinished( const QValueList<QVariant>& list,
bool changed = false;
for ( todoIt = todoList.begin(); todoIt != todoList.end(); ++todoIt ) {
- QMap<QString, QVariant> map = (*todoIt).toMap();
+ TQMap<TQString, TQVariant> map = (*todoIt).toMap();
Todo *todo = new Todo;
- QString uid;
+ TQString uid;
readTodo( map, todo, uid );
// do we already have this todo?
Todo *oldTodo = 0;
- QString localUid = idMapper().localId( uid );
+ TQString localUid = idMapper().localId( uid );
if ( !localUid.isEmpty() )
oldTodo = mCalendar.todo( localUid );
@@ -713,8 +713,8 @@ void ResourceXMLRPC::listTodosFinished( const QValueList<QVariant>& list,
checkLoadingFinished();
}
-void ResourceXMLRPC::deleteTodoFinished( const QValueList<QVariant>&,
- const QVariant& id )
+void ResourceXMLRPC::deleteTodoFinished( const TQValueList<TQVariant>&,
+ const TQVariant& id )
{
idMapper().removeRemoteId( idMapper().remoteId( id.toString() ) );
mTodoStateMapper.remove( idMapper().remoteId( id.toString() ) );
@@ -728,26 +728,26 @@ void ResourceXMLRPC::deleteTodoFinished( const QValueList<QVariant>&,
emit resourceChanged( this );
}
-void ResourceXMLRPC::addTodoFinished( const QValueList<QVariant>& list,
- const QVariant& id )
+void ResourceXMLRPC::addTodoFinished( const TQValueList<TQVariant>& list,
+ const TQVariant& id )
{
idMapper().setRemoteId( id.toString(), list[ 0 ].toString() );
emit resourceChanged( this );
}
-void ResourceXMLRPC::updateTodoFinished( const QValueList<QVariant>&,
- const QVariant& )
+void ResourceXMLRPC::updateTodoFinished( const TQValueList<TQVariant>&,
+ const TQVariant& )
{
mSynchronizer->stop();
}
-void ResourceXMLRPC::loadTodoCategoriesFinished( const QValueList<QVariant> &mapList, const QVariant& )
+void ResourceXMLRPC::loadTodoCategoriesFinished( const TQValueList<TQVariant> &mapList, const TQVariant& )
{
mTodoCategoryMap.clear();
- const QMap<QString, QVariant> map = mapList[ 0 ].toMap();
- QMap<QString, QVariant>::ConstIterator it;
+ const TQMap<TQString, TQVariant> map = mapList[ 0 ].toMap();
+ TQMap<TQString, TQVariant>::ConstIterator it;
KPimPrefs prefs( "korganizerrc" );
for ( it = map.begin(); it != map.end(); ++it ) {
@@ -763,25 +763,25 @@ void ResourceXMLRPC::loadTodoCategoriesFinished( const QValueList<QVariant> &map
checkLoadingFinished();
}
-void ResourceXMLRPC::fault( int error, const QString& errorMsg,
- const QVariant& )
+void ResourceXMLRPC::fault( int error, const TQString& errorMsg,
+ const TQVariant& )
{
kdError() << "Server send error " << error << ": " << errorMsg << endl;
mSynchronizer->stop();
}
-void ResourceXMLRPC::readEvent( const QMap<QString, QVariant> &args, Event *event,
- QString &uid )
+void ResourceXMLRPC::readEvent( const TQMap<TQString, TQVariant> &args, Event *event,
+ TQString &uid )
{
// for recurrence
int rType = CAL_RECUR_NONE;
int rInterval = 1;
int rData = 0;
int rights = 0;
- QDateTime rEndDate;
- QValueList<QDateTime> rExceptions;
+ TQDateTime rEndDate;
+ TQValueList<TQDateTime> rExceptions;
- QMap<QString, QVariant>::ConstIterator it;
+ TQMap<TQString, TQVariant>::ConstIterator it;
for ( it = args.begin(); it != args.end(); ++it ) {
if ( it.key() == "id" ) {
uid = it.data().toString();
@@ -790,8 +790,8 @@ void ResourceXMLRPC::readEvent( const QMap<QString, QVariant> &args, Event *even
} else if ( it.key() == "start" ) {
event->setDtStart( it.data().toDateTime() );
} else if ( it.key() == "end" ) {
- QDateTime start = args[ "start" ].toDateTime();
- QDateTime end = it.data().toDateTime();
+ TQDateTime start = args[ "start" ].toDateTime();
+ TQDateTime end = it.data().toDateTime();
if ( start.time() == end.time() &&
start.time().hour() == 0 && start.time().minute() == 0 &&
start.time().second() == 0 ) {
@@ -813,10 +813,10 @@ void ResourceXMLRPC::readEvent( const QMap<QString, QVariant> &args, Event *even
event->setSecrecy( (it.data().toString() == "public" ?
Incidence::SecrecyPublic : Incidence::SecrecyPrivate) );
} else if ( it.key() == "category" ) {
- const QMap<QString, QVariant> categories = it.data().toMap();
- QMap<QString, QVariant>::ConstIterator catIt;
+ const TQMap<TQString, TQVariant> categories = it.data().toMap();
+ TQMap<TQString, TQVariant>::ConstIterator catIt;
- QStringList eventCategories;
+ TQStringList eventCategories;
for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
mEventCategoryMap.insert( catIt.data().toString(), catIt.key().toInt() );
eventCategories.append( catIt.data().toString() );
@@ -847,17 +847,17 @@ void ResourceXMLRPC::readEvent( const QMap<QString, QVariant> &args, Event *even
} else if ( it.key() == "recur_data" ) {
rData = it.data().toInt();
} else if ( it.key() == "recur_exception" ) {
- const QMap<QString, QVariant> dateList = it.data().toMap();
- QMap<QString, QVariant>::ConstIterator dateIt;
+ const TQMap<TQString, TQVariant> dateList = it.data().toMap();
+ TQMap<TQString, TQVariant>::ConstIterator dateIt;
for ( dateIt = dateList.begin(); dateIt != dateList.end(); ++dateIt )
rExceptions.append( (*dateIt).toDateTime() );
} else if ( it.key() == "participants" ) {
- const QMap<QString, QVariant> persons = it.data().toMap();
- QMap<QString, QVariant>::ConstIterator personsIt;
+ const TQMap<TQString, TQVariant> persons = it.data().toMap();
+ TQMap<TQString, TQVariant>::ConstIterator personsIt;
for ( personsIt = persons.begin(); personsIt != persons.end(); ++personsIt ) {
- QMap<QString, QVariant> person = (*personsIt).toMap();
+ TQMap<TQString, TQVariant> person = (*personsIt).toMap();
Attendee::PartStat status = Attendee::InProcess;
if ( person[ "status" ] == "A" )
status = Attendee::Accepted;
@@ -875,11 +875,11 @@ void ResourceXMLRPC::readEvent( const QMap<QString, QVariant> &args, Event *even
event->addAttendee( attendee );
}
} else if ( it.key() == "alarm" ) {
- const QMap<QString, QVariant> alarmList = it.data().toMap();
- QMap<QString, QVariant>::ConstIterator alarmIt;
+ const TQMap<TQString, TQVariant> alarmList = it.data().toMap();
+ TQMap<TQString, TQVariant>::ConstIterator alarmIt;
for ( alarmIt = alarmList.begin(); alarmIt != alarmList.end(); ++alarmIt ) {
- QMap<QString, QVariant> alarm = (*alarmIt).toMap();
+ TQMap<TQString, TQVariant> alarm = (*alarmIt).toMap();
Alarm *vAlarm = event->newAlarm();
vAlarm->setText( event->summary() );
@@ -903,7 +903,7 @@ void ResourceXMLRPC::readEvent( const QMap<QString, QVariant> &args, Event *even
re->setDaily( rInterval );
break;
case CAL_RECUR_WEEKLY: {
- QBitArray weekMask( 7 );
+ TQBitArray weekMask( 7 );
weekMask.setBit( 0, rData & CAL_MONDAY );
weekMask.setBit( 1, rData & CAL_TUESDAY );
weekMask.setBit( 2, rData & CAL_WEDNESDAY );
@@ -928,7 +928,7 @@ void ResourceXMLRPC::readEvent( const QMap<QString, QVariant> &args, Event *even
if ( rEndDate.date().isValid() )
re->setEndDate( rEndDate.date() );
- QValueList<QDateTime>::ConstIterator exIt;
+ TQValueList<TQDateTime>::ConstIterator exIt;
for ( exIt = rExceptions.begin(); exIt != rExceptions.end(); ++exIt )
re->addExDateTime( *exIt );
}
@@ -937,7 +937,7 @@ void ResourceXMLRPC::readEvent( const QMap<QString, QVariant> &args, Event *even
setRights( event, rights );
}
-void ResourceXMLRPC::writeEvent( Event *event, QMap<QString, QVariant> &args )
+void ResourceXMLRPC::writeEvent( Event *event, TQMap<TQString, TQVariant> &args )
{
args.insert( "start", event->dtStart() );
@@ -956,16 +956,16 @@ void ResourceXMLRPC::writeEvent( Event *event, QMap<QString, QVariant> &args )
args.insert( "access", (event->secrecy() == Incidence::SecrecyPublic ? "public" : "private") );
// CATEGORY
- const QStringList categories = event->categories();
- QStringList::ConstIterator catIt;
- QMap<QString, QVariant> catMap;
+ const TQStringList categories = event->categories();
+ TQStringList::ConstIterator catIt;
+ TQMap<TQString, TQVariant> catMap;
int counter = 0;
for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
- QMap<QString, int>::Iterator it = mEventCategoryMap.find( *catIt );
+ TQMap<TQString, int>::Iterator it = mEventCategoryMap.find( *catIt );
if ( it == mEventCategoryMap.end() ) // new category
- catMap.insert( QString::number( counter-- ), *catIt );
+ catMap.insert( TQString::number( counter-- ), *catIt );
else
- catMap.insert( QString::number( it.data() ), *catIt );
+ catMap.insert( TQString::number( it.data() ), *catIt );
}
args.insert( "category", catMap );
@@ -985,9 +985,9 @@ void ResourceXMLRPC::writeEvent( Event *event, QMap<QString, QVariant> &args )
if ( !rec->doesRecur() ) {
args.insert( "recur_type", int( 0 ) );
args.insert( "recur_interval", int( 0 ) );
- args.insert( "recur_enddate", QDateTime() );
+ args.insert( "recur_enddate", TQDateTime() );
args.insert( "recur_data", int( 0 ) );
- args.insert( "recur_exception", QMap<QString, QVariant>() );
+ args.insert( "recur_exception", TQMap<TQString, TQVariant>() );
} else {
switch ( rec->recurrenceType() ) {
case Recurrence::rDaily:
@@ -1031,12 +1031,12 @@ void ResourceXMLRPC::writeEvent( Event *event, QMap<QString, QVariant> &args )
args.insert( "recur_enddate", rec->endDateTime() );
// TODO: Also use exception dates!
- const QValueList<QDateTime> dates = event->recurrence()->exDateTimes();
- QValueList<QDateTime>::ConstIterator dateIt;
- QMap<QString, QVariant> exMap;
+ const TQValueList<TQDateTime> dates = event->recurrence()->exDateTimes();
+ TQValueList<TQDateTime>::ConstIterator dateIt;
+ TQMap<TQString, TQVariant> exMap;
int counter = 0;
for ( dateIt = dates.begin(); dateIt != dates.end(); ++dateIt, ++counter )
- exMap.insert( QString::number( counter ), *dateIt );
+ exMap.insert( TQString::number( counter ), *dateIt );
args.insert( "recur_exception", exMap );
}
@@ -1044,10 +1044,10 @@ void ResourceXMLRPC::writeEvent( Event *event, QMap<QString, QVariant> &args )
// PARTICIPANTS
const Attendee::List attendees = event->attendees();
Attendee::List::ConstIterator attIt;
- QMap<QString, QVariant> persons;
+ TQMap<TQString, TQVariant> persons;
for ( attIt = attendees.begin(); attIt != attendees.end(); ++attIt ) {
- QMap<QString, QVariant> person;
- QString status;
+ TQMap<TQString, TQVariant> person;
+ TQString status;
if ( (*attIt)->status() == Attendee::Accepted )
status = "A";
@@ -1069,9 +1069,9 @@ void ResourceXMLRPC::writeEvent( Event *event, QMap<QString, QVariant> &args )
// ALARMS
const Alarm::List alarms = event->alarms();
Alarm::List::ConstIterator alarmIt;
- QMap<QString, QVariant> alarmMap;
+ TQMap<TQString, TQVariant> alarmMap;
for ( alarmIt = alarms.begin(); alarmIt != alarms.end(); ++alarmIt ) {
- QMap<QString, QVariant> alarm;
+ TQMap<TQString, TQVariant> alarm;
alarm.insert( "time", (*alarmIt)->time() );
alarm.insert( "offset", (*alarmIt)->startOffset().asSeconds() );
alarm.insert( "enabled", ( (*alarmIt)->enabled() ? int( 1 ) : int( 0 ) ) );
@@ -1082,7 +1082,7 @@ void ResourceXMLRPC::writeEvent( Event *event, QMap<QString, QVariant> &args )
args.insert( "alarm", alarmMap );
}
-void ResourceXMLRPC::writeTodo( Todo* todo, QMap<QString, QVariant>& args )
+void ResourceXMLRPC::writeTodo( Todo* todo, TQMap<TQString, TQVariant>& args )
{
args.insert( "subject", todo->summary() );
args.insert( "des", todo->description() );
@@ -1090,17 +1090,17 @@ void ResourceXMLRPC::writeTodo( Todo* todo, QMap<QString, QVariant>& args )
(todo->secrecy() == Todo::SecrecyPublic ? "public" : "private" ) );
// CATEGORIES
- QMap<QString, QVariant> catMap;
+ TQMap<TQString, TQVariant> catMap;
- const QStringList categories = todo->categories();
- QStringList::ConstIterator catIt;
+ const TQStringList categories = todo->categories();
+ TQStringList::ConstIterator catIt;
int counter = 0;
for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
- QMap<QString, int>::Iterator it = mTodoCategoryMap.find( *catIt );
+ TQMap<TQString, int>::Iterator it = mTodoCategoryMap.find( *catIt );
if ( it == mTodoCategoryMap.end() )
- catMap.insert( QString::number( counter-- ), *catIt );
+ catMap.insert( TQString::number( counter-- ), *catIt );
else
- catMap.insert( QString::number( it.data() ), *catIt );
+ catMap.insert( TQString::number( it.data() ), *catIt );
}
args.insert( "category", catMap );
@@ -1111,17 +1111,17 @@ void ResourceXMLRPC::writeTodo( Todo* todo, QMap<QString, QVariant>& args )
// SUBTODO
Incidence *inc = todo->relatedTo();
if ( inc ) {
- QString parentUid = idMapper().remoteId( inc->uid() );
+ TQString parentUid = idMapper().remoteId( inc->uid() );
args.insert( "id_parent", parentUid );
}
// STATE
- QString remoteId = idMapper().remoteId( todo->uid() );
- QString status = mTodoStateMapper.remoteState( remoteId, todo->percentComplete() );
+ TQString remoteId = idMapper().remoteId( todo->uid() );
+ TQString status = mTodoStateMapper.remoteState( remoteId, todo->percentComplete() );
args.insert( "status", status );
}
-void ResourceXMLRPC::readTodo( const QMap<QString, QVariant>& args, Todo *todo, QString &uid )
+void ResourceXMLRPC::readTodo( const TQMap<TQString, TQVariant>& args, Todo *todo, TQString &uid )
{
uid = args[ "id" ].toString();
@@ -1138,10 +1138,10 @@ void ResourceXMLRPC::readTodo( const QMap<QString, QVariant>& args, Todo *todo,
todo->setSecrecy( args[ "access" ].toString() == "public" ? Todo::SecrecyPublic : Todo::SecrecyPrivate );
// CATEGORIES
- const QMap<QString, QVariant> categories = args[ "category" ].toMap();
- QMap<QString, QVariant>::ConstIterator it;
+ const TQMap<TQString, TQVariant> categories = args[ "category" ].toMap();
+ TQMap<TQString, TQVariant>::ConstIterator it;
- QStringList todoCategories;
+ TQStringList todoCategories;
for ( it = categories.begin(); it != categories.end(); ++it ) {
mTodoCategoryMap.insert( it.data().toString(), it.key().toInt() );
todoCategories.append( it.data().toString() );
@@ -1152,7 +1152,7 @@ void ResourceXMLRPC::readTodo( const QMap<QString, QVariant>& args, Todo *todo,
todo->setLastModified( args[ "datemodified" ].toDateTime() );
todo->setFloats( true );
- QDateTime dateTime = args[ "startdate" ].toDateTime();
+ TQDateTime dateTime = args[ "startdate" ].toDateTime();
if ( dateTime.isValid() ) {
todo->setDtStart( dateTime );
todo->setHasStartDate( true );
@@ -1169,9 +1169,9 @@ void ResourceXMLRPC::readTodo( const QMap<QString, QVariant>& args, Todo *todo,
}
// SUBTODO
- QString parentId = args[ "id_parent" ].toString();
+ TQString parentId = args[ "id_parent" ].toString();
if ( parentId != "0" ) { // we are a sub todo
- QString localParentUid = idMapper().localId( parentId );
+ TQString localParentUid = idMapper().localId( parentId );
if ( !localParentUid.isEmpty() ) { // found parent todo
Todo *parent = mCalendar.todo( localParentUid );
if ( parent )
@@ -1180,7 +1180,7 @@ void ResourceXMLRPC::readTodo( const QMap<QString, QVariant>& args, Todo *todo,
}
// STATE
- QString status = args[ "status" ].toString();
+ TQString status = args[ "status" ].toString();
int state = TodoStateMapper::toLocal( status );
mTodoStateMapper.addTodoState( uid, state, status );
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/kresources/egroupware/kcal_resourcexmlrpc.h
index fd9ad6826..a28202ed5 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.h
+++ b/kresources/egroupware/kcal_resourcexmlrpc.h
@@ -22,9 +22,9 @@
#ifndef KCAL_RESOURCEXMLRPC_H
#define KCAL_RESOURCEXMLRPC_H
-#include <qdatetime.h>
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqdatetime.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
#include <kconfig.h>
#include <kurl.h>
@@ -81,7 +81,7 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
/**
Retrieves an event on the basis of the unique string ID.
*/
- Event *event( const QString& uid );
+ Event *event( const TQString& uid );
/**
Return unfiltered list of all events in calendar.
@@ -93,20 +93,20 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
date specified. useful for dayView, etc. etc.
*/
Event::List rawEventsForDate(
- const QDate& date,
+ const TQDate& date,
EventSortField sortField=EventSortUnsorted,
SortDirection sortDirection=SortDirectionAscending );
/**
Get unfiltered events for date \a qdt.
*/
- Event::List rawEventsForDate( const QDateTime& qdt );
+ Event::List rawEventsForDate( const TQDateTime& qdt );
/**
Get unfiltered events in a range of dates. If inclusive is set to true,
only events are returned, which are completely included in the range.
*/
- Event::List rawEvents( const QDate& start, const QDate& end,
+ Event::List rawEvents( const TQDate& start, const TQDate& end,
bool inclusive = false );
@@ -124,7 +124,7 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
Searches todolist for an event with this unique string identifier,
returns a pointer or null.
*/
- Todo *todo( const QString& uid );
+ Todo *todo( const TQString& uid );
/**
Return list of all todos.
@@ -134,7 +134,7 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
/**
Returns list of todos due on the specified date.
*/
- Todo::List rawTodosForDate( const QDate& date );
+ Todo::List rawTodosForDate( const TQDate& date );
/**
Add a Journal entry to calendar
@@ -149,22 +149,22 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
/**
Return Journals for given date
*/
- virtual Journal::List journals( const QDate& );
+ virtual Journal::List journals( const TQDate& );
/**
Return Journal with given UID
*/
- virtual Journal *journal( const QString& uid );
+ virtual Journal *journal( const TQString& uid );
/**
Return all alarms, which ocur in the given time interval.
*/
- Alarm::List alarms( const QDateTime& from, const QDateTime& to );
+ Alarm::List alarms( const TQDateTime& from, const TQDateTime& to );
/**
Return all alarms, which ocur before given date.
*/
- Alarm::List alarmsTo( const QDateTime& to );
+ Alarm::List alarmsTo( const TQDateTime& to );
/**
Public because needed in MultiCalendar::load()
@@ -174,25 +174,25 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
void dump() const;
- void setTimeZoneId( const QString& ) {}
+ void setTimeZoneId( const TQString& ) {}
protected slots:
- void loginFinished( const QValueList<QVariant>&, const QVariant& );
- void logoutFinished( const QValueList<QVariant>&, const QVariant& );
+ void loginFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void logoutFinished( const TQValueList<TQVariant>&, const TQVariant& );
- void listEventsFinished( const QValueList<QVariant>&, const QVariant& );
- void addEventFinished( const QValueList<QVariant>&, const QVariant& );
- void updateEventFinished( const QValueList<QVariant>&, const QVariant& );
- void deleteEventFinished( const QValueList<QVariant>&, const QVariant& );
- void loadEventCategoriesFinished( const QValueList<QVariant>&, const QVariant& );
+ void listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void addEventFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void deleteEventFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& );
- void listTodosFinished( const QValueList<QVariant>&, const QVariant& );
- void addTodoFinished( const QValueList<QVariant>&, const QVariant& );
- void updateTodoFinished( const QValueList<QVariant>&, const QVariant& );
- void deleteTodoFinished( const QValueList<QVariant>&, const QVariant& );
- void loadTodoCategoriesFinished( const QValueList<QVariant>&, const QVariant& );
+ void listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void deleteTodoFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& );
- void fault( int, const QString&, const QVariant& );
+ void fault( int, const TQString&, const TQVariant& );
protected:
bool doLoad();
@@ -205,11 +205,11 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
void init();
void initEGroupware();
- void writeEvent( Event*, QMap<QString, QVariant>& );
- void readEvent( const QMap<QString, QVariant>&, Event*, QString& );
+ void writeEvent( Event*, TQMap<TQString, TQVariant>& );
+ void readEvent( const TQMap<TQString, TQVariant>&, Event*, TQString& );
- void writeTodo( Todo*, QMap<QString, QVariant>& );
- void readTodo( const QMap<QString, QVariant>&, Todo*, QString& );
+ void writeTodo( Todo*, TQMap<TQString, TQVariant>& );
+ void readTodo( const TQMap<TQString, TQVariant>&, Todo*, TQString& );
void checkLoadingFinished();
@@ -217,11 +217,11 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
EGroupwarePrefs *mPrefs;
- QString mSessionID;
- QString mKp3;
+ TQString mSessionID;
+ TQString mKp3;
- QMap<QString, int> mEventCategoryMap;
- QMap<QString, int> mTodoCategoryMap;
+ TQMap<TQString, int> mEventCategoryMap;
+ TQMap<TQString, int> mTodoCategoryMap;
TodoStateMapper mTodoStateMapper;
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
index 450519aa4..36e3b9486 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <kdialog.h>
@@ -34,32 +34,32 @@
using namespace KCal;
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( QWidget* parent, const char* name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
- QGridLayout *mainLayout = new QGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "URL:" ), this );
+ TQLabel *label = new TQLabel( i18n( "URL:" ), this );
mURL = new KURLRequester( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mURL, 0, 1 );
- label = new QLabel( i18n( "Domain:" ), this );
+ label = new TQLabel( i18n( "Domain:" ), this );
mDomain = new KLineEdit( this );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mDomain, 1, 1 );
- label = new QLabel( i18n( "User:" ), this );
+ label = new TQLabel( i18n( "User:" ), this );
mUser = new KLineEdit( this );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mUser, 2, 1 );
- label = new QLabel( i18n( "Password:" ), this );
+ label = new TQLabel( i18n( "Password:" ), this );
mPassword = new KLineEdit( this );
- mPassword->setEchoMode( QLineEdit::Password );
+ mPassword->setEchoMode( TQLineEdit::Password );
mainLayout->addWidget( label, 3, 0 );
mainLayout->addWidget( mPassword, 3, 1 );
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.h b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
index c6a918f84..f71359aa3 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -35,7 +35,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceXMLRPCConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp
index c30da41f0..b0bdb5b0d 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-#include <qstringlist.h>
+#include <tqapplication.h>
+#include <tqstringlist.h>
#include <kdebug.h>
#include <klocale.h>
@@ -44,13 +44,13 @@ using namespace KNotes;
typedef KRES::PluginFactory< ResourceXMLRPC, ResourceXMLRPCConfig> XMLRPCFactory;
K_EXPORT_COMPONENT_FACTORY( knotes_xmlrpc, XMLRPCFactory )
-static const QString SearchNotesCommand = "infolog.boinfolog.search";
-static const QString AddNoteCommand = "infolog.boinfolog.write";
-static const QString DeleteNoteCommand = "infolog.boinfolog.delete";
-static const QString LoadNoteCategoriesCommand = "infolog.boinfolog.categories";
+static const TQString SearchNotesCommand = "infolog.boinfolog.search";
+static const TQString AddNoteCommand = "infolog.boinfolog.write";
+static const TQString DeleteNoteCommand = "infolog.boinfolog.delete";
+static const TQString LoadNoteCategoriesCommand = "infolog.boinfolog.categories";
ResourceXMLRPC::ResourceXMLRPC( const KConfig* config )
- : ResourceNotes( config ), mCalendar( QString::fromLatin1("UTC") ),
+ : ResourceNotes( config ), mCalendar( TQString::fromLatin1("UTC") ),
mServer( 0 )
{
init();
@@ -62,7 +62,7 @@ ResourceXMLRPC::ResourceXMLRPC( const KConfig* config )
}
ResourceXMLRPC::ResourceXMLRPC( )
- : ResourceNotes( 0 ), mCalendar( QString::fromLatin1("UTC") ),
+ : ResourceNotes( 0 ), mCalendar( TQString::fromLatin1("UTC") ),
mServer( 0 )
{
init();
@@ -114,14 +114,14 @@ bool ResourceXMLRPC::load()
mServer->setUrl( KURL( mPrefs->url() ) );
mServer->setUserAgent( "KDE-Notes" );
- QMap<QString, QVariant> args, columns;
+ TQMap<TQString, TQVariant> args, columns;
args.insert( "domain", mPrefs->domain() );
args.insert( "username", mPrefs->user() );
args.insert( "password", mPrefs->password() );
- mServer->call( "system.login", QVariant( args ),
- this, SLOT( loginFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( "system.login", TQVariant( args ),
+ this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -132,8 +132,8 @@ bool ResourceXMLRPC::load()
args.insert( "order", "id_parent" );
mServer->call( SearchNotesCommand, args,
- this, SLOT( listNotesFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -149,7 +149,7 @@ bool ResourceXMLRPC::save()
bool ResourceXMLRPC::addNote( KCal::Journal *journal )
{
- QMap<QString, QVariant> args;
+ TQMap<TQString, TQVariant> args;
writeNote( journal, args );
KCal::Journal *oldJournal = mCalendar.journal( journal->uid() );
@@ -159,17 +159,17 @@ bool ResourceXMLRPC::addNote( KCal::Journal *journal )
if ( !oldJournal->isReadOnly() ) {
writeNote( journal, args );
args.insert( "id", mUidMap[ journal->uid() ].toInt() );
- mServer->call( AddNoteCommand, QVariant( args ),
- this, SLOT( updateNoteFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ) );
+ mServer->call( AddNoteCommand, TQVariant( args ),
+ this, TQT_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mCalendar.addJournal( journal );
added = true;
}
} else {
- mServer->call( AddNoteCommand, QVariant( args ),
- this, SLOT( addNoteFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ),
- QVariant( journal->uid() ) );
+ mServer->call( AddNoteCommand, TQVariant( args ),
+ this, TQT_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ TQVariant( journal->uid() ) );
mCalendar.addJournal( journal );
added = true;
@@ -186,28 +186,28 @@ bool ResourceXMLRPC::deleteNote( KCal::Journal *journal )
int id = mUidMap[ journal->uid() ].toInt();
mServer->call( DeleteNoteCommand, id,
- this, SLOT( deleteNoteFinished( const QValueList<QVariant>&, const QVariant& ) ),
- this, SLOT( fault( int, const QString&, const QVariant& ) ),
- QVariant( journal->uid() ) );
+ this, TQT_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ TQVariant( journal->uid() ) );
mSynchronizer->start();
return true;
}
-KCal::Alarm::List ResourceXMLRPC::alarms( const QDateTime& from, const QDateTime& to )
+KCal::Alarm::List ResourceXMLRPC::alarms( const TQDateTime& from, const TQDateTime& to )
{
KCal::Alarm::List alarms;
KCal::Journal::List notes = mCalendar.journals();
KCal::Journal::List::ConstIterator note;
for ( note = notes.begin(); note != notes.end(); ++note )
{
- QDateTime preTime = from.addSecs( -1 );
+ TQDateTime preTime = from.addSecs( -1 );
KCal::Alarm::List::ConstIterator it;
for( it = (*note)->alarms().begin(); it != (*note)->alarms().end(); ++it )
{
if ( (*it)->enabled() )
{
- QDateTime dt = (*it)->nextRepetition( preTime );
+ TQDateTime dt = (*it)->nextRepetition( preTime );
if ( dt.isValid() && dt <= to )
alarms.append( *it );
}
@@ -217,10 +217,10 @@ KCal::Alarm::List ResourceXMLRPC::alarms( const QDateTime& from, const QDateTime
return alarms;
}
-void ResourceXMLRPC::loginFinished( const QValueList<QVariant>& variant,
- const QVariant& )
+void ResourceXMLRPC::loginFinished( const TQValueList<TQVariant>& variant,
+ const TQVariant& )
{
- QMap<QString, QVariant> map = variant[ 0 ].toMap();
+ TQMap<TQString, TQVariant> map = variant[ 0 ].toMap();
KURL url = KURL( mPrefs->url() );
if ( map[ "GOAWAY" ].toString() == "XOXO" ) { // failed
@@ -237,10 +237,10 @@ void ResourceXMLRPC::loginFinished( const QValueList<QVariant>& variant,
mSynchronizer->stop();
}
-void ResourceXMLRPC::logoutFinished( const QValueList<QVariant>& variant,
- const QVariant& )
+void ResourceXMLRPC::logoutFinished( const TQValueList<TQVariant>& variant,
+ const TQVariant& )
{
- QMap<QString, QVariant> map = variant[ 0 ].toMap();
+ TQMap<TQString, TQVariant> map = variant[ 0 ].toMap();
if ( map[ "GOODBYE" ].toString() != "XOXO" )
kdError() << "logout failed" << endl;
@@ -254,9 +254,9 @@ void ResourceXMLRPC::logoutFinished( const QValueList<QVariant>& variant,
mSynchronizer->stop();
}
-void ResourceXMLRPC::listNotesFinished( const QValueList<QVariant> &list, const QVariant& )
+void ResourceXMLRPC::listNotesFinished( const TQValueList<TQVariant> &list, const TQVariant& )
{
- QMap<QString, QString>::Iterator uidIt;
+ TQMap<TQString, TQString>::Iterator uidIt;
for ( uidIt = mUidMap.begin(); uidIt != mUidMap.end(); ++uidIt ) {
KCal::Journal *journal = mCalendar.journal( uidIt.key() );
mCalendar.deleteJournal( journal );
@@ -264,15 +264,15 @@ void ResourceXMLRPC::listNotesFinished( const QValueList<QVariant> &list, const
mUidMap.clear();
- QValueList<QVariant> noteList = list[ 0 ].toList();
- QValueList<QVariant>::Iterator noteIt;
+ TQValueList<TQVariant> noteList = list[ 0 ].toList();
+ TQValueList<TQVariant>::Iterator noteIt;
for ( noteIt = noteList.begin(); noteIt != noteList.end(); ++noteIt ) {
- QMap<QString, QVariant> map = (*noteIt).toMap();
+ TQMap<TQString, TQVariant> map = (*noteIt).toMap();
KCal::Journal *journal = new KCal::Journal();
- QString uid;
+ TQString uid;
readNote( map, journal, uid );
mUidMap.insert( journal->uid(), uid );
@@ -283,20 +283,20 @@ void ResourceXMLRPC::listNotesFinished( const QValueList<QVariant> &list, const
mSynchronizer->stop();
}
-void ResourceXMLRPC::addNoteFinished( const QValueList<QVariant> &list, const QVariant &id )
+void ResourceXMLRPC::addNoteFinished( const TQValueList<TQVariant> &list, const TQVariant &id )
{
int uid = list[ 0 ].toInt();
- mUidMap.insert( id.toString(), QString::number( uid ) );
+ mUidMap.insert( id.toString(), TQString::number( uid ) );
mSynchronizer->stop();
}
-void ResourceXMLRPC::updateNoteFinished( const QValueList<QVariant>&, const QVariant& )
+void ResourceXMLRPC::updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& )
{
mSynchronizer->stop();
}
-void ResourceXMLRPC::deleteNoteFinished( const QValueList<QVariant>&, const QVariant &id )
+void ResourceXMLRPC::deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant &id )
{
mUidMap.erase( id.toString() );
@@ -306,13 +306,13 @@ void ResourceXMLRPC::deleteNoteFinished( const QValueList<QVariant>&, const QVar
mSynchronizer->stop();
}
-void ResourceXMLRPC::fault( int error, const QString& errorMsg, const QVariant& )
+void ResourceXMLRPC::fault( int error, const TQString& errorMsg, const TQVariant& )
{
kdError() << "Server send error " << error << ": " << errorMsg << endl;
mSynchronizer->stop();
}
-void ResourceXMLRPC::writeNote( KCal::Journal* journal, QMap<QString, QVariant>& args )
+void ResourceXMLRPC::writeNote( KCal::Journal* journal, TQMap<TQString, TQVariant>& args )
{
args.insert( "subject", journal->summary() );
args.insert( "des", journal->description() );
@@ -320,7 +320,7 @@ void ResourceXMLRPC::writeNote( KCal::Journal* journal, QMap<QString, QVariant>&
(journal->secrecy() == KCal::Journal::SecrecyPublic ? "public" : "private" ) );
}
-void ResourceXMLRPC::readNote( const QMap<QString, QVariant>& args, KCal::Journal *journal, QString &uid )
+void ResourceXMLRPC::readNote( const TQMap<TQString, TQVariant>& args, KCal::Journal *journal, TQString &uid )
{
uid = args[ "id" ].toString();
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.h b/kresources/egroupware/knotes_resourcexmlrpc.h
index 2f2934320..7301ef902 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.h
+++ b/kresources/egroupware/knotes_resourcexmlrpc.h
@@ -22,8 +22,8 @@
#ifndef KNOTES_RESOURCEXMLRPC_H
#define KNOTES_RESOURCEXMLRPC_H
-#include <qptrlist.h>
-#include <qstring.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
#include <kconfig.h>
#include <kurl.h>
@@ -66,34 +66,34 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceNotes
bool addNote( KCal::Journal* );
bool deleteNote( KCal::Journal* );
- KCal::Alarm::List alarms( const QDateTime& from, const QDateTime& to );
+ KCal::Alarm::List alarms( const TQDateTime& from, const TQDateTime& to );
protected slots:
- void loginFinished( const QValueList<QVariant>&, const QVariant& );
- void logoutFinished( const QValueList<QVariant>&, const QVariant& );
+ void loginFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void logoutFinished( const TQValueList<TQVariant>&, const TQVariant& );
- void listNotesFinished( const QValueList<QVariant>&, const QVariant& );
- void addNoteFinished( const QValueList<QVariant>&, const QVariant& );
- void updateNoteFinished( const QValueList<QVariant>&, const QVariant& );
- void deleteNoteFinished( const QValueList<QVariant>&, const QVariant& );
+ void listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& );
+ void deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& );
- void fault( int, const QString&, const QVariant& );
+ void fault( int, const TQString&, const TQVariant& );
private:
void init();
void initEGroupware();
- void writeNote( KCal::Journal*, QMap<QString, QVariant>& );
- void readNote( const QMap<QString, QVariant>&, KCal::Journal*, QString& );
+ void writeNote( KCal::Journal*, TQMap<TQString, TQVariant>& );
+ void readNote( const TQMap<TQString, TQVariant>&, KCal::Journal*, TQString& );
KCal::CalendarLocal mCalendar;
KXMLRPC::Server *mServer;
EGroupwarePrefs *mPrefs;
- QString mSessionID;
- QString mKp3;
- QMap<QString, QString> mUidMap;
+ TQString mSessionID;
+ TQString mKp3;
+ TQMap<TQString, TQString> mUidMap;
Synchronizer *mSynchronizer;
};
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
index 6eee548ce..224cb9914 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <kdebug.h>
#include <kdialog.h>
@@ -34,32 +34,32 @@
using namespace KNotes;
-ResourceXMLRPCConfig::ResourceXMLRPCConfig( QWidget* parent, const char* name )
+ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
- QGridLayout *mainLayout = new QGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 4, 2, 0, KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "URL:" ), this );
+ TQLabel *label = new TQLabel( i18n( "URL:" ), this );
mURL = new KURLRequester( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mURL, 0, 1 );
- label = new QLabel( i18n( "Domain:" ), this );
+ label = new TQLabel( i18n( "Domain:" ), this );
mDomain = new KLineEdit( this );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mDomain, 1, 1 );
- label = new QLabel( i18n( "User:" ), this );
+ label = new TQLabel( i18n( "User:" ), this );
mUser = new KLineEdit( this );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mUser, 2, 1 );
- label = new QLabel( i18n( "Password:" ), this );
+ label = new TQLabel( i18n( "Password:" ), this );
mPassword = new KLineEdit( this );
- mPassword->setEchoMode( QLineEdit::Password );
+ mPassword->setEchoMode( TQLineEdit::Password );
mainLayout->addWidget( label, 3, 0 );
mainLayout->addWidget( mPassword, 3, 1 );
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.h b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
index 7b3edab2e..63119ab72 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -35,7 +35,7 @@ class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceXMLRPCConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceXMLRPCConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KRES::Resource* );
diff --git a/kresources/egroupware/synchronizer.cpp b/kresources/egroupware/synchronizer.cpp
index 928fc7e1d..f48542467 100644
--- a/kresources/egroupware/synchronizer.cpp
+++ b/kresources/egroupware/synchronizer.cpp
@@ -20,7 +20,7 @@
*/
#include <kapplication.h>
-#include <qeventloop.h>
+#include <tqeventloop.h>
#include <unistd.h>
@@ -36,7 +36,7 @@ void Synchronizer::start()
mBlocked = true;
while ( mBlocked ) {
- QApplication::eventLoop()->processEvents( QEventLoop::ExcludeUserInput );
+ TQApplication::eventLoop()->processEvents( TQEventLoop::ExcludeUserInput );
// use sleep here to reduce cpu usage
usleep( 100 );
diff --git a/kresources/egroupware/synchronizer.h b/kresources/egroupware/synchronizer.h
index feac6bf31..ccb34d7cb 100644
--- a/kresources/egroupware/synchronizer.h
+++ b/kresources/egroupware/synchronizer.h
@@ -22,7 +22,7 @@
#ifndef SYNCHRONIZER_H
#define SYNCHRONIZER_H
-#include <qobject.h>
+#include <tqobject.h>
/**
A small helper class which blocks an asynchronous operation (e.g. a KIO request)
@@ -37,8 +37,8 @@
...
job = KIO::file_copy( url, file, -1, true );
- connect( job, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotResult( KIO::Job * ) ) );
mSynchronizer.start(); // will block here until the slot was called
...
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index 6c81ded33..e983c3c99 100644
--- a/kresources/egroupware/todostatemapper.cpp
+++ b/kresources/egroupware/todostatemapper.cpp
@@ -19,22 +19,22 @@
Boston, MA 02110-1301, USA.
*/
-#include <qdatastream.h>
-#include <qfile.h>
+#include <tqdatastream.h>
+#include <tqfile.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include "todostatemapper.h"
-QDataStream& operator<<( QDataStream &stream, const TodoStateMapper::TodoStateMapEntry &entry )
+TQDataStream& operator<<( TQDataStream &stream, const TodoStateMapper::TodoStateMapEntry &entry )
{
stream << entry.uid << entry.localState << entry.remoteState;
return stream;
}
-QDataStream& operator>>( QDataStream &stream, TodoStateMapper::TodoStateMapEntry &entry )
+TQDataStream& operator>>( TQDataStream &stream, TodoStateMapper::TodoStateMapEntry &entry )
{
stream >> entry.uid >> entry.localState >> entry.remoteState;
@@ -49,19 +49,19 @@ TodoStateMapper::~TodoStateMapper()
{
}
-void TodoStateMapper::setPath( const QString &path )
+void TodoStateMapper::setPath( const TQString &path )
{
mPath = path;
}
-void TodoStateMapper::setIdentifier( const QString &identifier )
+void TodoStateMapper::setIdentifier( const TQString &identifier )
{
mIdentifier = identifier;
}
bool TodoStateMapper::load()
{
- QFile file( filename() );
+ TQFile file( filename() );
if ( !file.open( IO_ReadOnly ) ) {
kdError() << "Can't read uid map file '" << filename() << "'" << endl;
return false;
@@ -69,7 +69,7 @@ bool TodoStateMapper::load()
clear();
- QDataStream stream;
+ TQDataStream stream;
stream.setVersion( 6 );
stream.setDevice( &file );
stream >> mTodoStateMap;
@@ -81,13 +81,13 @@ bool TodoStateMapper::load()
bool TodoStateMapper::save()
{
- QFile file( filename() );
+ TQFile file( filename() );
if ( !file.open( IO_WriteOnly ) ) {
kdError() << "Can't write uid map file '" << filename() << "'" << endl;
return false;
}
- QDataStream stream;
+ TQDataStream stream;
stream.setVersion( 6 );
stream.setDevice( &file );
stream << mTodoStateMap;
@@ -102,7 +102,7 @@ void TodoStateMapper::clear()
mTodoStateMap.clear();
}
-void TodoStateMapper::addTodoState( const QString &uid, int localState, const QString &remoteState )
+void TodoStateMapper::addTodoState( const TQString &uid, int localState, const TQString &remoteState )
{
TodoStateMapEntry entry;
entry.uid = uid;
@@ -112,7 +112,7 @@ void TodoStateMapper::addTodoState( const QString &uid, int localState, const QS
mTodoStateMap.insert( uid, entry );
}
-QString TodoStateMapper::remoteState( const QString &uid, int localState )
+TQString TodoStateMapper::remoteState( const TQString &uid, int localState )
{
if ( mTodoStateMap.find( uid ) == mTodoStateMap.end() )
kdError() << "TodoStateMapper: no entry for " << uid << " found" << endl;
@@ -124,12 +124,12 @@ QString TodoStateMapper::remoteState( const QString &uid, int localState )
return toRemote( localState );
}
-void TodoStateMapper::remove( const QString &uid )
+void TodoStateMapper::remove( const TQString &uid )
{
mTodoStateMap.remove( uid );
}
-int TodoStateMapper::toLocal( const QString &remoteState )
+int TodoStateMapper::toLocal( const TQString &remoteState )
{
if ( remoteState == "offer" )
return 0;
@@ -138,13 +138,13 @@ int TodoStateMapper::toLocal( const QString &remoteState )
else if ( remoteState == "done" || remoteState == "billed" )
return 100;
else {
- QString number( remoteState );
+ TQString number( remoteState );
number.replace( "%", "" );
return number.toInt();
}
}
-QString TodoStateMapper::toRemote( int localState )
+TQString TodoStateMapper::toRemote( int localState )
{
if ( localState == 0 )
return "offer";
@@ -153,12 +153,12 @@ QString TodoStateMapper::toRemote( int localState )
else if ( localState == 100 )
return "done";
else
- return QString( "%1%" ).arg( localState );
+ return TQString( "%1%" ).arg( localState );
}
-QString TodoStateMapper::filename()
+TQString TodoStateMapper::filename()
{
- QString file = mPath;
+ TQString file = mPath;
if ( !file.endsWith( "/" ) ) file += "/";
file += mIdentifier;
diff --git a/kresources/egroupware/todostatemapper.h b/kresources/egroupware/todostatemapper.h
index c5590ef25..46c531cfc 100644
--- a/kresources/egroupware/todostatemapper.h
+++ b/kresources/egroupware/todostatemapper.h
@@ -22,8 +22,8 @@
#ifndef TODOSTATEMAPPER_H
#define TODOSTATEMAPPER_H
-#include <qdatastream.h>
-#include <qmap.h>
+#include <tqdatastream.h>
+#include <tqmap.h>
class TodoStateMapper
{
@@ -35,41 +35,41 @@ class TodoStateMapper
TodoStateMapper();
~TodoStateMapper();
- void setPath( const QString &path );
- void setIdentifier( const QString &identifier );
+ void setPath( const TQString &path );
+ void setIdentifier( const TQString &identifier );
bool load();
bool save();
void clear();
- void addTodoState( const QString &uid, int localState, const QString &remoteState );
+ void addTodoState( const TQString &uid, int localState, const TQString &remoteState );
- QString remoteState( const QString &uid, int localState );
+ TQString remoteState( const TQString &uid, int localState );
- void remove( const QString &uid );
+ void remove( const TQString &uid );
- static int toLocal( const QString &remoteState );
- static QString toRemote( int localState );
+ static int toLocal( const TQString &remoteState );
+ static TQString toRemote( int localState );
protected:
- QString filename();
+ TQString filename();
private:
- QString mPath;
- QString mIdentifier;
+ TQString mPath;
+ TQString mIdentifier;
typedef struct {
- QString uid;
+ TQString uid;
int localState;
- QString remoteState;
+ TQString remoteState;
} TodoStateMapEntry;
- typedef QMap<QString, TodoStateMapEntry> TodoStateMap;
+ typedef TQMap<TQString, TodoStateMapEntry> TodoStateMap;
TodoStateMap mTodoStateMap;
- friend QDataStream &operator<<( QDataStream&, const TodoStateMapEntry& );
- friend QDataStream &operator>>( QDataStream&, TodoStateMapEntry& );
+ friend TQDataStream &operator<<( TQDataStream&, const TodoStateMapEntry& );
+ friend TQDataStream &operator>>( TQDataStream&, TodoStateMapEntry& );
};
#endif
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 0158e23d1..2d91edbde 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -8,7 +8,7 @@
* (at your option) any later version. *
***************************************************************************/
-#include <qfile.h>
+#include <tqfile.h>
#include <kdebug.h>
#include <kio/job.h>
@@ -37,11 +37,11 @@ namespace KXMLRPC
{
return m_errorCode;
}
- QString errorString() const
+ TQString errorString() const
{
return m_errorString;
}
- QValueList<QVariant> data() const
+ TQValueList<TQVariant> data() const
{
return m_data;
}
@@ -49,24 +49,24 @@ namespace KXMLRPC
private:
bool m_success;
int m_errorCode;
- QString m_errorString;
- QValueList<QVariant> m_data;
+ TQString m_errorString;
+ TQValueList<TQVariant> m_data;
};
}
-Query *Query::create( const QVariant &id, QObject *parent, const char *name )
+Query *Query::create( const TQVariant &id, TQObject *parent, const char *name )
{
return new Query( id, parent, name );
}
-void Query::call( const QString &server, const QString &method,
- const QValueList<QVariant> &args, const QString &userAgent )
+void Query::call( const TQString &server, const TQString &method,
+ const TQValueList<TQVariant> &args, const TQString &userAgent )
{
- const QString xmlMarkup = markupCall( method, args );
+ const TQString xmlMarkup = markupCall( method, args );
DebugDialog::addMessage( xmlMarkup, DebugDialog::Output );
- QByteArray postData;
- QDataStream stream( postData, IO_WriteOnly );
+ TQByteArray postData;
+ TQDataStream stream( postData, IO_WriteOnly );
stream.writeRawBytes( xmlMarkup.utf8(), xmlMarkup.utf8().length() );
KIO::TransferJob *job = KIO::http_post( KURL( server ), postData, false );
@@ -78,15 +78,15 @@ void Query::call( const QString &server, const QString &method,
job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
job->addMetaData( "ConnectTimeout", "50" );
- connect( job, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- this, SLOT( slotData( KIO::Job *, const QByteArray & ) ) );
- connect( job, SIGNAL( result( KIO::Job * ) ),
- this, SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ this, TQT_SLOT( slotResult( KIO::Job * ) ) );
m_pendingJobs.append( job );
}
-void Query::slotData( KIO::Job *, const QByteArray &data )
+void Query::slotData( KIO::Job *, const TQByteArray &data )
{
unsigned int oldSize = m_buffer.size();
m_buffer.resize( oldSize + data.size() );
@@ -104,11 +104,11 @@ void Query::slotResult( KIO::Job *job )
return ;
}
- QString data = QString::fromUtf8( m_buffer.data(), m_buffer.size() );
+ TQString data = TQString::fromUtf8( m_buffer.data(), m_buffer.size() );
DebugDialog::addMessage( data, DebugDialog::Input );
- QDomDocument doc;
- QString errMsg;
+ TQDomDocument doc;
+ TQString errMsg;
int errLine, errCol;
if ( !doc.setContent( data, false, &errMsg, &errLine, &errCol ) )
{
@@ -134,17 +134,17 @@ void Query::slotResult( KIO::Job *job )
emit finished( this );
}
-bool Query::isMessageResponse( const QDomDocument &doc ) const
+bool Query::isMessageResponse( const TQDomDocument &doc ) const
{
return doc.documentElement().firstChild().toElement().tagName().lower() == "params";
}
-Result Query::parseMessageResponse( const QDomDocument &doc ) const
+Result Query::parseMessageResponse( const TQDomDocument &doc ) const
{
Result response;
response.m_success = true;
- QDomNode paramNode = doc.documentElement().firstChild().firstChild();
+ TQDomNode paramNode = doc.documentElement().firstChild().firstChild();
while ( !paramNode.isNull() )
{
response.m_data << demarshal( paramNode.firstChild().toElement() );
@@ -154,36 +154,36 @@ Result Query::parseMessageResponse( const QDomDocument &doc ) const
return response;
}
-bool Query::isFaultResponse( const QDomDocument &doc ) const
+bool Query::isFaultResponse( const TQDomDocument &doc ) const
{
return doc.documentElement().firstChild().toElement().tagName().lower() == "fault";
}
-Result Query::parseFaultResponse( const QDomDocument &doc ) const
+Result Query::parseFaultResponse( const TQDomDocument &doc ) const
{
Result response;
response.m_success = false;
- QDomNode errorNode = doc.documentElement().firstChild().firstChild();
- const QVariant errorVariant = demarshal( errorNode.toElement() );
+ TQDomNode errorNode = doc.documentElement().firstChild().firstChild();
+ const TQVariant errorVariant = demarshal( errorNode.toElement() );
response.m_errorCode = errorVariant.toMap() [ "faultCode" ].toInt();
response.m_errorString = errorVariant.toMap() [ "faultString" ].toString();
return response;
}
-QString Query::markupCall( const QString &cmd,
- const QValueList<QVariant> &args ) const
+TQString Query::markupCall( const TQString &cmd,
+ const TQValueList<TQVariant> &args ) const
{
- QString markup = "<?xml version=\"1.0\" ?>\r\n<methodCall>\r\n";
+ TQString markup = "<?xml version=\"1.0\" ?>\r\n<methodCall>\r\n";
markup += "<methodName>" + cmd + "</methodName>\r\n";
if ( !args.isEmpty() )
{
markup += "<params>\r\n";
- QValueList<QVariant>::ConstIterator it = args.begin();
- QValueList<QVariant>::ConstIterator end = args.end();
+ TQValueList<TQVariant>::ConstIterator it = args.begin();
+ TQValueList<TQVariant>::ConstIterator end = args.end();
for ( ; it != end; ++it )
markup += "<param>\r\n" + marshal( *it ) + "</param>\r\n";
markup += "</params>\r\n";
@@ -194,52 +194,52 @@ QString Query::markupCall( const QString &cmd,
return markup;
}
-QString Query::marshal( const QVariant &arg ) const
+TQString Query::marshal( const TQVariant &arg ) const
{
switch ( arg.type() )
{
- case QVariant::String:
- case QVariant::CString:
+ case TQVariant::String:
+ case TQVariant::CString:
{
- QString result = arg.toString();
+ TQString result = arg.toString();
result = result.replace( "&", "&amp;" );
result = result.replace( "\"", "&quot;" );
result = result.replace( "<", "&lt;" );
result = result.replace( ">", "&gt;" );
return "<value><string>" + result + "</string></value>\r\n";
}
- case QVariant::Int:
- return "<value><int>" + QString::number( arg.toInt() ) + "</int></value>\r\n";
- case QVariant::Double:
- return "<value><double>" + QString::number( arg.toDouble() ) + "</double></value>\r\n";
- case QVariant::Bool:
+ case TQVariant::Int:
+ return "<value><int>" + TQString::number( arg.toInt() ) + "</int></value>\r\n";
+ case TQVariant::Double:
+ return "<value><double>" + TQString::number( arg.toDouble() ) + "</double></value>\r\n";
+ case TQVariant::Bool:
{
- QString markup = "<value><boolean>";
+ TQString markup = "<value><boolean>";
markup += arg.toBool() ? "1" : "0";
markup += "</boolean></value>\r\n";
return markup;
}
- case QVariant::ByteArray:
+ case TQVariant::ByteArray:
return "<value><base64>" + KCodecs::base64Encode( arg.toByteArray() ) + "</base64></value>\r\n";
- case QVariant::DateTime:
+ case TQVariant::DateTime:
return "<value><datetime.iso8601>" + arg.toDateTime().toString( Qt::ISODate ) + "</datetime.iso8601></value>\r\n";
- case QVariant::List:
+ case TQVariant::List:
{
- QString markup = "<value><array><data>\r\n";
- const QValueList<QVariant> args = arg.toList();
- QValueList<QVariant>::ConstIterator it = args.begin();
- QValueList<QVariant>::ConstIterator end = args.end();
+ TQString markup = "<value><array><data>\r\n";
+ const TQValueList<TQVariant> args = arg.toList();
+ TQValueList<TQVariant>::ConstIterator it = args.begin();
+ TQValueList<TQVariant>::ConstIterator end = args.end();
for ( ; it != end; ++it )
markup += marshal( *it );
markup += "</data></array></value>\r\n";
return markup;
}
- case QVariant::Map:
+ case TQVariant::Map:
{
- QString markup = "<value><struct>\r\n";
- QMap<QString, QVariant> map = arg.toMap();
- QMap<QString, QVariant>::ConstIterator it = map.begin();
- QMap<QString, QVariant>::ConstIterator end = map.end();
+ TQString markup = "<value><struct>\r\n";
+ TQMap<TQString, TQVariant> map = arg.toMap();
+ TQMap<TQString, TQVariant>::ConstIterator it = map.begin();
+ TQMap<TQString, TQVariant>::ConstIterator end = map.end();
for ( ; it != end; ++it )
{
markup += "<member>\r\n";
@@ -253,76 +253,76 @@ QString Query::marshal( const QVariant &arg ) const
default:
kdWarning() << "Failed to marshal unknown variant type: " << arg.type() << endl;
};
- return QString::null;
+ return TQString::null;
}
-QVariant Query::demarshal( const QDomElement &elem ) const
+TQVariant Query::demarshal( const TQDomElement &elem ) const
{
Q_ASSERT( elem.tagName().lower() == "value" );
- const QDomElement typeElement = elem.firstChild().toElement();
- const QString typeName = typeElement.tagName().lower();
+ const TQDomElement typeElement = elem.firstChild().toElement();
+ const TQString typeName = typeElement.tagName().lower();
if ( typeName == "string" )
- return QVariant( typeElement.text() );
+ return TQVariant( typeElement.text() );
else if ( typeName == "i4" || typeName == "int" )
- return QVariant( typeElement.text().toInt() );
+ return TQVariant( typeElement.text().toInt() );
else if ( typeName == "double" )
- return QVariant( typeElement.text().toDouble() );
+ return TQVariant( typeElement.text().toDouble() );
else if ( typeName == "boolean" )
{
if ( typeElement.text().lower() == "true" || typeElement.text() == "1" )
- return QVariant( true );
+ return TQVariant( true );
else
- return QVariant( false );
+ return TQVariant( false );
}
else if ( typeName == "base64" )
- return QVariant( KCodecs::base64Decode( typeElement.text().latin1() ) );
+ return TQVariant( KCodecs::base64Decode( typeElement.text().latin1() ) );
else if ( typeName == "datetime" || typeName == "datetime.iso8601" )
- return QVariant( QDateTime::fromString( typeElement.text(), Qt::ISODate ) );
+ return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) );
else if ( typeName == "array" )
{
- QValueList<QVariant> values;
- QDomNode valueNode = typeElement.firstChild().firstChild();
+ TQValueList<TQVariant> values;
+ TQDomNode valueNode = typeElement.firstChild().firstChild();
while ( !valueNode.isNull() )
{
values << demarshal( valueNode.toElement() );
valueNode = valueNode.nextSibling();
}
- return QVariant( values );
+ return TQVariant( values );
}
else if ( typeName == "struct" )
{
- QMap<QString, QVariant> map;
- QDomNode memberNode = typeElement.firstChild();
+ TQMap<TQString, TQVariant> map;
+ TQDomNode memberNode = typeElement.firstChild();
while ( !memberNode.isNull() )
{
- const QString key = memberNode.toElement().elementsByTagName( "name" ).item( 0 ).toElement().text();
- const QVariant data = demarshal( memberNode.toElement().elementsByTagName( "value" ).item( 0 ).toElement() );
+ const TQString key = memberNode.toElement().elementsByTagName( "name" ).item( 0 ).toElement().text();
+ const TQVariant data = demarshal( memberNode.toElement().elementsByTagName( "value" ).item( 0 ).toElement() );
map[ key ] = data;
memberNode = memberNode.nextSibling();
}
- return QVariant( map );
+ return TQVariant( map );
}
else
kdWarning() << "Cannot demarshal unknown type " << typeName << endl;
- return QVariant();
+ return TQVariant();
}
-Query::Query( const QVariant &id, QObject *parent, const char *name )
- : QObject( parent, name ), m_id( id )
+Query::Query( const TQVariant &id, TQObject *parent, const char *name )
+ : TQObject( parent, name ), m_id( id )
{}
Query::~Query()
{
- QValueList<KIO::Job*>::Iterator it;
+ TQValueList<KIO::Job*>::Iterator it;
for ( it = m_pendingJobs.begin(); it != m_pendingJobs.end(); ++it )
(*it)->kill();
}
-Server::Server( const KURL &url, QObject *parent, const char *name )
- : QObject( parent, name )
+Server::Server( const KURL &url, TQObject *parent, const char *name )
+ : TQObject( parent, name )
{
if ( url.isValid() )
m_url = url;
@@ -334,7 +334,7 @@ Server::Server( const KURL &url, QObject *parent, const char *name )
Server::~Server()
{
- QValueList<Query*>::Iterator it;
+ TQValueList<Query*>::Iterator it;
for ( it = mPendingQueries.begin(); it !=mPendingQueries.end(); ++it )
(*it)->deleteLater();
@@ -352,112 +352,112 @@ void Server::setUrl( const KURL &url )
m_url = url.isValid() ? url : KURL();
}
-void Server::call( const QString &method, const QValueList<QVariant> &args,
- QObject* msgObj, const char* messageSlot,
- QObject* faultObj, const char* faultSlot, const QVariant &id )
+void Server::call( const TQString &method, const TQValueList<TQVariant> &args,
+ TQObject* msgObj, const char* messageSlot,
+ TQObject* faultObj, const char* faultSlot, const TQVariant &id )
{
if ( m_url.isEmpty() )
kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl;
Query *query = Query::create( id, this );
- connect( query, SIGNAL( message( const QValueList<QVariant> &, const QVariant& ) ), msgObj, messageSlot );
- connect( query, SIGNAL( fault( int, const QString&, const QVariant& ) ), faultObj, faultSlot );
- connect( query, SIGNAL( finished( Query* ) ), this, SLOT( queryFinished( Query* ) ) );
+ 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* ) ) );
mPendingQueries.append( query );
query->call( m_url.url(), method, args, m_userAgent );
}
-void Server::call( const QString &method, const QVariant &arg,
- QObject* msgObj, const char* messageSlot,
- QObject* faultObj, const char* faultSlot,
- const QVariant &id )
+void Server::call( const TQString &method, const TQVariant &arg,
+ TQObject* msgObj, const char* messageSlot,
+ TQObject* faultObj, const char* faultSlot,
+ const TQVariant &id )
{
- QValueList<QVariant> args;
+ TQValueList<TQVariant> args;
args << arg ;
call( method, args, msgObj, messageSlot, faultObj, faultSlot, id );
}
-void Server::call( const QString &method, int arg,
- QObject* msgObj, const char* messageSlot,
- QObject* faultObj, const char* faultSlot,
- const QVariant &id )
+void Server::call( const TQString &method, int arg,
+ TQObject* msgObj, const char* messageSlot,
+ TQObject* faultObj, const char* faultSlot,
+ const TQVariant &id )
{
- QValueList<QVariant> args;
- args << QVariant( arg );
+ TQValueList<TQVariant> args;
+ args << TQVariant( arg );
call( method, args, msgObj, messageSlot, faultObj, faultSlot, id );
}
-void Server::call( const QString &method, bool arg,
- QObject* msgObj, const char* messageSlot,
- QObject* faultObj, const char* faultSlot,
- const QVariant &id )
+void Server::call( const TQString &method, bool arg,
+ TQObject* msgObj, const char* messageSlot,
+ TQObject* faultObj, const char* faultSlot,
+ const TQVariant &id )
{
- QValueList<QVariant> args;
- args << QVariant( arg );
+ TQValueList<TQVariant> args;
+ args << TQVariant( arg );
call( method, args, msgObj, messageSlot, faultObj, faultSlot, id );
}
-void Server::call( const QString &method, double arg ,
- QObject* msgObj, const char* messageSlot,
- QObject* faultObj, const char* faultSlot,
- const QVariant &id )
+void Server::call( const TQString &method, double arg ,
+ TQObject* msgObj, const char* messageSlot,
+ TQObject* faultObj, const char* faultSlot,
+ const TQVariant &id )
{
- QValueList<QVariant> args;
- args << QVariant( arg );
+ TQValueList<TQVariant> args;
+ args << TQVariant( arg );
call( method, args, msgObj, messageSlot, faultObj, faultSlot, id );
}
-void Server::call( const QString &method, const QString &arg ,
- QObject* msgObj, const char* messageSlot,
- QObject* faultObj, const char* faultSlot,
- const QVariant &id )
+void Server::call( const TQString &method, const TQString &arg ,
+ TQObject* msgObj, const char* messageSlot,
+ TQObject* faultObj, const char* faultSlot,
+ const TQVariant &id )
{
- QValueList<QVariant> args;
- args << QVariant( arg );
+ TQValueList<TQVariant> args;
+ args << TQVariant( arg );
call( method, args, msgObj, messageSlot, faultObj, faultSlot, id );
}
-void Server::call( const QString &method, const QCString &arg,
- QObject* msgObj, const char* messageSlot,
- QObject* faultObj, const char* faultSlot,
- const QVariant &id )
+void Server::call( const TQString &method, const TQCString &arg,
+ TQObject* msgObj, const char* messageSlot,
+ TQObject* faultObj, const char* faultSlot,
+ const TQVariant &id )
{
- QValueList<QVariant> args;
- args << QVariant( arg );
+ TQValueList<TQVariant> args;
+ args << TQVariant( arg );
call( method, args, msgObj, messageSlot, faultObj, faultSlot, id );
}
-void Server::call( const QString &method, const QByteArray &arg ,
- QObject* msgObj, const char* messageSlot,
- QObject* faultObj, const char* faultSlot,
- const QVariant &id )
+void Server::call( const TQString &method, const TQByteArray &arg ,
+ TQObject* msgObj, const char* messageSlot,
+ TQObject* faultObj, const char* faultSlot,
+ const TQVariant &id )
{
- QValueList<QVariant> args;
- args << QVariant( arg );
+ TQValueList<TQVariant> args;
+ args << TQVariant( arg );
call( method, args, faultObj, faultSlot, msgObj, messageSlot, id );
}
-void Server::call( const QString &method, const QDateTime &arg,
- QObject* msgObj, const char* messageSlot,
- QObject* faultObj, const char* faultSlot,
- const QVariant &id )
+void Server::call( const TQString &method, const TQDateTime &arg,
+ TQObject* msgObj, const char* messageSlot,
+ TQObject* faultObj, const char* faultSlot,
+ const TQVariant &id )
{
- QValueList<QVariant> args;
- args << QVariant( arg );
+ TQValueList<TQVariant> args;
+ args << TQVariant( arg );
call( method, args, msgObj, messageSlot, faultObj, faultSlot, id );
}
-void Server::call( const QString &method, const QStringList &arg,
- QObject* msgObj, const char* messageSlot,
- QObject* faultObj, const char* faultSlot,
- const QVariant &id )
+void Server::call( const TQString &method, const TQStringList &arg,
+ TQObject* msgObj, const char* messageSlot,
+ TQObject* faultObj, const char* faultSlot,
+ const TQVariant &id )
{
- QValueList<QVariant> args;
- QStringList::ConstIterator it = arg.begin();
- QStringList::ConstIterator end = arg.end();
+ TQValueList<TQVariant> args;
+ TQStringList::ConstIterator it = arg.begin();
+ TQStringList::ConstIterator end = arg.end();
for ( ; it != end; ++it )
- args << QVariant( *it );
+ args << TQVariant( *it );
call( method, args, msgObj, messageSlot, faultObj, faultSlot, id );
}
diff --git a/kresources/egroupware/xmlrpciface.h b/kresources/egroupware/xmlrpciface.h
index 0e5f6c927..a1460c21c 100644
--- a/kresources/egroupware/xmlrpciface.h
+++ b/kresources/egroupware/xmlrpciface.h
@@ -12,11 +12,11 @@
#include <kurl.h>
-#include <qbuffer.h>
-#include <qdom.h>
-#include <qobject.h>
-#include <qvariant.h>
-#include <qvaluelist.h>
+#include <tqbuffer.h>
+#include <tqdom.h>
+#include <tqobject.h>
+#include <tqvariant.h>
+#include <tqvaluelist.h>
namespace KIO
{
@@ -36,42 +36,42 @@ namespace KXMLRPC
public:
- static Query *create( const QVariant &id = QVariant(),
- QObject *parent = 0, const char *name = 0 );
+ static Query *create( const TQVariant &id = TQVariant(),
+ TQObject *parent = 0, const char *name = 0 );
public slots:
- void call( const QString &server, const QString &method,
- const QValueList<QVariant> &args = QValueList<QVariant>(),
- const QString &userAgent = "KDE-XMLRPC" );
+ void call( const TQString &server, const TQString &method,
+ const TQValueList<TQVariant> &args = TQValueList<TQVariant>(),
+ const TQString &userAgent = "KDE-XMLRPC" );
signals:
- void message( const QValueList<QVariant> &result, const QVariant &id );
- void fault( int, const QString&, const QVariant &id );
+ void message( const TQValueList<TQVariant> &result, const TQVariant &id );
+ void fault( int, const TQString&, const TQVariant &id );
void finished( Query* );
private slots:
- void slotData( KIO::Job *job, const QByteArray &data );
+ void slotData( KIO::Job *job, const TQByteArray &data );
void slotResult( KIO::Job *job );
private:
- bool isMessageResponse( const QDomDocument &doc ) const;
- bool isFaultResponse( const QDomDocument &doc ) const;
+ bool isMessageResponse( const TQDomDocument &doc ) const;
+ bool isFaultResponse( const TQDomDocument &doc ) const;
- Result parseMessageResponse( const QDomDocument &doc ) const;
- Result parseFaultResponse( const QDomDocument &doc ) const;
+ Result parseMessageResponse( const TQDomDocument &doc ) const;
+ Result parseFaultResponse( const TQDomDocument &doc ) const;
- QString markupCall( const QString &method,
- const QValueList<QVariant> &args ) const;
- QString marshal( const QVariant &v ) const;
- QVariant demarshal( const QDomElement &e ) const;
+ TQString markupCall( const TQString &method,
+ const TQValueList<TQVariant> &args ) const;
+ TQString marshal( const TQVariant &v ) const;
+ TQVariant demarshal( const TQDomElement &e ) const;
- Query( const QVariant &id, QObject *parent = 0, const char *name = 0 );
+ Query( const TQVariant &id, TQObject *parent = 0, const char *name = 0 );
~Query();
- QByteArray m_buffer;
- QVariant m_id;
+ TQByteArray m_buffer;
+ TQVariant m_id;
- QValueList<KIO::Job*> m_pendingJobs;
+ TQValueList<KIO::Job*> m_pendingJobs;
};
class Server : public QObject
@@ -79,85 +79,85 @@ namespace KXMLRPC
Q_OBJECT
public:
Server( const KURL &url = KURL(),
- QObject *parent = 0, const char *name = 0 );
+ TQObject *parent = 0, const char *name = 0 );
~Server();
const KURL &url() const { return m_url; }
void setUrl( const KURL &url );
- QString userAgent() const { return m_userAgent; }
- void setUserAgent( const QString &userAgent ) { m_userAgent = userAgent; }
+ TQString userAgent() const { return m_userAgent; }
+ void setUserAgent( const TQString &userAgent ) { m_userAgent = userAgent; }
template <typename T>
- void call( const QString &method, const QValueList<T> &arg,
- QObject* obj1, const char* faultSlot,
- QObject* obj2, const char* messageSlot, const QVariant &id = QVariant() );
+ void call( const TQString &method, const TQValueList<T> &arg,
+ TQObject* obj1, const char* faultSlot,
+ TQObject* obj2, const char* messageSlot, const TQVariant &id = TQVariant() );
public slots:
- void call( const QString &method, const QValueList<QVariant> &args,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot,
- const QVariant &id = QVariant() );
- void call( const QString &method, const QVariant &arg,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot,
- const QVariant &id = QVariant() );
- void call( const QString &method, int arg ,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot,
- const QVariant &id = QVariant() );
- void call( const QString &method, bool arg,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot,
- const QVariant &id = QVariant() );
- void call( const QString &method, double arg,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot,
- const QVariant &id = QVariant() );
- void call( const QString &method, const QString &arg,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot,
- const QVariant &id = QVariant() );
- void call( const QString &method, const QCString &arg ,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot,
- const QVariant &id = QVariant() );
- void call( const QString &method, const QByteArray &arg,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot,
- const QVariant &id = QVariant() );
- void call( const QString &method, const QDateTime &arg,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot,
- const QVariant &id = QVariant() );
- void call( const QString &method, const QStringList &arg,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot,
- const QVariant &id = QVariant() );
+ void call( const TQString &method, const TQValueList<TQVariant> &args,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot,
+ const TQVariant &id = TQVariant() );
+ void call( const TQString &method, const TQVariant &arg,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot,
+ const TQVariant &id = TQVariant() );
+ void call( const TQString &method, int arg ,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot,
+ const TQVariant &id = TQVariant() );
+ void call( const TQString &method, bool arg,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot,
+ const TQVariant &id = TQVariant() );
+ void call( const TQString &method, double arg,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot,
+ const TQVariant &id = TQVariant() );
+ void call( const TQString &method, const TQString &arg,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot,
+ const TQVariant &id = TQVariant() );
+ void call( const TQString &method, const TQCString &arg ,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot,
+ const TQVariant &id = TQVariant() );
+ void call( const TQString &method, const TQByteArray &arg,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot,
+ const TQVariant &id = TQVariant() );
+ void call( const TQString &method, const TQDateTime &arg,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot,
+ const TQVariant &id = TQVariant() );
+ void call( const TQString &method, const TQStringList &arg,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot,
+ const TQVariant &id = TQVariant() );
private slots:
void queryFinished( Query* );
private:
KURL m_url;
- QString m_userAgent;
+ TQString m_userAgent;
- QValueList<Query*> mPendingQueries;
+ TQValueList<Query*> mPendingQueries;
};
}
template <typename T>
-void KXMLRPC::Server::call( const QString &method, const QValueList<T> &arg,
- QObject* faultObj, const char* faultSlot,
- QObject* msgObj, const char* messageSlot, const QVariant &id )
+void KXMLRPC::Server::call( const TQString &method, const TQValueList<T> &arg,
+ TQObject* faultObj, const char* faultSlot,
+ TQObject* msgObj, const char* messageSlot, const TQVariant &id )
{
- QValueList<QVariant> args;
+ TQValueList<TQVariant> args;
- typename QValueList<T>::ConstIterator it = arg.begin();
- typename QValueList<T>::ConstIterator end = arg.end();
+ typename TQValueList<T>::ConstIterator it = arg.begin();
+ typename TQValueList<T>::ConstIterator end = arg.end();
for ( ; it != end; ++it )
- args << QVariant( *it );
+ args << TQVariant( *it );
return call( method, args, faultObj, faultSlot, msgObj, messageSlot, id );
}
diff --git a/kresources/exchange/dateset.cpp b/kresources/exchange/dateset.cpp
index f79810960..a2372c874 100644
--- a/kresources/exchange/dateset.cpp
+++ b/kresources/exchange/dateset.cpp
@@ -20,9 +20,9 @@
// $Id$
-#include <qptrlist.h>
-#include <qdatetime.h>
-#include <qpair.h>
+#include <tqptrlist.h>
+#include <tqdatetime.h>
+#include <tqpair.h>
#include <kdebug.h>
@@ -42,34 +42,34 @@ DateSet::~DateSet()
delete mDates;
}
-void DateSet::add( QDate const& date )
+void DateSet::add( TQDate const& date )
{
if (mDates->isEmpty()) {
- mDates->insert( 0, new QPair<QDate,QDate>( date, date ) );
+ mDates->insert( 0, new QPair<TQDate,TQDate>( date, date ) );
return;
}
int i = find( date );
- mDates->insert( i, new QPair<QDate,QDate>( date, date ) );
+ mDates->insert( i, new QPair<TQDate,TQDate>( date, date ) );
tryMerge( i );
tryMerge( i-1 );
}
-void DateSet::add( QDate const& from, QDate const& to )
+void DateSet::add( TQDate const& from, TQDate const& to )
{
if (mDates->isEmpty()) {
- mDates->insert( 0, new QPair<QDate,QDate>( from, to ) );
+ mDates->insert( 0, new QPair<TQDate,TQDate>( from, to ) );
return;
}
uint i = find( from );
kdDebug() << "Adding range at position " << i << endl;
- mDates->insert( i, new QPair<QDate,QDate>( from, to ) );
+ mDates->insert( i, new QPair<TQDate,TQDate>( from, to ) );
do {
} while ( tryMerge( i ) );
do {
} while ( tryMerge( i-1 ) );
/*
- QPair<QDate,QDate>* item = mDates->at( i );
+ QPair<TQDate,TQDate>* item = mDates->at( i );
if (to >= item->first)
return;
@@ -77,11 +77,11 @@ void DateSet::add( QDate const& from, QDate const& to )
if (to.daysTo( item->first ) == 1 )
item->first = from;
else
- mDates->insert( i, new QPair<QDate,QDate>( from, to ) );
+ mDates->insert( i, new QPair<TQDate,TQDate>( from, to ) );
*/
}
-void DateSet::remove( QDate const& date )
+void DateSet::remove( TQDate const& date )
{
if (mDates->isEmpty()) {
return;
@@ -91,7 +91,7 @@ void DateSet::remove( QDate const& date )
if ( i == mDates->count() )
return;
- QPair<QDate,QDate>* item = mDates->at( i );
+ QPair<TQDate,TQDate>* item = mDates->at( i );
if ( date < item->first )
return;
if ( date == item->first ) {
@@ -106,12 +106,12 @@ void DateSet::remove( QDate const& date )
if ( date == item->second ) {
item->second = item->second.addDays( -1 );
} else {
- mDates->insert( i, new QPair<QDate,QDate>(item->first, date.addDays( -1 ) ) );
+ mDates->insert( i, new QPair<TQDate,TQDate>(item->first, date.addDays( -1 ) ) );
item->first = date.addDays( 1 );
}
}
-void DateSet::remove( QDate const& from, QDate const& to )
+void DateSet::remove( TQDate const& from, TQDate const& to )
{
if (mDates->isEmpty()) {
return;
@@ -122,7 +122,7 @@ void DateSet::remove( QDate const& from, QDate const& to )
return;
while( i < mDates->count() ) {
- QPair<QDate,QDate>* item = mDates->at( i );
+ QPair<TQDate,TQDate>* item = mDates->at( i );
// Check if we're done: next item is later dan removal period
if ( to < item->first )
break;
@@ -136,7 +136,7 @@ void DateSet::remove( QDate const& from, QDate const& to )
// Check if we should take a slice out of the middle of the item
if ( from > item->first && to < item->second ) {
- mDates->insert( i, new QPair<QDate,QDate>( item->first, from.addDays( -1 ) ) );
+ mDates->insert( i, new QPair<TQDate,TQDate>( item->first, from.addDays( -1 ) ) );
item->first = to.addDays( 1 );
break; // We're done
}
@@ -155,7 +155,7 @@ void DateSet::remove( QDate const& from, QDate const& to )
}
}
-bool DateSet::contains( QDate const& date )
+bool DateSet::contains( TQDate const& date )
{
if (mDates->isEmpty()) {
return false;
@@ -166,13 +166,13 @@ bool DateSet::contains( QDate const& date )
if ( i == mDates->count() )
return false;
- QPair<QDate,QDate>* item = mDates->at( i );
+ QPair<TQDate,TQDate>* item = mDates->at( i );
// kdDebug() << "contains looking at range " << item->first.toString() << " -- " << item->second.toString() << endl;
return ( item->first <= date );
}
// returns true if and only if the whole range is in the set
-bool DateSet::contains( QDate const& from, QDate const& to )
+bool DateSet::contains( TQDate const& from, TQDate const& to )
{
if (mDates->isEmpty()) {
return false;
@@ -182,7 +182,7 @@ bool DateSet::contains( QDate const& from, QDate const& to )
if ( i == mDates->count() )
return false;
- QPair<QDate,QDate>* item = mDates->at( i );
+ QPair<TQDate,TQDate>* item = mDates->at( i );
return ( from >= item->first && to <= item->second );
}
@@ -192,7 +192,7 @@ bool DateSet::contains( QDate const& from, QDate const& to )
// If mDates is empty, return 0.
// If date is later than the last item in mDates, return mDates->count()
-int DateSet::find( QDate const& date )
+int DateSet::find( TQDate const& date )
{
if ( mDates->isEmpty() )
return 0;
@@ -202,7 +202,7 @@ int DateSet::find( QDate const& date )
while ( start < end ) {
int i = start + (end-start) / 2;
// kdDebug() << start << ", " << i << ", " << end << endl;
- QPair<QDate,QDate> *item = mDates->at( i );
+ QPair<TQDate,TQDate> *item = mDates->at( i );
if ( item->first <= date && date <= item->second )
return i;
if ( date > item->second ) {
@@ -229,8 +229,8 @@ void DateSet::print()
{
for( uint i=0; i<mDates->count(); i++ )
{
- QDate start = mDates->at( i )->first;
- QDate end = mDates->at( i )->second;
+ TQDate start = mDates->at( i )->first;
+ TQDate end = mDates->at( i )->second;
if (start == end)
kdDebug() << start.toString() << endl;
else
@@ -246,8 +246,8 @@ bool DateSet::tryMerge( int i )
if ( i < 0 || i+1 >= (int)(mDates->count()) )
return false;
- QPair<QDate,QDate>* item1 = mDates->at( i );
- QPair<QDate,QDate>* item2 = mDates->at( i+1 );
+ QPair<TQDate,TQDate>* item1 = mDates->at( i );
+ QPair<TQDate,TQDate>* item2 = mDates->at( i+1 );
// First case: item1 starts before or on the same date as item2
if ( item1->first <= item2->first ) {
diff --git a/kresources/exchange/dateset.h b/kresources/exchange/dateset.h
index 5041f0d58..989d774cb 100644
--- a/kresources/exchange/dateset.h
+++ b/kresources/exchange/dateset.h
@@ -23,34 +23,34 @@
#ifndef _DATESET_H
#define _DATESET_H
-#include <qdatetime.h>
-#include <qpair.h>
-#include <qptrlist.h>
+#include <tqdatetime.h>
+#include <tqpair.h>
+#include <tqptrlist.h>
/*
class DateRange {
public:
DateRange() { }
- DateRange( QDate const& from, QDate const& to )
+ DateRange( TQDate const& from, TQDate const& to )
: mFrom( from ), mTo( to ) { }
bool operator< ( const DateRange& r ) { return mFrom < r.from(); }
- bool contains( QDate const& d ) { return ( mFrom <= d && d <= mTo ); }
- bool contains( QDate const& from, QDate const& to ) { return ( mFrom <= from && to <= mTo ); }
+ bool contains( TQDate const& d ) { return ( mFrom <= d && d <= mTo ); }
+ bool contains( TQDate const& from, TQDate const& to ) { return ( mFrom <= from && to <= mTo ); }
- QDate from() { return mFrom; }
- QDate to() { return mTo; }
+ TQDate from() { return mFrom; }
+ TQDate to() { return mTo; }
private:
- QDate mFrom;
- QDate mTo;
+ TQDate mFrom;
+ TQDate mTo;
}
*/
-class RangeList : public QPtrList< QPair<QDate, QDate> > {
+class RangeList : public TQPtrList< QPair<TQDate, TQDate> > {
protected:
- virtual int compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2) {
- QPair<QDate,QDate> *i1 = static_cast<QPair<QDate,QDate> *> (item1);
- QPair<QDate,QDate> *i2 = static_cast<QPair<QDate,QDate> *> (item2);
+ virtual int compareItems(TQPtrCollection::Item item1, TQPtrCollection::Item item2) {
+ QPair<TQDate,TQDate> *i1 = static_cast<QPair<TQDate,TQDate> *> (item1);
+ QPair<TQDate,TQDate> *i2 = static_cast<QPair<TQDate,TQDate> *> (item2);
if ( *i1 < *i2 ) return -1;
if ( *i2 < *i1 ) return 1;
return 0;
@@ -62,17 +62,17 @@ class DateSet {
DateSet();
~DateSet();
- void add( QDate const& date );
- void add( QDate const& from, QDate const& to );
+ void add( TQDate const& date );
+ void add( TQDate const& from, TQDate const& to );
- void remove( QDate const& date );
- void remove( QDate const& from, QDate const& to );
+ void remove( TQDate const& date );
+ void remove( TQDate const& from, TQDate const& to );
- bool contains( QDate const& date );
+ bool contains( TQDate const& date );
// returns true if and only if the whole range is in the set
- bool contains( QDate const& from, QDate const& to );
+ bool contains( TQDate const& from, TQDate const& to );
- int find( QDate const &date );
+ int find( TQDate const &date );
void print();
protected:
@@ -80,8 +80,8 @@ class DateSet {
bool tryMerge( int i );
RangeList *mDates;
- QDate mOldestDate;
- QDate mNewestDate;
+ TQDate mOldestDate;
+ TQDate mNewestDate;
};
#endif
diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp
index 355244922..8e877f9b0 100644
--- a/kresources/exchange/resourceexchange.cpp
+++ b/kresources/exchange/resourceexchange.cpp
@@ -20,11 +20,11 @@
#include <stdlib.h>
-#include <qdatetime.h>
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qwidgetlist.h>
-#include <qwidget.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
+#include <tqwidgetlist.h>
+#include <tqwidget.h>
#include <kdebug.h>
#include <kapplication.h>
@@ -78,7 +78,7 @@ ResourceExchange::ResourceExchange( const KConfig *config )
{
mLock = new KABC::LockNull( true );
- mTimeZoneId = QString::fromLatin1( "UTC" );
+ mTimeZoneId = TQString::fromLatin1( "UTC" );
kdDebug() << "Creating ResourceExchange" << endl;
if (config ) {
@@ -122,31 +122,31 @@ bool ResourceExchange::doOpen()
kdDebug() << "ResourceExchange::doOpen()" << endl;
mClient = new ExchangeClient( mAccount, mTimeZoneId );
- connect( mClient, SIGNAL( downloadFinished( int, const QString & ) ),
- SLOT( slotDownloadFinished( int, const QString & ) ) );
- connect( mClient, SIGNAL( event( KCal::Event *, const KURL & ) ),
- SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) );
+ 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 & ) ) );
#if 0
kdDebug() << "Creating monitor" << endl;
- QHostAddress ip;
+ TQHostAddress ip;
ip.setAddress( mAccount->host() );
mMonitor = new ExchangeMonitor( mAccount, ExchangeMonitor::CallBack, ip );
- connect( mMonitor, SIGNAL(notify( const QValueList<long>& , const QValueList<KURL>& )), this, SLOT(slotMonitorNotify( const QValueList<long>& , const QValueList<KURL>& )) );
- connect( mMonitor, SIGNAL(error(int , const QString&)), this, SLOT(slotMonitorError(int , const QString&)) );
+ 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&)) );
mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 );
#endif
- QWidgetList* widgets = QApplication::topLevelWidgets();
+ TQWidgetList* widgets = TQApplication::topLevelWidgets();
if ( !widgets->isEmpty() )
mClient->setWindow( widgets->first() );
delete widgets;
mDates = new DateSet();
- mEventDates = new QMap<Event,QDateTime>();
- mCacheDates = new QMap<QDate, QDateTime>();
+ mEventDates = new TQMap<Event,TQDateTime>();
+ mCacheDates = new TQMap<TQDate, TQDateTime>();
mCache = new CalendarLocal( mTimeZoneId );
// mOldestDate = 0L;
@@ -207,20 +207,20 @@ KABC::Lock *ResourceExchange::lock()
return mLock;
}
-void ResourceExchange::slotMonitorNotify( const QValueList<long>& IDs, const QValueList<KURL>& urls )
+void ResourceExchange::slotMonitorNotify( const TQValueList<long>& IDs, const TQValueList<KURL>& urls )
{
kdDebug() << "ResourceExchange::slotMonitorNotify()" << endl;
- QString result;
+ TQString result;
KPIM::ExchangeMonitor::IDList::ConstIterator it;
for ( it = IDs.begin(); it != IDs.end(); ++it ) {
if ( it == IDs.begin() )
- result += QString::number( (*it) );
+ result += TQString::number( (*it) );
else
- result += "," + QString::number( (*it) );
+ result += "," + TQString::number( (*it) );
}
kdDebug() << "Got signals for " << result << endl;
- QValueList<KURL>::ConstIterator it2;
+ TQValueList<KURL>::ConstIterator it2;
for ( it2 = urls.begin(); it2 != urls.end(); ++it2 ) {
kdDebug() << "URL: " << (*it2).prettyURL() << endl;
}
@@ -242,7 +242,7 @@ void ResourceExchange::slotMonitorNotify( const QValueList<long>& IDs, const QVa
*/
}
-void ResourceExchange::slotMonitorError( int errorCode, const QString& moreInfo )
+void ResourceExchange::slotMonitorError( int errorCode, const TQString& moreInfo )
{
kdError() << "Ignoring error from Exchange monitor, code=" << errorCode << "; more info: " << moreInfo << endl;
}
@@ -295,7 +295,7 @@ void ResourceExchange::changeIncidence( Incidence *incidence )
}
}
-Event *ResourceExchange::event( const QString &uid )
+Event *ResourceExchange::event( const TQString &uid )
{
kdDebug(5800) << "ResourceExchange::event(): " << uid << endl;
@@ -306,7 +306,7 @@ Event *ResourceExchange::event( const QString &uid )
return event;
}
-void ResourceExchange::subscribeEvents( const QDate &start, const QDate &end )
+void ResourceExchange::subscribeEvents( const TQDate &start, const TQDate &end )
{
kdDebug(5800) << "ResourceExchange::subscribeEvents()" << endl;
// FIXME: possible race condition if several subscribe events are run close
@@ -325,7 +325,7 @@ void ResourceExchange::downloadedEvent( KCal::Event *event, const KURL &url )
}
void ResourceExchange::slotDownloadFinished( int result,
- const QString &moreinfo )
+ const TQString &moreinfo )
{
kdDebug() << "ResourceExchange::downloadFinished" << endl;
@@ -336,7 +336,7 @@ void ResourceExchange::slotDownloadFinished( int result,
}
}
-void ResourceExchange::unsubscribeEvents( const QDate &/*start*/, const QDate &/*end*/ )
+void ResourceExchange::unsubscribeEvents( const TQDate &/*start*/, const TQDate &/*end*/ )
{
kdDebug() << "ResourceExchange::unsubscribeEvents()" << endl;
}
@@ -376,7 +376,7 @@ Todo::List ResourceExchange::rawTodos( TodoSortField /*sortField*/, SortDirectio
return list;*/
}
-Todo *ResourceExchange::todo( const QString &/*uid*/ )
+Todo *ResourceExchange::todo( const TQString &/*uid*/ )
{
// We don't handle todos yet
return 0;
@@ -386,7 +386,7 @@ Todo *ResourceExchange::todo( const QString &/*uid*/ )
return mCache->todo( uid );*/
}
-Todo::List ResourceExchange::rawTodosForDate( const QDate &/*date*/ )
+Todo::List ResourceExchange::rawTodosForDate( const TQDate &/*date*/ )
{
Todo::List list;
// We don't handle todos yet
@@ -395,7 +395,7 @@ Todo::List ResourceExchange::rawTodosForDate( const QDate &/*date*/ )
return list;
}
-Alarm::List ResourceExchange::alarmsTo( const QDateTime &to )
+Alarm::List ResourceExchange::alarmsTo( const TQDateTime &to )
{
Alarm::List list;
if ( mCache )
@@ -404,13 +404,13 @@ Alarm::List ResourceExchange::alarmsTo( const QDateTime &to )
}
/* Invoked by korgac when checking alarms. Always updates the cache. */
-Alarm::List ResourceExchange::alarms( const QDateTime &from, const QDateTime &to )
+Alarm::List ResourceExchange::alarms( const TQDateTime &from, const TQDateTime &to )
{
kdDebug(5800) << "ResourceExchange::alarms(" << from.toString() << " - " << to.toString() << ")\n";
Alarm::List list;
- QDate start = from.date();
- QDate end = to.date();
+ TQDate start = from.date();
+ TQDate end = to.date();
if ( mCache ) {
@@ -453,22 +453,22 @@ void ResourceExchange::insertEvent(const Event *anEvent)
}
*/
-// taking a QDate, this function will look for an eventlist in the dict
+// taking a TQDate, this function will look for an eventlist in the dict
// with that date attached -
-Event::List ResourceExchange::rawEventsForDate( const QDate &qd,
+Event::List ResourceExchange::rawEventsForDate( const TQDate &qd,
EventSortField sortField,
SortDirection sortDirection )
{
if (!mCache) return Event::List();
// If the events for this date are not in the cache, or if they are old,
// get them again
- QDateTime now = QDateTime::currentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
// kdDebug() << "Now is " << now.toString() << endl;
// kdDebug() << "mDates: " << mDates << endl;
- QDate start = QDate( qd.year(), qd.month(), 1 ); // First day of month
+ TQDate start = TQDate( qd.year(), qd.month(), 1 ); // First day of month
if ( mDates && ( !mDates->contains( start ) ||
(*mCacheDates)[start].secsTo( now ) > mCachedSeconds ) ) {
- QDate end = start.addMonths( 1 ).addDays( -1 ); // Last day of month
+ TQDate end = start.addMonths( 1 ).addDays( -1 ); // Last day of month
// Get events that occur in this period from the cache
Event::List oldEvents = mCache->rawEvents( start, end, false );
// And remove them all
@@ -509,7 +509,7 @@ Event::List ResourceExchange::rawEventsForDate( const QDate &qd,
}
-Event::List ResourceExchange::rawEvents( const QDate &start, const QDate &end,
+Event::List ResourceExchange::rawEvents( const TQDate &start, const TQDate &end,
bool inclusive )
{
kdDebug() << "ResourceExchange::rawEvents(start,end,inclusive)" << endl;
@@ -517,7 +517,7 @@ Event::List ResourceExchange::rawEvents( const QDate &start, const QDate &end,
return mCache->rawEvents( start, end, inclusive );
}
-Event::List ResourceExchange::rawEventsForDate(const QDateTime &qdt)
+Event::List ResourceExchange::rawEventsForDate(const TQDateTime &qdt)
{
kdDebug() << "ResourceExchange::rawEventsForDate(qdt)" << endl;
return rawEventsForDate( qdt.date() );
@@ -556,7 +556,7 @@ bool ResourceExchange::deleteJournal(Journal */*journal*/)
// setModified( true );
}
-Journal::List ResourceExchange::journals(const QDate &/*date*/)
+Journal::List ResourceExchange::journals(const TQDate &/*date*/)
{
// We don't handle journals yet
return Journal::List();
@@ -566,7 +566,7 @@ Journal::List ResourceExchange::journals(const QDate &/*date*/)
return list;*/
}
-Journal *ResourceExchange::journal(const QString &/*uid*/)
+Journal *ResourceExchange::journal(const TQString &/*uid*/)
{
// We don't handle journals yet
return 0;
@@ -585,7 +585,7 @@ Journal::List ResourceExchange::rawJournals( JournalSortField /*sortField*/, Sor
return list;*/
}
-Journal::List ResourceExchange::rawJournalsForDate( const QDate &/*date*/ )
+Journal::List ResourceExchange::rawJournalsForDate( const TQDate &/*date*/ )
{
// We don't handle journals yet
return Journal::List();
@@ -595,7 +595,7 @@ Journal::List ResourceExchange::rawJournalsForDate( const QDate &/*date*/ )
return list;*/
}
-void ResourceExchange::setTimeZoneId( const QString &tzid )
+void ResourceExchange::setTimeZoneId( const TQString &tzid )
{
mTimeZoneId = tzid;
if ( mCache ) mCache->setTimeZoneId( tzid );
diff --git a/kresources/exchange/resourceexchange.h b/kresources/exchange/resourceexchange.h
index 721e36660..d3492cf00 100644
--- a/kresources/exchange/resourceexchange.h
+++ b/kresources/exchange/resourceexchange.h
@@ -20,9 +20,9 @@
#ifndef KPIM_EXCHANGECALENDAR_H
#define KPIM_EXCHANGECALENDAR_H
-#include <qmap.h>
-#include <qdict.h>
-#include <qintdict.h>
+#include <tqmap.h>
+#include <tqdict.h>
+#include <tqintdict.h>
#include <libkcal/calendar.h>
#include <libkcal/calendarlocal.h>
@@ -60,7 +60,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
/** constructs a new calendar, with variables initialized to sane values. */
// ExchangeCalendar( KPIM::ExchangeAccount* account );
/** constructs a new calendar, with variables initialized to sane values. */
-// ExchangeCalendar( KPIM::ExchangeAccount* account, const QString &timeZoneId );
+// ExchangeCalendar( KPIM::ExchangeAccount* account, const TQString &timeZoneId );
// virtual ~ExchangeCalendar();
/**
@@ -70,14 +70,14 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
@return true, if successful, false on error.
@param fileName the name of the calendar on disk.
*/
-// bool load( const QString &fileName );
+// bool load( const TQString &fileName );
/**
Writes out the calendar to disk in the specified \a format.
ExchangeCalendar takes ownership of the CalFormat object.
@return true, if successful, false on error.
@param fileName the name of the file
*/
-// bool save( const QString &fileName, CalFormat *format = 0 );
+// bool save( const TQString &fileName, CalFormat *format = 0 );
/** clears out the current calendar, freeing all used memory etc. etc. */
// void close();
@@ -93,7 +93,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
/**
Retrieves an event on the basis of the unique string ID.
*/
- Event *event(const QString &UniqueStr);
+ Event *event(const TQString &UniqueStr);
/**
Return filtered list of all events in calendar.
*/
@@ -104,7 +104,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
*/
Event::List rawEvents();
- virtual void subscribeEvents( const QDate& start, const QDate& end );
+ virtual void subscribeEvents( const TQDate& start, const TQDate& end );
/**
Stop receiving event signals for the given period (inclusive). After this call,
@@ -113,7 +113,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
MAY delete the Events objects. The application MUST NOT dereference pointers
to the relevant Events after this call.
*/
- virtual void unsubscribeEvents( const QDate& start, const QDate& end );
+ virtual void unsubscribeEvents( const TQDate& start, const TQDate& end );
/**
Add a todo to the todolist.
@@ -127,7 +127,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
Searches todolist for an event with this unique string identifier,
returns a pointer or null.
*/
- Todo *todo( const QString &uid );
+ Todo *todo( const TQString &uid );
/**
Return list of all todos.
*/
@@ -135,26 +135,26 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
/**
Returns list of todos due on the specified date.
*/
- Todo::List rawTodosForDate( const QDate &date );
+ Todo::List rawTodosForDate( const TQDate &date );
/** Add a Journal entry to calendar */
virtual bool addJournal(Journal *);
/** deletes an event from this calendar. */
virtual bool deleteJournal(Journal *);
/** Return Journals for given date */
- virtual Journal::List journals(const QDate &);
+ virtual Journal::List journals(const TQDate &);
/** Return Journal with given UID */
- virtual Journal *journal(const QString &UID);
+ virtual Journal *journal(const TQString &UID);
/** Return list of all Journals stored in calendar */
Journal::List rawJournals( JournalSortField sortField = JournalSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
/** Return journals for the given date. */
- Journal::List rawJournalsForDate( const QDate & );
+ Journal::List rawJournalsForDate( const TQDate & );
/** Return all alarms, which ocur in the given time interval. */
- Alarm::List alarms( const QDateTime &from, const QDateTime &to );
+ Alarm::List alarms( const TQDateTime &from, const TQDateTime &to );
/** Return all alarms, which ocur before given date. */
- Alarm::List alarmsTo( const QDateTime &to );
+ Alarm::List alarmsTo( const TQDateTime &to );
friend class ResourceExchangeConfig;
@@ -178,19 +178,19 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
date specified. useful for dayView, etc. etc.
*/
Event::List rawEventsForDate(
- const QDate &date,
+ const TQDate &date,
EventSortField sortField=EventSortUnsorted,
SortDirection sortDirection=SortDirectionAscending );
/**
Get unfiltered events for date \a qdt.
*/
- Event::List rawEventsForDate( const QDateTime &qdt );
+ Event::List rawEventsForDate( const TQDateTime &qdt );
/**
Get unfiltered events in a range of dates. If inclusive is set to true,
only events are returned, which are completely included in the range.
*/
- Event::List rawEvents( const QDate &start, const QDate &end,
+ Event::List rawEvents( const TQDate &start, const TQDate &end,
bool inclusive = false );
/**
Get unfiltered events in sorted order.
@@ -206,20 +206,20 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
/** Append alarms of incidence in interval to list of alarms. */
// void appendAlarms( Alarm::List &alarms, Incidence *incidence,
-// const QDateTime &from, const QDateTime &to );
+// const TQDateTime &from, const TQDateTime &to );
/** Append alarms of recurring events in interval to list of alarms. */
// void appendRecurringAlarms( Alarm::List &alarms, Incidence *incidence,
-// const QDateTime &from, const QDateTime &to );
+// const TQDateTime &from, const TQDateTime &to );
bool uploadEvent( Event *event );
- void setTimeZoneId( const QString &tzid );
+ void setTimeZoneId( const TQString &tzid );
protected slots:
- void slotMonitorNotify( const QValueList<long>& IDs, const QValueList<KURL>& urls);
- void slotMonitorError( int errorCode, const QString& moreInfo );
- void slotDownloadFinished( int result, const QString& moreinfo );
+ void slotMonitorNotify( const TQValueList<long>& IDs, const TQValueList<KURL>& urls);
+ void slotMonitorError( int errorCode, const TQString& moreInfo );
+ void slotDownloadFinished( int result, const TQString& moreinfo );
void downloadedEvent( KCal::Event*, const KURL& );
private:
@@ -228,14 +228,14 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
KPIM::ExchangeClient* mClient;
KPIM::ExchangeMonitor* mMonitor;
CalendarLocal* mCache;
- QDict<EventInfo> mEventDict; // maps UIDS to EventInfo records
- QIntDict<EventInfo> mWatchDict; // maps Watch IDs to EventInfo records
+ TQDict<EventInfo> mEventDict; // maps UIDS to EventInfo records
+ TQIntDict<EventInfo> mWatchDict; // maps Watch IDs to EventInfo records
DateSet* mDates;
- QMap<Event, QDateTime>* mEventDates;
- QMap<QDate, QDateTime>* mCacheDates;
+ TQMap<Event, TQDateTime>* mEventDates;
+ TQMap<TQDate, TQDateTime>* mCacheDates;
int mCachedSeconds;
bool mAutoMailbox;
- QString mTimeZoneId;
+ TQString mTimeZoneId;
KABC::Lock *mLock;
diff --git a/kresources/exchange/resourceexchangeconfig.cpp b/kresources/exchange/resourceexchangeconfig.cpp
index e2277fa05..5bb9677b6 100644
--- a/kresources/exchange/resourceexchangeconfig.cpp
+++ b/kresources/exchange/resourceexchangeconfig.cpp
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <kdebug.h>
@@ -33,48 +33,48 @@
using namespace KCal;
-ResourceExchangeConfig::ResourceExchangeConfig( QWidget* parent, const char* name )
+ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
resize( 245, 115 );
- QGridLayout *mainLayout = new QGridLayout( this, 8, 3 );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 8, 3 );
- QLabel *label = new QLabel( i18n( "Host:" ), this );
+ TQLabel *label = new TQLabel( i18n( "Host:" ), this );
mHostEdit = new KLineEdit( this );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mHostEdit, 1, 1 );
- label = new QLabel( i18n( "Port:" ), this );
+ label = new TQLabel( i18n( "Port:" ), this );
mPortEdit = new KLineEdit( this );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mPortEdit, 2, 1 );
- label = new QLabel( i18n( "Account:" ), this );
+ label = new TQLabel( i18n( "Account:" ), this );
mAccountEdit = new KLineEdit( this );
mainLayout->addWidget( label, 3, 0 );
mainLayout->addWidget( mAccountEdit, 3, 1 );
- label = new QLabel( i18n( "Password:" ), this );
+ label = new TQLabel( i18n( "Password:" ), this );
mPasswordEdit = new KLineEdit( this );
- mPasswordEdit->setEchoMode( QLineEdit::Password );
+ mPasswordEdit->setEchoMode( TQLineEdit::Password );
mainLayout->addWidget( label, 4, 0 );
mainLayout->addWidget( mPasswordEdit, 4, 1 );
- mAutoMailbox = new QCheckBox( i18n( "Determine mailbox &automatically" ), this );
+ mAutoMailbox = new TQCheckBox( i18n( "Determine mailbox &automatically" ), this );
mainLayout->addMultiCellWidget( mAutoMailbox, 5, 5, 0, 1 );
- connect( mAutoMailbox, SIGNAL(toggled(bool)), this, SLOT(slotToggleAuto(bool)) );
+ connect( mAutoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) );
mMailboxEdit = new KLineEdit( this );
- mainLayout->addWidget( new QLabel( i18n( "Mailbox URL:" ), this ), 6, 0 );
+ mainLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), this ), 6, 0 );
mainLayout->addWidget( mMailboxEdit, 6, 1 );
- mTryFindMailbox = new QPushButton( i18n( "&Find" ), this );
+ mTryFindMailbox = new TQPushButton( i18n( "&Find" ), this );
mainLayout->addWidget( mTryFindMailbox, 6, 2 );
- connect( mTryFindMailbox, SIGNAL(clicked()), this, SLOT(slotFindClicked()) );
+ connect( mTryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) );
- label = new QLabel( i18n( "Cache timeout:" ), this );
+ label = new TQLabel( i18n( "Cache timeout:" ), this );
mCacheEdit = new KIntNumInput( this );
- connect(mCacheEdit, SIGNAL(valueChanged( int )), SLOT(slotCacheEditChanged( int )));
+ connect(mCacheEdit, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(slotCacheEditChanged( int )));
mCacheEdit->setMinValue( 0 );
mainLayout->addWidget( label, 7, 0 );
mainLayout->addWidget( mCacheEdit, 7, 1 );
@@ -101,7 +101,7 @@ void ResourceExchangeConfig::saveSettings( KRES::Resource *resource )
ResourceExchange* res = dynamic_cast<ResourceExchange*>( resource );
if (res) {
if ( mAutoMailbox->isChecked() ) {
- mMailboxEdit->setText( QString::null );
+ mMailboxEdit->setText( TQString::null );
slotFindClicked();
if ( mMailboxEdit->text().isNull() ) {
kdWarning() << "Could not find Exchange mailbox URL, incomplete settings!" << endl;
@@ -125,7 +125,7 @@ void ResourceExchangeConfig::slotToggleAuto( bool on )
// mTryFindMailbox->setEnabled( ! on );
}
-void ResourceExchangeConfig::slotUserChanged( const QString& /*text*/ )
+void ResourceExchangeConfig::slotUserChanged( const TQString& /*text*/ )
{
// if ( mMailboxEqualsUser->isChecked() ) {
// mMailboxEdit->setText( "webdav://" + mHostEdit->text() + "/exchange/" + text );
@@ -134,7 +134,7 @@ void ResourceExchangeConfig::slotUserChanged( const QString& /*text*/ )
void ResourceExchangeConfig::slotFindClicked()
{
- QString mailbox = KPIM::ExchangeAccount::tryFindMailbox(
+ TQString mailbox = KPIM::ExchangeAccount::tryFindMailbox(
mHostEdit->text(), mPortEdit->text(),
mAccountEdit->text(), mPasswordEdit->text() );
diff --git a/kresources/exchange/resourceexchangeconfig.h b/kresources/exchange/resourceexchangeconfig.h
index 59adf02bc..870317afb 100644
--- a/kresources/exchange/resourceexchangeconfig.h
+++ b/kresources/exchange/resourceexchangeconfig.h
@@ -22,7 +22,7 @@
#ifndef KDEPIM_RESOURCECALENDAREXCHANGECONFIG_H
#define KDEPIM_RESOURCECALENDAREXCHANGECONFIG_H
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
#include <kcombobox.h>
#include <kurlrequester.h>
@@ -39,7 +39,7 @@ class ResourceExchangeConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceExchangeConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceExchangeConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource);
@@ -47,7 +47,7 @@ public slots:
protected slots:
void slotToggleAuto( bool on );
- void slotUserChanged( const QString& text );
+ void slotUserChanged( const TQString& text );
void slotFindClicked();
void slotCacheEditChanged( int value );
@@ -56,9 +56,9 @@ private:
KLineEdit* mPortEdit;
KLineEdit* mAccountEdit;
KLineEdit* mPasswordEdit;
- QCheckBox *mAutoMailbox;
+ TQCheckBox *mAutoMailbox;
KLineEdit* mMailboxEdit;
- QPushButton* mTryFindMailbox;
+ TQPushButton* mTryFindMailbox;
KIntNumInput* mCacheEdit;
};
diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/kresources/featureplan/benchmarkfeaturelist.cpp
index d814a8a21..2ae4432a0 100644
--- a/kresources/featureplan/benchmarkfeaturelist.cpp
+++ b/kresources/featureplan/benchmarkfeaturelist.cpp
@@ -27,8 +27,8 @@
#include <kaboutdata.h>
#include <kdebug.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <iostream>
@@ -51,7 +51,7 @@ void displayFeature( Feature *f )
std::cout << " STATUS: " << f->status().local8Bit() << std::endl;
}
-void displayCategory( const QValueList<Category *> categories )
+void displayCategory( const TQValueList<Category *> categories )
{
Category::List::ConstIterator it;
for( it = categories.begin(); it != categories.end(); ++it ) {
@@ -83,7 +83,7 @@ int main( int argc, char **argv )
args->usage( "Wrong number of arguments." );
}
- QString filename = QFile::decodeName( args->arg( 0 ) );
+ TQString filename = TQFile::decodeName( args->arg( 0 ) );
for( int i = 0; i < 1; ++i ) {
FeaturesParser parser;
diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/kresources/featureplan/dumpfeaturelist.cpp
index 9fbbe0084..fd5a5a01a 100644
--- a/kresources/featureplan/dumpfeaturelist.cpp
+++ b/kresources/featureplan/dumpfeaturelist.cpp
@@ -27,8 +27,8 @@
#include <kaboutdata.h>
#include <kdebug.h>
-#include <qfile.h>
-#include <qtextstream.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
#include <iostream>
@@ -51,7 +51,7 @@ void displayFeature( Feature *f )
std::cout << " STATUS: " << f->status().local8Bit() << std::endl;
}
-void displayCategory( const QValueList<Category *> categories )
+void displayCategory( const TQValueList<Category *> categories )
{
Category::List::ConstIterator it;
for( it = categories.begin(); it != categories.end(); ++it ) {
@@ -82,7 +82,7 @@ int main( int argc, char **argv )
args->usage( "Wrong number of arguments." );
}
- QString filename = QFile::decodeName( args->arg( 0 ) );
+ TQString filename = TQFile::decodeName( args->arg( 0 ) );
FeaturesParser parser;
@@ -91,10 +91,10 @@ int main( int argc, char **argv )
if ( !features ) {
kdError() << "Parse error" << endl;
} else {
- QValueList<Category *> categories = features->categoryList();
+ TQValueList<Category *> categories = features->categoryList();
displayCategory( categories );
- QString out = filename + ".out";
+ TQString out = filename + ".out";
if ( !features->writeFile( out ) ) {
kdError() << "Write error" << endl;
}
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp
index 84c198216..cce884955 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp
@@ -26,11 +26,11 @@
#include "kde-features.h"
#include "kde-features_parser.h"
-#include <qapplication.h>
-#include <qdatetime.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <tqapplication.h>
+#include <tqdatetime.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
#include <kabc/locknull.h>
#include <kdebug.h>
@@ -118,7 +118,7 @@ void ResourceFeaturePlan::insertCategories( const Category::List &categories,
Feature *f = *it2;
Todo *todo = new Todo;
- QString summary = f->summary();
+ TQString summary = f->summary();
int pos = summary.find( '\n' );
if ( pos > 0 ) summary = summary.left( pos ) + "...";
todo->setSummary( summary );
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
index c72915d0a..42043a5dd 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
@@ -19,9 +19,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
#include <kdebug.h>
#include <kdialog.h>
@@ -35,26 +35,26 @@
using namespace KCal;
-ResourceFeaturePlanConfig::ResourceFeaturePlanConfig( QWidget *parent,
+ResourceFeaturePlanConfig::ResourceFeaturePlanConfig( TQWidget *parent,
const char *name )
: KRES::ConfigWidget( parent, name )
{
- QGridLayout *topLayout = new QGridLayout( this, 3, 2, 0,
+ TQGridLayout *topLayout = new TQGridLayout( this, 3, 2, 0,
KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "Filename:" ), this );
+ TQLabel *label = new TQLabel( i18n( "Filename:" ), this );
mFilename = new KURLRequester( this );
topLayout->addWidget( label, 0, 0 );
topLayout->addWidget( mFilename, 0, 1 );
- label = new QLabel( i18n( "Filter email:" ), this );
+ label = new TQLabel( i18n( "Filter email:" ), this );
mFilterEmail = new KLineEdit( this );
topLayout->addWidget( label, 1, 0 );
topLayout->addWidget( mFilterEmail, 1, 1 );
- mCvsCheck = new QCheckBox( i18n("Use CVS"), this );
+ mCvsCheck = new TQCheckBox( i18n("Use CVS"), this );
topLayout->addMultiCellWidget( mCvsCheck, 2, 2, 0, 1 );
}
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.h b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
index dcba4684c..21dcf8f8d 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.h
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
@@ -36,7 +36,7 @@ class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceFeaturePlanConfig( QWidget *parent = 0, const char *name = 0 );
+ ResourceFeaturePlanConfig( TQWidget *parent = 0, const char *name = 0 );
public slots:
void loadSettings( KRES::Resource * );
@@ -45,7 +45,7 @@ class KDE_EXPORT ResourceFeaturePlanConfig : public KRES::ConfigWidget
private:
KURLRequester *mFilename;
KLineEdit *mFilterEmail;
- QCheckBox *mCvsCheck;
+ TQCheckBox *mCvsCheck;
};
}
diff --git a/kresources/groupdav/groupdavaddressbookadaptor.h b/kresources/groupdav/groupdavaddressbookadaptor.h
index 377b71622..f66d7b863 100644
--- a/kresources/groupdav/groupdavaddressbookadaptor.h
+++ b/kresources/groupdav/groupdavaddressbookadaptor.h
@@ -29,7 +29,7 @@
#include <kabc/addressee.h>
#include <kurl.h>
-#include <qdom.h>
+#include <tqdom.h>
namespace KABC {
@@ -40,9 +40,9 @@ class GroupDavAddressBookAdaptor : public DavAddressBookAdaptor
void customAdaptDownloadUrl( KURL &url );
void customAdaptUploadUrl( KURL &url );
- QString mimeType() const { return "text/x-vcard"; }
- QCString identifier() const { return "KABCResourceGroupDAV"; }
- QString defaultNewItemName( KPIM::GroupwareUploadItem */*item*/ ) { return "new.vcf"; }
+ TQString mimeType() const { return "text/x-vcard"; }
+ TQCString identifier() const { return "KABCResourceGroupDAV"; }
+ TQString defaultNewItemName( KPIM::GroupwareUploadItem */*item*/ ) { return "new.vcf"; }
long flags() const { return 0; }
@@ -58,16 +58,16 @@ class GroupDavAddressBookAdaptor : public DavAddressBookAdaptor
// Interpreting Jobs
- bool interpretListItemsJob( KIO::Job *job, const QString &/*jobData*/ )
+ bool interpretListItemsJob( KIO::Job *job, const TQString &/*jobData*/ )
{ return GroupDavGlobals::interpretListItemsJob( this, job ); }
- bool interpretDownloadItemsJob( KIO::Job *job, const QString &jobData )
+ bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
{ return GroupDavGlobals::interpretAddressBookDownloadItemsJob(
this, job, jobData ); }
- bool getFolderHasSubs( const QDomNode &folderNode )
+ bool getFolderHasSubs( const TQDomNode &folderNode )
{ return GroupDavGlobals::getFolderHasSubs( folderNode ); }
- KPIM::FolderLister::ContentType getContentType( const QDomNode &folderNode )
+ KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode )
{ return GroupDavGlobals::getContentType( folderNode ); }
};
diff --git a/kresources/groupdav/groupdavcalendaradaptor.h b/kresources/groupdav/groupdavcalendaradaptor.h
index c4434d064..64e8e86ed 100644
--- a/kresources/groupdav/groupdavcalendaradaptor.h
+++ b/kresources/groupdav/groupdavcalendaradaptor.h
@@ -41,17 +41,17 @@ class GroupDavCalendarAdaptor : public DavCalendarAdaptor
public:
GroupDavCalendarAdaptor();
- QValueList<KPIM::FolderLister::ContentType> supportedTypes()
+ TQValueList<KPIM::FolderLister::ContentType> supportedTypes()
{
- QValueList<KPIM::FolderLister::ContentType> types;
+ TQValueList<KPIM::FolderLister::ContentType> types;
types << KPIM::FolderLister::Event;
types << KPIM::FolderLister::Todo;
return types;
}
void customAdaptDownloadUrl( KURL &url );
void customAdaptUploadUrl( KURL &url );
- QCString identifier() const { return "KCalResourceGroupDAV"; }
- QString defaultNewItemName( KPIM::GroupwareUploadItem */*item*/ ) { return "new.ics"; }
+ TQCString identifier() const { return "KCalResourceGroupDAV"; }
+ TQString defaultNewItemName( KPIM::GroupwareUploadItem */*item*/ ) { return "new.ics"; }
long flags() const { return 0; }
@@ -67,15 +67,15 @@ class GroupDavCalendarAdaptor : public DavCalendarAdaptor
// Interpreting Jobs
- bool interpretListItemsJob( KIO::Job *job, const QString &/*jobData*/ )
+ bool interpretListItemsJob( KIO::Job *job, const TQString &/*jobData*/ )
{ return GroupDavGlobals::interpretListItemsJob( this, job ); }
- bool interpretDownloadItemsJob( KIO::Job *job, const QString &jobData )
+ bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
{ return GroupDavGlobals::interpretCalendarDownloadItemsJob( this, job, jobData ); }
- bool getFolderHasSubs( const QDomNode &folderNode )
+ bool getFolderHasSubs( const TQDomNode &folderNode )
{ return GroupDavGlobals::getFolderHasSubs( folderNode ); }
- KPIM::FolderLister::ContentType getContentType( const QDomNode &folderNode )
+ KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode )
{ return GroupDavGlobals::getContentType( folderNode ); }
};
}
diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp
index f94180195..17b6f443a 100644
--- a/kresources/groupdav/groupdavglobals.cpp
+++ b/kresources/groupdav/groupdavglobals.cpp
@@ -37,31 +37,31 @@
#include <kio/davjob.h>
#include <kio/job.h>
-QString GroupDavGlobals::extractFingerprint( KIO::Job *job, const QString &/*jobData*/ )
+TQString GroupDavGlobals::extractFingerprint( KIO::Job *job, const TQString &/*jobData*/ )
{
- const QString& headers = job->queryMetaData( "HTTP-Headers" );
+ const TQString& headers = job->queryMetaData( "HTTP-Headers" );
return WebdavHandler::getEtagFromHeaders( headers );
}
-KPIM::FolderLister::ContentType GroupDavGlobals::getContentType( const QDomElement &prop )
+KPIM::FolderLister::ContentType GroupDavGlobals::getContentType( const TQDomElement &prop )
{
- QDomElement ctype = prop.namedItem("getcontenttype").toElement();
+ TQDomElement ctype = prop.namedItem("getcontenttype").toElement();
if ( ctype.isNull() ) return KPIM::FolderLister::Unknown;
- const QString &type = ctype.text();
+ const TQString &type = ctype.text();
kdDebug()<<"Found content type: "<<type<<endl;
/// TODO: Not yet implemented in GroupDav!
return KPIM::FolderLister::Unknown;
}
-KPIM::FolderLister::ContentType GroupDavGlobals::getContentType( const QDomNode &folderNode )
+KPIM::FolderLister::ContentType GroupDavGlobals::getContentType( const TQDomNode &folderNode )
{
- QDomNode n4;
+ TQDomNode n4;
kdDebug()<<"GroupDavGlobals::getContentType(...)"<<endl;
int type = KPIM::FolderLister::Unknown;
for( n4 = folderNode.firstChild(); !n4.isNull(); n4 = n4.nextSibling() ) {
- QDomElement e = n4.toElement();
+ TQDomElement e = n4.toElement();
if ( e.tagName() == "resourcetype" ) {
if ( !e.namedItem( "vevent-collection" ).isNull() )
@@ -80,11 +80,11 @@ kdDebug()<<"GroupDavGlobals::getContentType(...)"<<endl;
return (KPIM::FolderLister::ContentType)type;
}
-bool GroupDavGlobals::getFolderHasSubs( const QDomNode &folderNode )
+bool GroupDavGlobals::getFolderHasSubs( const TQDomNode &folderNode )
{
// a folder is identified by the collection item in the resourcetype:
// <a:resourcetype xmlns:a="DAV:"><a:collection xmlns:a="DAV:"/>...</a:resourcetype>
- QDomElement e = folderNode.namedItem("resourcetype").toElement();
+ TQDomElement e = folderNode.namedItem("resourcetype").toElement();
if ( !e.namedItem( "collection" ).isNull() )
return true;
else return false;
@@ -95,9 +95,9 @@ bool GroupDavGlobals::getFolderHasSubs( const QDomNode &folderNode )
KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
{
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
- QDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
+ TQDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
WebdavHandler::addElement( doc, prop, "d:displayname" );
WebdavHandler::addElement( doc, prop, "d:resourcetype" );
// WebdavHandler::addElement( doc, prop, "d:hassubs" );
@@ -109,9 +109,9 @@ KIO::Job *GroupDavGlobals::createListFoldersJob( const KURL &url )
KIO::TransferJob *GroupDavGlobals::createListItemsJob( const KURL &url )
{
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
- QDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+ TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
WebdavHandler::addDavElement( doc, prop, "getetag" );
// WebdavHandler::addDavElement( doc, prop, "getcontenttype" );
kdDebug(5800) << "props = "<< doc.toString() << endl;
@@ -130,7 +130,7 @@ KIO::TransferJob *GroupDavGlobals::createDownloadJob( KPIM::GroupwareDataAdaptor
kdDebug()<<"GroupDavGlobals::createDownloadJob, url="<<url.url()<<endl;
KIO::TransferJob *job = KIO::get( url, false, false );
if ( adaptor ) {
- QString mt = adaptor->mimeType();
+ TQString mt = adaptor->mimeType();
job->addMetaData( "accept", mt );
}
job->addMetaData( "PropagateHttpHeader", "true" );
@@ -158,7 +158,7 @@ KIO::Job *GroupDavGlobals::createRemoveJob( KPIM::GroupwareDataAdaptor *adaptor,
}
return delJob;
-/* QStringList urls;
+/* TQStringList urls;
KPIM::GroupwareUploadItem::List::const_iterator it;
kdDebug(5800) << " GroupDavGlobals::createRemoveJob, BaseURL="<<uploadurl.url()<<endl;
for ( it = deletedItems.constBegin(); it != deletedItems.constEnd(); ++it ) {
@@ -190,28 +190,28 @@ bool GroupDavGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor
if ( !davjob ) {
return false;
}
- QDomDocument doc = davjob->response();
+ TQDomDocument doc = davjob->response();
kdDebug(7000) << " Doc: " << doc.toString() << endl;
kdDebug(7000) << " IdMapper: " << adaptor->idMapper()->asString() << endl;
- QDomElement docElem = doc.documentElement();
- QDomNode n = docElem.firstChild();
+ TQDomElement docElem = doc.documentElement();
+ TQDomNode n = docElem.firstChild();
while( !n.isNull() ) {
- QDomElement e = n.toElement(); // try to convert the node to an element.
+ TQDomElement e = n.toElement(); // try to convert the node to an element.
n = n.nextSibling();
if ( e.isNull() )
continue;
const KURL &entry( e.namedItem("href").toElement().text() );
- QDomElement propstat = e.namedItem("propstat").toElement();
+ TQDomElement propstat = e.namedItem("propstat").toElement();
if ( propstat.isNull() )
continue;
- QDomElement prop = propstat.namedItem( "prop" ).toElement();
+ TQDomElement prop = propstat.namedItem( "prop" ).toElement();
if ( prop.isNull() )
continue;
- QDomElement elem = prop.namedItem("getetag").toElement();
- const QString &newFingerprint = elem.text();
+ TQDomElement elem = prop.namedItem("getetag").toElement();
+ const TQString &newFingerprint = elem.text();
if ( elem.isNull() || newFingerprint.isEmpty() )
continue;
@@ -225,12 +225,12 @@ bool GroupDavGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor
bool GroupDavGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
- KIO::Job *job, const QString &jobData )
+ KIO::Job *job, const TQString &jobData )
{
kdDebug(5800) << "GroupDavGlobals::interpretCalendarDownloadItemsJob, iCalendar=" << endl;
kdDebug(5800) << jobData << endl;
if ( !adaptor || !job ) return false;
- KCal::CalendarLocal calendar( QString::fromLatin1("UTC") );
+ KCal::CalendarLocal calendar( TQString::fromLatin1("UTC") );
KCal::ICalFormat ical;
calendar.setTimeZoneId( adaptor->resource()->timeZoneId() );
KCal::Incidence::List incidences;
@@ -247,7 +247,7 @@ kdDebug(5800) << jobData << endl;
KIO::SimpleJob *sjob = dynamic_cast<KIO::SimpleJob *>(job);
KURL remoteId;
if ( sjob ) remoteId = sjob->url();
- QString fingerprint = extractFingerprint( job, jobData );
+ TQString fingerprint = extractFingerprint( job, jobData );
adaptor->calendarItemDownloaded( inc, inc->uid(), remoteId, fingerprint,
remoteId.prettyURL() );
return true;
@@ -259,7 +259,7 @@ kdDebug(5800) << jobData << endl;
bool GroupDavGlobals::interpretAddressBookDownloadItemsJob(
- KABC::AddressBookAdaptor *adaptor, KIO::Job *job, const QString &jobData )
+ KABC::AddressBookAdaptor *adaptor, KIO::Job *job, const TQString &jobData )
{
kdDebug(5800) << "GroupDavGlobals::interpretAddressBookDownloadItemsJob, vCard=" << endl;
kdDebug(5800) << jobData << endl;
@@ -278,7 +278,7 @@ kdDebug(5800) << jobData << endl;
KIO::SimpleJob *sjob = dynamic_cast<KIO::SimpleJob*>(job);
KURL remoteId;
if ( sjob ) remoteId = sjob->url();
- QString fingerprint = extractFingerprint( job, jobData );
+ TQString fingerprint = extractFingerprint( job, jobData );
adaptor->addressbookItemDownloaded( a, a.uid(), remoteId, fingerprint,
remoteId.prettyURL() );
return true;
diff --git a/kresources/groupdav/groupdavglobals.h b/kresources/groupdav/groupdavglobals.h
index dc379f94e..7a89f1def 100644
--- a/kresources/groupdav/groupdavglobals.h
+++ b/kresources/groupdav/groupdavglobals.h
@@ -26,7 +26,7 @@
#include <groupwareuploadjob.h>
#include <folderlister.h>
#include <kurl.h>
-#include <qdom.h>
+#include <tqdom.h>
namespace KPIM {
class GroupwareDataAdaptor;
@@ -47,10 +47,10 @@ class GroupDavGlobals
{
public:
GroupDavGlobals() {}
- static QString extractFingerprint( KIO::Job *job, const QString &/*jobData*/ );
- static KPIM::FolderLister::ContentType getContentType( const QDomElement &prop );
- static KPIM::FolderLister::ContentType getContentType( const QDomNode &folderNode );
- static bool getFolderHasSubs( const QDomNode &folderNode );
+ static TQString extractFingerprint( KIO::Job *job, const TQString &/*jobData*/ );
+ static KPIM::FolderLister::ContentType getContentType( const TQDomElement &prop );
+ static KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode );
+ static bool getFolderHasSubs( const TQDomNode &folderNode );
static KIO::Job *createListFoldersJob( const KURL &url );
@@ -64,9 +64,9 @@ class GroupDavGlobals
static bool interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
KIO::Job *job );
static bool interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
- KIO::Job *job, const QString &jobData );
+ KIO::Job *job, const TQString &jobData );
static bool interpretAddressBookDownloadItemsJob( KABC::AddressBookAdaptor *adaptor,
- KIO::Job *job, const QString &jobData );
+ KIO::Job *job, const TQString &jobData );
};
diff --git a/kresources/groupdav/kabc_resourcegroupdav.h b/kresources/groupdav/kabc_resourcegroupdav.h
index 807e0ec3a..e6765758c 100644
--- a/kresources/groupdav/kabc_resourcegroupdav.h
+++ b/kresources/groupdav/kabc_resourcegroupdav.h
@@ -34,7 +34,7 @@ class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
public:
ResourceGroupDav( const KConfig * );
// ResourceGroupDav( const KURL &url,
-// const QString &user, const QString &password );
+// const TQString &user, const TQString &password );
protected:
void init();
};
diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/kresources/groupware/kabc_resourcegroupware.cpp
index 722024adf..c04988aa0 100644
--- a/kresources/groupware/kabc_resourcegroupware.cpp
+++ b/kresources/groupware/kabc_resourcegroupware.cpp
@@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
+#include <tqapplication.h>
#include <kabc/addressee.h>
#include <kabc/vcardconverter.h>
@@ -47,8 +47,8 @@ ResourceGroupware::ResourceGroupware( const KConfig *config )
}
ResourceGroupware::ResourceGroupware( const KURL &url,
- const QString &user,
- const QString &password )
+ const TQString &user,
+ const TQString &password )
: ResourceCached( 0 )
{
init();
@@ -95,10 +95,10 @@ void ResourceGroupware::writeConfig( KConfig *config )
void ResourceGroupware::readAddressBooks()
{
#if 0
- QStringList ids = prefs()->ids();
- QStringList names = prefs()->names();
- QStringList personals = prefs()->personals();
- QStringList frequents = prefs()->frequents();
+ TQStringList ids = prefs()->ids();
+ TQStringList names = prefs()->names();
+ TQStringList personals = prefs()->personals();
+ TQStringList frequents = prefs()->frequents();
if ( ids.count() != names.count() || ids.count() != personals.count() ||
ids.count() != frequents.count() ) {
@@ -123,10 +123,10 @@ void ResourceGroupware::readAddressBooks()
void ResourceGroupware::writeAddressBooks()
{
#if 0
- QStringList ids;
- QStringList names;
- QStringList personals;
- QStringList frequents;
+ TQStringList ids;
+ TQStringList names;
+ TQStringList personals;
+ TQStringList frequents;
Groupware::AddressBook::List::ConstIterator it;
for( it = mAddressBooks.begin(); it != mAddressBooks.end(); ++it ) {
ids.append( (*it).id );
@@ -155,8 +155,8 @@ void ResourceGroupware::retrieveAddressBooks()
server.logout();
if ( firstRetrieve ) {
- QStringList reads;
- QString write;
+ TQStringList reads;
+ TQString write;
Groupware::AddressBook::List::ConstIterator it;
for( it = mAddressBooks.begin(); it != mAddressBooks.end(); ++it ) {
@@ -227,9 +227,9 @@ bool ResourceGroupware::asyncLoad()
url.setPass( prefs()->password() );
#if 0
- QString query = "?";
- QStringList ids = mPrefs->readAddressBooks();
- QStringList::ConstIterator it;
+ TQString query = "?";
+ TQStringList ids = mPrefs->readAddressBooks();
+ TQStringList::ConstIterator it;
for( it = ids.begin(); it != ids.end(); ++it ) {
if ( it != ids.begin() ) query += "&";
query += "addressbookid=" + *it;
@@ -239,21 +239,21 @@ bool ResourceGroupware::asyncLoad()
kdDebug() << "Download URL: " << url << endl;
- mJobData = QString::null;
+ mJobData = TQString::null;
mDownloadJob = KPIM::GroupwareJob::getAddressBook( url );
- connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotJobResult( KIO::Job * ) ) );
- connect( mDownloadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- SLOT( slotJobData( KIO::Job *, const QByteArray & ) ) );
- connect( mDownloadJob, SIGNAL( percent( KIO::Job *, unsigned long ) ),
- SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotJobResult( KIO::Job * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
+ TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading addressbook") );
connect( mProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelLoad() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelLoad() ) );
return true;
}
@@ -316,8 +316,8 @@ void ResourceGroupware::slotJobResult( KIO::Job *job )
if ( !addr.isEmpty() ) {
addr.setResource( this );
- QString remote = addr.custom( "GWRESOURCE", "UID" );
- QString local = idMapper().localId( remote );
+ TQString remote = addr.custom( "GWRESOURCE", "UID" );
+ TQString local = idMapper().localId( remote );
if ( local.isEmpty() ) {
idMapper().setRemoteId( addr.uid(), remote );
} else {
@@ -339,7 +339,7 @@ void ResourceGroupware::slotJobResult( KIO::Job *job )
mProgress = 0;
}
-void ResourceGroupware::slotJobData( KIO::Job *, const QByteArray &data )
+void ResourceGroupware::slotJobData( KIO::Job *, const TQByteArray &data )
{
// kdDebug() << "ResourceGroupware::slotJobData()" << endl;
diff --git a/kresources/groupware/kabc_resourcegroupware.h b/kresources/groupware/kabc_resourcegroupware.h
index cea679f39..46547fc60 100644
--- a/kresources/groupware/kabc_resourcegroupware.h
+++ b/kresources/groupware/kabc_resourcegroupware.h
@@ -39,7 +39,7 @@ class ResourceGroupware : public ResourceCached
public:
ResourceGroupware( const KConfig * );
ResourceGroupware( const KURL &url,
- const QString &user, const QString &password );
+ const TQString &user, const TQString &password );
~ResourceGroupware();
void readConfig( const KConfig * );
@@ -68,7 +68,7 @@ class ResourceGroupware : public ResourceCached
private slots:
void slotJobResult( KIO::Job * );
- void slotJobData( KIO::Job *, const QByteArray & );
+ void slotJobData( KIO::Job *, const TQByteArray & );
void slotJobPercent( KIO::Job *job, unsigned long percent );
void cancelLoad();
@@ -78,7 +78,7 @@ class ResourceGroupware : public ResourceCached
KIO::TransferJob *mDownloadJob;
KPIM::ProgressItem *mProgress;
- QString mJobData;
+ TQString mJobData;
};
}
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.cpp b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
index 8cb656a93..cfe6ba98c 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
@@ -31,16 +31,16 @@
#include <klistview.h>
#include <kurlrequester.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
using namespace KABC;
class AddressBookItem : public QCheckListItem
{
public:
- AddressBookItem( KListView *parent, const QString &id )
- : QCheckListItem( parent, "", CheckBox ),
+ AddressBookItem( KListView *parent, const TQString &id )
+ : TQCheckListItem( parent, "", CheckBox ),
mId( id )
{
setText( 0, mId );
@@ -52,42 +52,42 @@ class AddressBookItem : public QCheckListItem
#endif
}
- QString id() const { return mId; }
+ TQString id() const { return mId; }
private:
- QString mId;
+ TQString mId;
};
-ResourceGroupwareConfig::ResourceGroupwareConfig( QWidget* parent, const char* name )
+ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
- QGridLayout *mainLayout = new QGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "URL:" ), this );
+ TQLabel *label = new TQLabel( i18n( "URL:" ), this );
mURL = new KURLRequester( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mURL, 0, 1 );
- label = new QLabel( i18n( "User:" ), this );
+ label = new TQLabel( i18n( "User:" ), this );
mUser = new KLineEdit( this );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mUser, 1, 1 );
- label = new QLabel( i18n( "Password:" ), this );
+ label = new TQLabel( i18n( "Password:" ), this );
mPassword = new KLineEdit( this );
- mPassword->setEchoMode( QLineEdit::Password );
+ mPassword->setEchoMode( TQLineEdit::Password );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mPassword, 2, 1 );
- QFrame *hline = new QFrame( this );
- hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+ TQFrame *hline = new TQFrame( this );
+ hline->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 );
- QPushButton *updateButton = new QPushButton( i18n( "Retrieve Address Book List From Server" ), this );
+ TQPushButton *updateButton = new TQPushButton( i18n( "Retrieve Address Book List From Server" ), this );
mainLayout->addMultiCellWidget( updateButton, 4, 4, 0, 1 );
mAddressBookView = new KListView( this );
@@ -100,13 +100,13 @@ ResourceGroupwareConfig::ResourceGroupwareConfig( QWidget* parent, const char*
mainLayout->addMultiCellWidget( mAddressBookView, 5, 5, 0, 1 );
- label = new QLabel( i18n( "Address book for new contacts:" ), this );
+ label = new TQLabel( i18n( "Address book for new contacts:" ), this );
mAddressBookBox = new KComboBox( this );
mainLayout->addWidget( label, 6, 0 );
mainLayout->addWidget( mAddressBookBox, 6, 1 );
- connect( updateButton, SIGNAL( clicked() ), SLOT( updateAddressBookList() ) );
+ connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) );
}
void ResourceGroupwareConfig::loadSettings( KRES::Resource *res )
@@ -158,10 +158,10 @@ void ResourceGroupwareConfig::updateAddressBookList()
void ResourceGroupwareConfig::saveAddressBookSettings()
{
#if 0
- QStringList selectedRead;
- QString selectedWrite;
+ TQStringList selectedRead;
+ TQString selectedWrite;
- QListViewItemIterator it2( mAddressBookView );
+ TQListViewItemIterator it2( mAddressBookView );
while ( it2.current() ) {
AddressBookItem *item = static_cast<AddressBookItem*>( it2.current() );
if ( item->isOn() )
@@ -187,7 +187,7 @@ void ResourceGroupwareConfig::updateAddressBookView()
mWriteAddressBookIds.clear();
#if 0
- QStringList selectedRead = mResource->prefs()->readAddressBooks();
+ TQStringList selectedRead = mResource->prefs()->readAddressBooks();
Groupware::AddressBook::List addressBooks = mResource->addressBooks();
Groupware::AddressBook::List::ConstIterator abIt;
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.h b/kresources/groupware/kabc_resourcegroupwareconfig.h
index f8df15bc4..32bcfa710 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.h
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.h
@@ -22,7 +22,7 @@
#include <kresources/configwidget.h>
-#include <qmap.h>
+#include <tqmap.h>
class KComboBox;
class KLineEdit;
@@ -38,7 +38,7 @@ class ResourceGroupwareConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceGroupwareConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceGroupwareConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KRES::Resource* );
@@ -60,7 +60,7 @@ class ResourceGroupwareConfig : public KRES::ConfigWidget
KListView *mAddressBookView;
KComboBox *mAddressBookBox;
- QStringList mWriteAddressBookIds;
+ TQStringList mWriteAddressBookIds;
ResourceGroupware *mResource;
};
diff --git a/kresources/groupware/kcal_resourcegroupware.cpp b/kresources/groupware/kcal_resourcegroupware.cpp
index 9adbffdd7..b651d7390 100644
--- a/kresources/groupware/kcal_resourcegroupware.cpp
+++ b/kresources/groupware/kcal_resourcegroupware.cpp
@@ -28,11 +28,11 @@
#include <libkcal/icalformat.h>
#include <libkcal/calendarlocal.h>
-#include <qapplication.h>
-#include <qdatetime.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <tqapplication.h>
+#include <tqdatetime.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
#include <kabc/locknull.h>
#include <kdebug.h>
@@ -152,19 +152,19 @@ bool ResourceGroupware::doLoad()
kdDebug() << "Download URL: " << url << endl;
- mJobData = QString::null;
+ mJobData = TQString::null;
mDownloadJob = KPIM::GroupwareJob::getCalendar( url );
- connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotJobResult( KIO::Job * ) ) );
- connect( mDownloadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- SLOT( slotJobData( KIO::Job *, const QByteArray & ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotJobResult( KIO::Job * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") );
connect( mProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelLoad() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelLoad() ) );
return true;
}
@@ -193,8 +193,8 @@ void ResourceGroupware::slotJobResult( KIO::Job *job )
for( it = incidences.begin(); it != incidences.end(); ++it ) {
// kdDebug() << "INCIDENCE: " << (*it)->summary() << endl;
Incidence *i = (*it)->clone();
- QString remote = (*it)->customProperty( "GWRESOURCE", "UID" );
- QString local = idMapper().localId( remote );
+ TQString remote = (*it)->customProperty( "GWRESOURCE", "UID" );
+ TQString local = idMapper().localId( remote );
if ( local.isEmpty() ) {
idMapper().setRemoteId( i->uid(), remote );
} else {
@@ -217,7 +217,7 @@ void ResourceGroupware::slotJobResult( KIO::Job *job )
mProgress = 0;
}
-void ResourceGroupware::slotJobData( KIO::Job *, const QByteArray &data )
+void ResourceGroupware::slotJobData( KIO::Job *, const TQByteArray &data )
{
// kdDebug() << "ResourceGroupware::slotJobData()" << endl;
@@ -281,7 +281,7 @@ bool ResourceGroupware::confirmSave()
dlg.addIncidences( deletedIncidences(), i18n("Deleted") );
int result = dlg.exec();
- return result == QDialog::Accepted;
+ return result == TQDialog::Accepted;
}
KABC::Lock *ResourceGroupware::lock()
diff --git a/kresources/groupware/kcal_resourcegroupware.h b/kresources/groupware/kcal_resourcegroupware.h
index 7ddece926..610203fc3 100644
--- a/kresources/groupware/kcal_resourcegroupware.h
+++ b/kresources/groupware/kcal_resourcegroupware.h
@@ -70,7 +70,7 @@ class ResourceGroupware : public ResourceCached
void loadFinished();
void slotJobResult( KIO::Job * );
- void slotJobData( KIO::Job *, const QByteArray & );
+ void slotJobData( KIO::Job *, const TQByteArray & );
void cancelLoad();
@@ -80,7 +80,7 @@ class ResourceGroupware : public ResourceCached
KIO::TransferJob *mDownloadJob;
KPIM::ProgressItem *mProgress;
- QString mJobData;
+ TQString mJobData;
bool mIsShowingError;
};
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.cpp b/kresources/groupware/kcal_resourcegroupwareconfig.cpp
index d0581182d..2d5cffe00 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.cpp
@@ -20,9 +20,9 @@
#include <typeinfo>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
#include <klocale.h>
#include <kdebug.h>
@@ -38,23 +38,23 @@
using namespace KCal;
-ResourceGroupwareConfig::ResourceGroupwareConfig( QWidget* parent, const char* name )
+ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
resize( 245, 115 );
- QGridLayout *mainLayout = new QGridLayout( this, 2, 2 );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
- QLabel *label = new QLabel( i18n("URL:"), this );
+ TQLabel *label = new TQLabel( i18n("URL:"), this );
mainLayout->addWidget( label, 1, 0 );
mUrl = new KLineEdit( this );
mainLayout->addWidget( mUrl, 1, 1 );
- label = new QLabel( i18n("User:"), this );
+ label = new TQLabel( i18n("User:"), this );
mainLayout->addWidget( label, 2, 0 );
mUserEdit = new KLineEdit( this );
mainLayout->addWidget( mUserEdit, 2, 1 );
- label = new QLabel( i18n("Password:"), this );
+ label = new TQLabel( i18n("Password:"), this );
mainLayout->addWidget( label, 3, 0 );
mPasswordEdit = new KLineEdit( this );
mainLayout->addWidget( mPasswordEdit, 3, 1 );
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.h b/kresources/groupware/kcal_resourcegroupwareconfig.h
index ab2fd424d..10115f7e7 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.h
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.h
@@ -42,7 +42,7 @@ class ResourceGroupwareConfig : public KRES::ConfigWidget
{
Q_OBJECT
public:
- ResourceGroupwareConfig( QWidget *parent = 0, const char *name = 0 );
+ ResourceGroupwareConfig( TQWidget *parent = 0, const char *name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/groupwise/groupwisesettingswidget.cpp b/kresources/groupwise/groupwisesettingswidget.cpp
index 1a758f3bc..60d047123 100644
--- a/kresources/groupwise/groupwisesettingswidget.cpp
+++ b/kresources/groupwise/groupwisesettingswidget.cpp
@@ -24,20 +24,20 @@
#include "groupwisesettingswidget.h"
-GroupWiseSettingsWidget::GroupWiseSettingsWidget( QWidget * parent )
+GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent )
: GroupWiseSettingsWidgetBase( parent )
{
- connect( m_settingsList, SIGNAL( itemRenamed( QListViewItem *, int ) ),
- this, SLOT( slotItemRenamed( QListViewItem *, int ) ) );
+ connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ),
+ this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) );
}
-void GroupWiseSettingsWidget::slotItemRenamed( QListViewItem * item, int )
+void GroupWiseSettingsWidget::slotItemRenamed( TQListViewItem * item, int )
{
kdDebug() << "GroupWiseSettingsWidget::slotItemRenamed() - " << item->text( 1 ) << " changed to " << item->text( 2 ) << endl;
m_dirtySettings.insert( item->text( 1 ), item->text( 2 ) );
}
-QMap<QString, QString> GroupWiseSettingsWidget::dirtySettings()
+TQMap<TQString, TQString> GroupWiseSettingsWidget::dirtySettings()
{
return m_dirtySettings;
}
diff --git a/kresources/groupwise/groupwisesettingswidget.h b/kresources/groupwise/groupwisesettingswidget.h
index a46deb7bf..aa2d3df57 100644
--- a/kresources/groupwise/groupwisesettingswidget.h
+++ b/kresources/groupwise/groupwisesettingswidget.h
@@ -22,7 +22,7 @@
#ifndef GROUPWISE_SETTINGS_WIDGET_H
#define GROUPWISE_SETTINGS_WIDGET_H
-#include <qmap.h>
+#include <tqmap.h>
class QListViewItem;
@@ -32,16 +32,16 @@ class GroupWiseSettingsWidget : public GroupWiseSettingsWidgetBase
{
Q_OBJECT
public:
- GroupWiseSettingsWidget( QWidget * parent );
- QMap<QString, QString> dirtySettings();
+ GroupWiseSettingsWidget( TQWidget * parent );
+ TQMap<TQString, TQString> dirtySettings();
void reset();
protected slots:
/**
* Add the renamed item to the list of dirty (changed) settings
*/
- void slotItemRenamed( QListViewItem *Item, int ColumnRenamed );
+ void slotItemRenamed( TQListViewItem *Item, int ColumnRenamed );
private:
- QMap<QString, QString> m_dirtySettings;
+ TQMap<TQString, TQString> m_dirtySettings;
};
#endif
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index e37a4d65c..9aa33ac7f 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-#include <qfile.h>
+#include <tqapplication.h>
+#include <tqfile.h>
#include <kabc/addressee.h>
#include <kabc/vcardconverter.h>
@@ -47,10 +47,10 @@ ResourceGroupwise::ResourceGroupwise( const KConfig *config )
}
ResourceGroupwise::ResourceGroupwise( const KURL &url,
- const QString &user,
- const QString &password,
- const QStringList &readAddressBooks,
- const QString &writeAddressBook )
+ const TQString &user,
+ const TQString &password,
+ const TQStringList &readAddressBooks,
+ const TQString &writeAddressBook )
: ResourceCached( 0 )
{
init();
@@ -115,16 +115,16 @@ void ResourceGroupwise::clearCache()
{
idMapper().clear();
mAddrMap.clear();
- QFile file( cacheFile() );
+ TQFile file( cacheFile() );
file.remove();
}
void ResourceGroupwise::readAddressBooks()
{
- QStringList ids = prefs()->ids();
- QStringList names = prefs()->names();
- QStringList personals = prefs()->personals();
- QStringList frequents = prefs()->frequents();
+ TQStringList ids = prefs()->ids();
+ TQStringList names = prefs()->names();
+ TQStringList personals = prefs()->personals();
+ TQStringList frequents = prefs()->frequents();
if ( ids.count() != names.count() || ids.count() != personals.count() ||
ids.count() != frequents.count() ) {
@@ -147,10 +147,10 @@ void ResourceGroupwise::readAddressBooks()
void ResourceGroupwise::writeAddressBooks()
{
- QStringList ids;
- QStringList names;
- QStringList personals;
- QStringList frequents;
+ TQStringList ids;
+ TQStringList names;
+ TQStringList personals;
+ TQStringList frequents;
GroupWise::AddressBook::List::ConstIterator it;
for( it = mAddressBooks.begin(); it != mAddressBooks.end(); ++it ) {
ids.append( (*it).id );
@@ -177,8 +177,8 @@ void ResourceGroupwise::retrieveAddressBooks()
mAddressBooks = server.addressBookList();
server.logout();
- QStringList reads;
- QString write;
+ TQStringList reads;
+ TQString write;
GroupWise::AddressBook::List::ConstIterator it;
for( it = mAddressBooks.begin(); it != mAddressBooks.end(); ++it ) {
@@ -287,9 +287,9 @@ bool ResourceGroupwise::asyncLoad()
if ( !mProgress )
{
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
- KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), QString::null, true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
- connect( mProgress, SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelLoad() ) );
+ KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString::null, true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
+ connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelLoad() ) );
}
if ( addressBooks().isEmpty() ) {
@@ -338,7 +338,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
}
mState = ( bookType == System ? FetchingSAB : FetchingUAB );
- mJobData = QString::null;
+ mJobData = TQString::null;
if ( mJob )
{
@@ -349,28 +349,28 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
mJob = KIO::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, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- SLOT( slotReadJobData( KIO::Job *, const QByteArray & ) ) );
- connect( mJob, SIGNAL( percent( KIO::Job *, unsigned long ) ),
- SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+ connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotReadJobData( KIO::Job *, const TQByteArray & ) ) );
+ connect( mJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
+ TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
if ( bookType == System )
{
- connect( mJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( fetchSABResult( KIO::Job * ) ) );
+ connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( fetchSABResult( KIO::Job * ) ) );
mSABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
- i18n( "Fetching System Address Book" ), QString::null,
+ i18n( "Fetching System Address Book" ), TQString::null,
false /*CannotBeCancelled*/,
mPrefs->url().startsWith("https" ) );
}
else
{
- connect( mJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( fetchUABResult( KIO::Job * ) ) );
+ connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( fetchUABResult( KIO::Job * ) ) );
mUABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
- i18n( "Fetching User Address Books" ), QString::null,
+ i18n( "Fetching User Address Books" ), TQString::null,
false /*CannotBeCancelled*/,
mPrefs->url().startsWith("https" ) );
}
@@ -437,21 +437,21 @@ void ResourceGroupwise::updateSystemAddressBook()
KURL url = createAccessUrl( System, Update, mPrefs->lastSequenceNumber(), mPrefs->lastTimePORebuild() );
kdDebug() << " Update URL: " << url << endl;
- mJobData = QString::null;
+ mJobData = TQString::null;
mSABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
- i18n( "Updating System Address Book" ), QString::null,
+ i18n( "Updating System Address Book" ), TQString::null,
false /*CannotBeCancelled*/,
mPrefs->url().startsWith("https" ) );
mJob = KIO::get( url, false, false );
mJob->setInteractive( false );
- connect( mJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( updateSABResult( KIO::Job * ) ) );
- connect( mJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- SLOT( slotUpdateJobData( KIO::Job *, const QByteArray & ) ) );
- connect( mJob, SIGNAL( percent( KIO::Job *, unsigned long ) ),
- SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
+ connect( mJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( updateSABResult( KIO::Job * ) ) );
+ connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotUpdateJobData( KIO::Job *, const TQByteArray & ) ) );
+ connect( mJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
+ TQT_SLOT( slotJobPercent( KIO::Job *, unsigned long ) ) );
return;
}
@@ -486,7 +486,7 @@ void ResourceGroupwise::updateSABResult( KIO::Job *job )
loadCompleted();
}
-void ResourceGroupwise::slotReadJobData( KIO::Job *job , const QByteArray &data )
+void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data )
{
kdDebug() << "ResourceGroupwise::slotReadJobData()" << endl;
Q_UNUSED( job );
@@ -494,7 +494,7 @@ void ResourceGroupwise::slotReadJobData( KIO::Job *job , const QByteArray &data
mJobData.append( data.data() );
KABC::VCardConverter conv;
- QTime profile;
+ TQTime profile;
profile.start();
Addressee::List addressees = conv.parseVCards( mJobData );
// kdDebug() << " parsed " << addressees.count() << " contacts in " << profile.elapsed() << "ms, now adding to resource..." << endl;
@@ -505,8 +505,8 @@ void ResourceGroupwise::slotReadJobData( KIO::Job *job , const QByteArray &data
if ( !addr.isEmpty() ) {
addr.setResource( this );
- QString remote = addr.custom( "GWRESOURCE", "UID" );
- QString local = idMapper().localId( remote );
+ TQString remote = addr.custom( "GWRESOURCE", "UID" );
+ TQString local = idMapper().localId( remote );
if ( local.isEmpty() ) {
idMapper().setRemoteId( addr.uid(), remote );
} else {
@@ -517,10 +517,10 @@ void ResourceGroupwise::slotReadJobData( KIO::Job *job , const QByteArray &data
clearChange( addr );
}
}
- mJobData = QString::null;
+ mJobData = TQString::null;
}
-void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const QByteArray &data )
+void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &data )
{
kdDebug() << "ResourceGroupwise::slotUpdateJobData()" << endl;
kdDebug() << " Job address: " << job << endl;
@@ -534,9 +534,9 @@ void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const QByteArray &data
KABC::Addressee addr = *it;
if ( !addr.isEmpty() ) {
// if added or changed
- QString syncType = addr.custom( "GWRESOURCE", "SYNC" );
- QString remote = addr.custom( "GWRESOURCE", "UID" );
- QString local = idMapper().localId( remote );
+ TQString syncType = addr.custom( "GWRESOURCE", "SYNC" );
+ TQString remote = addr.custom( "GWRESOURCE", "UID" );
+ TQString local = idMapper().localId( remote );
if ( syncType == "ADD" || syncType == "UPD" )
{
@@ -567,7 +567,7 @@ void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const QByteArray &data
}
}
}
- mJobData = QString::null;
+ mJobData = TQString::null;
}
void ResourceGroupwise::loadCompleted()
@@ -664,20 +664,20 @@ ResourceGroupwise::SABState ResourceGroupwise::systemAddressBookState()
bool ResourceGroupwise::shouldFetchSystemAddressBook()
{
- QStringList ids = mPrefs->readAddressBooks();
+ TQStringList ids = mPrefs->readAddressBooks();
return ( appIsWhiteListedForSAB() && ids.find( mPrefs->systemAddressBook() ) != ids.end() );
}
bool ResourceGroupwise::shouldFetchUserAddressBooks()
{
- QStringList ids = mPrefs->readAddressBooks();
+ TQStringList ids = mPrefs->readAddressBooks();
return ( ids.count() > 1 || ids.find( mPrefs->systemAddressBook() ) == ids.end() );
}
KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, unsigned long lastSequenceNumber, unsigned long lastPORebuildTime )
{
// set up list of address book IDs to fetch
- QStringList ids;
+ TQStringList ids;
if ( bookType == System )
ids.append( mPrefs->systemAddressBook() );
else
@@ -699,8 +699,8 @@ KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, uns
url.setUser( prefs()->user() );
url.setPass( prefs()->password() );
- QString query = "?";
- QStringList::ConstIterator it;
+ TQString query = "?";
+ TQStringList::ConstIterator it;
for( it = ids.begin(); it != ids.end(); ++it ) {
if ( it != ids.begin() ) query += "&";
query += "addressbookid=" + *it;
@@ -708,7 +708,7 @@ KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, uns
if ( mode == Update && lastSequenceNumber > 0 && lastPORebuildTime > 0 )
{
- query += QString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );;
+ query += TQString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );;
}
url.setQuery( query );
return url;
diff --git a/kresources/groupwise/kabc_resourcegroupwise.h b/kresources/groupwise/kabc_resourcegroupwise.h
index 8fad2a67d..cd634a010 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.h
+++ b/kresources/groupwise/kabc_resourcegroupwise.h
@@ -46,9 +46,9 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
public:
ResourceGroupwise( const KConfig * );
ResourceGroupwise( const KURL &url,
- const QString &user, const QString &password,
- const QStringList &readAddressBooks,
- const QString &writeAddressBook );
+ const TQString &user, const TQString &password,
+ const TQStringList &readAddressBooks,
+ const TQString &writeAddressBook );
~ResourceGroupwise();
void readConfig( const KConfig * );
@@ -140,9 +140,9 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
void fetchUABResult( KIO::Job * );
void updateSABResult( KIO::Job * );
/** DATA PROCESSING SLOTS **/
- void slotReadJobData( KIO::Job *, const QByteArray & );
- void slotUpdateJobData( KIO::Job *, const QByteArray & );
- /** HELPER SLOT **/
+ void slotReadJobData( KIO::Job *, const TQByteArray & );
+ void slotUpdateJobData( KIO::Job *, const TQByteArray & );
+ /** HELPER TQT_SLOT **/
void slotJobPercent( KIO::Job *job, unsigned long percent );
void cancelLoad();
@@ -156,7 +156,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
KPIM::ProgressItem *mProgress;
KPIM::ProgressItem *mSABProgress;
KPIM::ProgressItem *mUABProgress;
- QString mJobData;
+ TQString mJobData;
ResourceState mState;
unsigned long mServerFirstSequence, mServerLastSequence, mServerLastPORebuildTime;
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
index daa1008ac..f195700c8 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
@@ -31,8 +31,8 @@
#include <klistview.h>
#include <kurlrequester.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
using namespace KABC;
@@ -40,7 +40,7 @@ class AddressBookItem : public QCheckListItem
{
public:
AddressBookItem( KListView *parent, GroupWise::AddressBook ab )
- : QCheckListItem( parent, "", CheckBox ),
+ : TQCheckListItem( parent, "", CheckBox ),
mId( ab.id )
{
setText( 0, ab.name );
@@ -50,42 +50,42 @@ class AddressBookItem : public QCheckListItem
else setText( 2, i18n("No") );
}
- QString id() const { return mId; }
+ TQString id() const { return mId; }
private:
- QString mId;
+ TQString mId;
};
-ResourceGroupwiseConfig::ResourceGroupwiseConfig( QWidget* parent, const char* name )
+ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
- QGridLayout *mainLayout = new QGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "URL:" ), this );
+ TQLabel *label = new TQLabel( i18n( "URL:" ), this );
mURL = new KURLRequester( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mURL, 0, 1 );
- label = new QLabel( i18n( "User:" ), this );
+ label = new TQLabel( i18n( "User:" ), this );
mUser = new KLineEdit( this );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mUser, 1, 1 );
- label = new QLabel( i18n( "Password:" ), this );
+ label = new TQLabel( i18n( "Password:" ), this );
mPassword = new KLineEdit( this );
- mPassword->setEchoMode( QLineEdit::Password );
+ mPassword->setEchoMode( TQLineEdit::Password );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mPassword, 2, 1 );
- QFrame *hline = new QFrame( this );
- hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+ TQFrame *hline = new TQFrame( this );
+ hline->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 );
- QPushButton *updateButton = new QPushButton( i18n( "Retrieve Address Book List From Server" ), this );
+ TQPushButton *updateButton = new TQPushButton( i18n( "Retrieve Address Book List From Server" ), this );
mainLayout->addMultiCellWidget( updateButton, 4, 4, 0, 1 );
mAddressBookView = new KListView( this );
@@ -96,13 +96,13 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( QWidget* parent, const char*
mainLayout->addMultiCellWidget( mAddressBookView, 5, 5, 0, 1 );
- label = new QLabel( i18n( "Address book for new contacts:" ), this );
+ label = new TQLabel( i18n( "Address book for new contacts:" ), this );
mAddressBookBox = new KComboBox( this );
mainLayout->addWidget( label, 6, 0 );
mainLayout->addWidget( mAddressBookBox, 6, 1 );
- connect( updateButton, SIGNAL( clicked() ), SLOT( updateAddressBookList() ) );
+ connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) );
}
void ResourceGroupwiseConfig::loadSettings( KRES::Resource *res )
@@ -153,10 +153,10 @@ void ResourceGroupwiseConfig::updateAddressBookList()
void ResourceGroupwiseConfig::saveAddressBookSettings()
{
- QStringList selectedRead;
- QString selectedWrite;
+ TQStringList selectedRead;
+ TQString selectedWrite;
- QListViewItemIterator it2( mAddressBookView );
+ TQListViewItemIterator it2( mAddressBookView );
while ( it2.current() ) {
AddressBookItem *item = static_cast<AddressBookItem*>( it2.current() );
if ( item->isOn() )
@@ -167,7 +167,7 @@ void ResourceGroupwiseConfig::saveAddressBookSettings()
// check if the SAB was selected when the settings were loaded and is not selected now,
// if so, clear the resource to clear the SAB data that is no longer required.
// also, set the sequence numbers to 0 so that we know the SAB should be re-fetched in its entirety the next time we do load it
- QString sab = mResource->prefs()->systemAddressBook();
+ TQString sab = mResource->prefs()->systemAddressBook();
if ( ( mReadAddressBookIds.find( sab ) != mReadAddressBookIds.end() ) && ( selectedRead.find( sab ) == selectedRead.end() ) )
{
mResource->clearCache();
@@ -189,7 +189,7 @@ void ResourceGroupwiseConfig::updateAddressBookView()
mAddressBookBox->clear();
mWriteAddressBookIds.clear();
- QStringList selectedRead = mResource->prefs()->readAddressBooks();
+ TQStringList selectedRead = mResource->prefs()->readAddressBooks();
GroupWise::AddressBook::List addressBooks = mResource->addressBooks();
GroupWise::AddressBook::List::ConstIterator abIt;
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.h b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
index 13b336acc..d5bec19a9 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
@@ -25,7 +25,7 @@
#include <kresources/configwidget.h>
#include <kdepimmacros.h>
-#include <qmap.h>
+#include <tqmap.h>
class KComboBox;
class KLineEdit;
@@ -41,7 +41,7 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceGroupwiseConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceGroupwiseConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KRES::Resource* );
@@ -63,8 +63,8 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
KListView *mAddressBookView;
KComboBox *mAddressBookBox;
- QStringList mWriteAddressBookIds;
- QStringList mReadAddressBookIds;
+ TQStringList mWriteAddressBookIds;
+ TQStringList mReadAddressBookIds;
ResourceGroupwise *mResource;
};
diff --git a/kresources/groupwise/kcal_groupwiseprefs.cpp b/kresources/groupwise/kcal_groupwiseprefs.cpp
index fab0fc457..c2e9ffc0c 100644
--- a/kresources/groupwise/kcal_groupwiseprefs.cpp
+++ b/kresources/groupwise/kcal_groupwiseprefs.cpp
@@ -27,7 +27,7 @@ GroupwisePrefs::GroupwisePrefs()
{
}
-QString GroupwisePrefs::serverUrl() const
+TQString GroupwisePrefs::serverUrl() const
{
return url();
}
diff --git a/kresources/groupwise/kcal_groupwiseprefs.h b/kresources/groupwise/kcal_groupwiseprefs.h
index bfac6ece2..fdc958685 100644
--- a/kresources/groupwise/kcal_groupwiseprefs.h
+++ b/kresources/groupwise/kcal_groupwiseprefs.h
@@ -29,7 +29,7 @@ class GroupwisePrefs : public GroupwisePrefsBase
public:
GroupwisePrefs();
- QString serverUrl() const;
+ TQString serverUrl() const;
};
}
diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp
index 1467116d1..678ad63e4 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise.cpp
@@ -30,11 +30,11 @@
#include <libkcal/calendarlocal.h>
#include <libkcal/confirmsavedialog.h>
-#include <qapplication.h>
-#include <qdatetime.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <tqapplication.h>
+#include <tqdatetime.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
#include <kabc/locknull.h>
#include <kdebug.h>
@@ -155,19 +155,19 @@ bool ResourceGroupwise::doLoad()
kdDebug() << "Download URL: " << url << endl;
- mJobData = QString::null;
+ mJobData = TQString::null;
mDownloadJob = KIO::get( url, false, false );
- connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotJobResult( KIO::Job * ) ) );
- connect( mDownloadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- SLOT( slotJobData( KIO::Job *, const QByteArray & ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotJobResult( KIO::Job * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") );
connect( mProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelLoad() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelLoad() ) );
return true;
}
@@ -186,7 +186,7 @@ void ResourceGroupwise::slotJobResult( KIO::Job *job )
clearCache();
// FIXME: This does not take into account the time zone!
- CalendarLocal calendar( QString::fromLatin1("UTC") );
+ CalendarLocal calendar( TQString::fromLatin1("UTC") );
ICalFormat ical;
if ( !ical.fromString( &calendar, mJobData ) ) {
loadError( i18n("Error parsing calendar data.") );
@@ -196,8 +196,8 @@ void ResourceGroupwise::slotJobResult( KIO::Job *job )
for( it = incidences.begin(); it != incidences.end(); ++it ) {
// kdDebug() << "INCIDENCE: " << (*it)->summary() << endl;
Incidence *i = (*it)->clone();
- QString remote = (*it)->customProperty( "GWRESOURCE", "UID" );
- QString local = idMapper().localId( remote );
+ TQString remote = (*it)->customProperty( "GWRESOURCE", "UID" );
+ TQString local = idMapper().localId( remote );
if ( local.isEmpty() ) {
idMapper().setRemoteId( i->uid(), remote );
} else {
@@ -220,7 +220,7 @@ void ResourceGroupwise::slotJobResult( KIO::Job *job )
mProgress = 0;
}
-void ResourceGroupwise::slotJobData( KIO::Job *, const QByteArray &data )
+void ResourceGroupwise::slotJobData( KIO::Job *, const TQByteArray &data )
{
// kdDebug() << "ResourceGroupwise::slotJobData()" << endl;
@@ -284,7 +284,7 @@ bool ResourceGroupwise::confirmSave()
dlg.addIncidences( deletedIncidences(), i18n("Deleted") );
int result = dlg.exec();
- return result == QDialog::Accepted;
+ return result == TQDialog::Accepted;
}
KABC::Lock *ResourceGroupwise::lock()
@@ -315,7 +315,7 @@ bool ResourceGroupwise::userSettings( ngwt__Settings *&settings )
return success;
}
-bool ResourceGroupwise::modifyUserSettings( QMap<QString, QString> & settings )
+bool ResourceGroupwise::modifyUserSettings( TQMap<TQString, TQString> & settings )
{
kdDebug() << "ResourceGroupwise::modifyUserSettings()" << endl;
diff --git a/kresources/groupwise/kcal_resourcegroupwise.h b/kresources/groupwise/kcal_resourcegroupwise.h
index cf5d6bb17..e808da0e8 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.h
+++ b/kresources/groupwise/kcal_resourcegroupwise.h
@@ -65,7 +65,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
KABC::Lock *lock();
bool userSettings( ngwt__Settings * &settings );
- bool modifyUserSettings( QMap<QString, QString> & settings );
+ bool modifyUserSettings( TQMap<TQString, TQString> & settings );
protected:
void init();
@@ -73,7 +73,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
protected slots:
void slotJobResult( KIO::Job * );
- void slotJobData( KIO::Job *, const QByteArray & );
+ void slotJobData( KIO::Job *, const TQByteArray & );
void cancelLoad();
@@ -83,7 +83,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
KIO::TransferJob *mDownloadJob;
KPIM::ProgressItem *mProgress;
- QString mJobData;
+ TQString mJobData;
bool mIsShowingError;
};
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
index 29741d201..04e1affd9 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -20,9 +20,9 @@
#include <typeinfo>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
#include <klocale.h>
#include <klistview.h>
@@ -41,29 +41,29 @@
using namespace KCal;
-ResourceGroupwiseConfig::ResourceGroupwiseConfig( QWidget* parent, const char* name )
+ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
resize( 245, 115 );
- QGridLayout *mainLayout = new QGridLayout( this, 2, 2 );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
- QLabel *label = new QLabel( i18n("URL:"), this );
+ TQLabel *label = new TQLabel( i18n("URL:"), this );
mainLayout->addWidget( label, 1, 0 );
mUrl = new KLineEdit( this );
mainLayout->addWidget( mUrl, 1, 1 );
- label = new QLabel( i18n("User:"), this );
+ label = new TQLabel( i18n("User:"), this );
mainLayout->addWidget( label, 2, 0 );
mUserEdit = new KLineEdit( this );
mainLayout->addWidget( mUserEdit, 2, 1 );
- label = new QLabel( i18n("Password:"), this );
+ label = new TQLabel( i18n("Password:"), this );
mainLayout->addWidget( label, 3, 0 );
mPasswordEdit = new KLineEdit( this );
mainLayout->addWidget( mPasswordEdit, 3, 1 );
mPasswordEdit->setEchoMode( KLineEdit::Password );
- QPushButton *settingsButton = new QPushButton( i18n( "View User Settings" ), this );
+ TQPushButton *settingsButton = new TQPushButton( i18n( "View User Settings" ), this );
mainLayout->addMultiCellWidget( settingsButton, 4, 4, 0, 1 );
mReloadConfig = new KCal::ResourceCachedReloadConfig( this );
@@ -73,7 +73,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( QWidget* parent, const char*
mainLayout->addMultiCellWidget( mSaveConfig, 6, 6, 0, 1 );
settingsButton->hide();
- // connect( settingsButton, SIGNAL( clicked() ), SLOT( slotViewUserSettings() ) );
+ // connect( settingsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotViewUserSettings() ) );
}
@@ -123,8 +123,8 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
if ( s )
{
- KDialogBase * dialog = new KDialogBase( ::qt_cast<QWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
-// QVBoxLayout * layout = new QVBoxLayout( dialog );
+ KDialogBase * dialog = new KDialogBase( ::qt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
+// TQVBoxLayout * layout = new TQVBoxLayout( dialog );
GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog );
dialog->setMainWidget( settingsWidget );
// populate dialog
@@ -133,10 +133,10 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
for( it = s->group.begin(); it != s->group.end(); ++it )
{
ngwt__SettingsGroup * group = *it;
- QString groupName;
+ TQString groupName;
if ( group->type )
{
- groupName = QString::fromUtf8( group->type->c_str() );
+ groupName = TQString::fromUtf8( group->type->c_str() );
kdDebug() << "GROUP: " << groupName << endl;;
}
KListViewItem * groupLVI = new KListViewItem( settingsWidget->m_settingsList, groupName );
@@ -144,27 +144,27 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
std::vector<class ngwt__Custom *>::const_iterator it2;
for( it2 = setting.begin(); it2 != setting.end(); ++it2 )
{
- QString setting, value;
+ TQString setting, value;
bool locked = false;
- setting = QString::fromUtf8( (*it2)->field.c_str() );
+ setting = TQString::fromUtf8( (*it2)->field.c_str() );
if ( (*it2)->value )
{
- value = QString::fromUtf8( (*it2)->value->c_str() );
+ value = TQString::fromUtf8( (*it2)->value->c_str() );
}
if ( (*it2)->locked )
locked = *((*it2)->locked);
kdDebug() << " SETTING: " << setting << " value : " << value << (locked ? "locked" : " not locked " ) << endl;
- KListViewItem * settingLVI = new KListViewItem( groupLVI, QString::null, setting, value, (locked ? "locked" : " not locked " ) );
+ KListViewItem * settingLVI = new KListViewItem( groupLVI, TQString::null, setting, value, (locked ? "locked" : " not locked " ) );
if ( !locked )
settingLVI->setRenameEnabled( 2, true );
}
}
dialog->show();
- if ( dialog->exec() == QDialog::Accepted )
+ if ( dialog->exec() == TQDialog::Accepted )
{
- QMap<QString, QString> settings = settingsWidget->dirtySettings();
+ TQMap<TQString, TQString> settings = settingsWidget->dirtySettings();
mResource->modifyUserSettings( settings );
}
}
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.h b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
index 18ead1d3a..bc6f81c74 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -43,7 +43,7 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
{
Q_OBJECT
public:
- ResourceGroupwiseConfig( QWidget *parent = 0, const char *name = 0 );
+ ResourceGroupwiseConfig( TQWidget *parent = 0, const char *name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp
index 60e768e2e..44178fe61 100644
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@@ -21,7 +21,7 @@
#include "groupwiseserver.h"
-#include <qregexp.h>
+#include <tqregexp.h>
#include <libkdepim/kabcresourcecached.h>
@@ -84,8 +84,8 @@ int kdemain( int argc, char **argv )
return 0;
}
-Groupwise::Groupwise( const QCString &protocol, const QCString &pool,
- const QCString &app )
+Groupwise::Groupwise( const TQCString &protocol, const TQCString &pool,
+ const TQCString &app )
: SlaveBase( protocol, pool, app )
{
}
@@ -103,7 +103,7 @@ void Groupwise::get( const KURL &url )
mimeType( "text/plain" );
- QString path = url.path();
+ TQString path = url.path();
debugMessage( "Path: " + path );
if ( path.contains( "/freebusy" ) ) {
@@ -116,26 +116,26 @@ void Groupwise::get( const KURL &url )
else
getAddressbook( url );
} else {
- QString error = i18n("Unknown path. Known paths are '/freebusy/', "
- "'/calendar/' and '/addressbook/'.") + QString(" path was %1" ).arg( url.url() );
+ TQString error = i18n("Unknown path. Known paths are '/freebusy/', "
+ "'/calendar/' and '/addressbook/'.") + TQString(" path was %1" ).arg( url.url() );
errorMessage( error );
}
kdDebug(7000) << "Groupwise::get() done" << endl;
}
-QString Groupwise::soapUrl( const KURL &url )
+TQString Groupwise::soapUrl( const KURL &url )
{
// FIXME: Get SSL from parameter
bool useSsl = url.protocol() == "groupwises";
- QString u;
+ TQString u;
if ( useSsl ) u = "https";
else u = "http";
u += "://" + url.host() + ":";
if ( url.port() )
- u += QString::number( url.port() );
+ u += TQString::number( url.port() );
else {
u += "7191";
}
@@ -148,7 +148,7 @@ QString Groupwise::soapUrl( const KURL &url )
url.path().startsWith("/calendar/") ||
url.path().startsWith("/addressbook/" ) ) )
{
- QString soapPath = QString("/") + QStringList::split('/', url.path())[0];
+ TQString soapPath = TQString("/") + TQStringList::split('/', url.path())[0];
u += soapPath;
}
else
@@ -159,24 +159,24 @@ QString Groupwise::soapUrl( const KURL &url )
void Groupwise::getFreeBusy( const KURL &url )
{
- QString file = url.filename();
+ TQString file = url.filename();
if ( file.right( 4 ) != ".ifb" ) {
- QString error = i18n("Illegal filename. File has to have '.ifb' suffix.");
+ TQString error = i18n("Illegal filename. File has to have '.ifb' suffix.");
errorMessage( error );
} else {
- QString email = file.left( file.length() - 4 );
+ TQString email = file.left( file.length() - 4 );
debugMessage( "Email: " + email );
// Sanitise local Nuernberg email addresses
kdDebug() << "Email before sanitizing: " << email << endl;
- email = email.replace(QRegExp("\\.EMEA5-1\\.EMEA5" ), "" );
- email = email.replace(QRegExp("\\.Suse.INTERNET" ), "" );
+ email = email.replace(TQRegExp("\\.EMEA5-1\\.EMEA5" ), "" );
+ email = email.replace(TQRegExp("\\.Suse.INTERNET" ), "" );
kdDebug() << "Email after sanitizing: " << email << endl;
- QString u = soapUrl( url );
+ TQString u = soapUrl( url );
- QString user = url.user();
- QString pass = url.pass();
+ TQString user = url.user();
+ TQString pass = url.pass();
debugMessage( "URL: " + u );
debugMessage( "User: " + user );
@@ -190,8 +190,8 @@ void Groupwise::getFreeBusy( const KURL &url )
GroupwiseServer server( u, user, pass, 0 );
// FIXME: Read range from configuration or URL parameters.
- QDate start = QDate::currentDate().addDays( -3 );
- QDate end = QDate::currentDate().addDays( 60 );
+ TQDate start = TQDate::currentDate().addDays( -3 );
+ TQDate end = TQDate::currentDate().addDays( 60 );
fb->setDtStart( start );
fb->setDtEnd( end );
@@ -211,8 +211,8 @@ void Groupwise::getFreeBusy( const KURL &url )
}
#if 0
- QDateTime s = QDateTime( QDate( 2004, 9, 27 ), QTime( 10, 0 ) );
- QDateTime e = QDateTime( QDate( 2004, 9, 27 ), QTime( 11, 0 ) );
+ TQDateTime s = TQDateTime( TQDate( 2004, 9, 27 ), TQTime( 10, 0 ) );
+ TQDateTime e = TQDateTime( TQDate( 2004, 9, 27 ), TQTime( 11, 0 ) );
fb->addPeriod( s, e );
#endif
@@ -220,7 +220,7 @@ void Groupwise::getFreeBusy( const KURL &url )
// FIXME: This does not take into account the time zone!
KCal::ICalFormat format;
- QString ical = format.createScheduleMessage( fb, KCal::Scheduler::Publish );
+ TQString ical = format.createScheduleMessage( fb, KCal::Scheduler::Publish );
data( ical.utf8() );
@@ -230,10 +230,10 @@ void Groupwise::getFreeBusy( const KURL &url )
void Groupwise::getCalendar( const KURL &url )
{
- QString u = soapUrl( url );
+ TQString u = soapUrl( url );
- QString user = url.user();
- QString pass = url.pass();
+ TQString user = url.user();
+ TQString pass = url.pass();
debugMessage( "URL: " + u );
debugMessage( "User: " + user );
@@ -241,7 +241,7 @@ void Groupwise::getCalendar( const KURL &url )
GroupwiseServer server( u, user, pass, 0 );
- KCal::CalendarLocal calendar( QString::fromLatin1("UTC"));
+ KCal::CalendarLocal calendar( TQString::fromLatin1("UTC"));
kdDebug() << "Login" << endl;
if ( !server.login() ) {
@@ -257,7 +257,7 @@ void Groupwise::getCalendar( const KURL &url )
KCal::ICalFormat format;
- QString ical = format.toString( &calendar );
+ TQString ical = format.toString( &calendar );
data( ical.utf8() );
@@ -266,26 +266,26 @@ void Groupwise::getCalendar( const KURL &url )
void Groupwise::getAddressbook( const KURL &url )
{
- QString u = soapUrl( url );
+ TQString u = soapUrl( url );
- QString user = url.user();
- QString pass = url.pass();
+ TQString user = url.user();
+ TQString pass = url.pass();
debugMessage( "URL: " + u );
debugMessage( "User: " + user );
debugMessage( "Password: " + pass );
- QString query = url.query();
+ TQString query = url.query();
if ( query.isEmpty() || query == "?" ) {
errorMessage( i18n("No addressbook IDs given.") );
} else {
- QStringList ids;
+ TQStringList ids;
query = query.mid( 1 );
- QStringList queryItems = QStringList::split( "&", query );
- QStringList::ConstIterator it;
+ TQStringList queryItems = TQStringList::split( "&", query );
+ TQStringList::ConstIterator it;
for( it = queryItems.begin(); it != queryItems.end(); ++it ) {
- QStringList item = QStringList::split( "=", (*it) );
+ TQStringList item = TQStringList::split( "=", (*it) );
if ( item.count() == 2 && item[ 0 ] == "addressbookid" ) {
ids.append( item[ 1 ] );
}
@@ -295,14 +295,14 @@ void Groupwise::getAddressbook( const KURL &url )
GroupwiseServer server( u, user, pass, 0 );
- connect( &server, SIGNAL( readAddressBookTotalSize( int ) ),
- SLOT( slotReadAddressBookTotalSize( int ) ) );
- connect( &server, SIGNAL( readAddressBookProcessedSize( int ) ),
- SLOT( slotReadAddressBookProcessedSize( int ) ) );
- connect( &server, SIGNAL( errorMessage( const QString &, bool ) ),
- SLOT( slotServerErrorMessage( const QString &, bool ) ) );
- connect( &server, SIGNAL( gotAddressees( const KABC::Addressee::List ) ),
- SLOT( slotReadReceiveAddressees( const KABC::Addressee::List ) ) );
+ 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 KABC::Addressee::List ) ),
+ TQT_SLOT( slotReadReceiveAddressees( const KABC::Addressee::List ) ) );
kdDebug() << "Login" << endl;
if ( !server.login() ) {
@@ -324,7 +324,7 @@ void Groupwise::slotReadReceiveAddressees( const KABC::Addressee::List addressee
kdDebug() << "Groupwise::slotReadReceiveAddressees() - passing " << addressees.count() << " contacts back to application" << endl;
KABC::VCardConverter conv;
- QString vcard = conv.createVCards( addressees );
+ TQString vcard = conv.createVCards( addressees );
data( vcard.utf8() );
}
@@ -332,16 +332,16 @@ void Groupwise::slotReadReceiveAddressees( const KABC::Addressee::List addressee
void Groupwise::updateAddressbook( const KURL &url )
{
kdDebug() << "Groupwise::updateAddressbook() " << url << endl;
- QString u = soapUrl( url );
+ TQString u = soapUrl( url );
- QString user = url.user();
- QString pass = url.pass();
+ TQString user = url.user();
+ TQString pass = url.pass();
debugMessage( "update AB URL: " + u );
debugMessage( "update AB User: " + user );
debugMessage( "update AB Password: " + pass );
- QString query = url.query();
+ TQString query = url.query();
unsigned long lastSequenceNumber = 0;
unsigned long lastPORebuildTime = 0;
@@ -350,13 +350,13 @@ void Groupwise::updateAddressbook( const KURL &url )
errorMessage( i18n("No addressbook IDs given.") );
return;
} else {
- QStringList ids;
+ TQStringList ids;
query = query.mid( 1 );
- QStringList queryItems = QStringList::split( "&", query );
- QStringList::ConstIterator it;
+ TQStringList queryItems = TQStringList::split( "&", query );
+ TQStringList::ConstIterator it;
for( it = queryItems.begin(); it != queryItems.end(); ++it ) {
- QStringList item = QStringList::split( "=", (*it) );
+ TQStringList item = TQStringList::split( "=", (*it) );
if ( item.count() == 2 && item[ 0 ] == "addressbookid" ) {
ids.append( item[ 1 ] );
}
@@ -369,10 +369,10 @@ void Groupwise::updateAddressbook( const KURL &url )
debugMessage( "update IDs: " + ids.join( "," ) );
GroupwiseServer server( u, user, pass, 0 );
- connect( &server, SIGNAL( errorMessage( const QString &, bool ) ),
- SLOT( slotServerErrorMessage( const QString &, bool ) ) );
- connect( &server, SIGNAL( gotAddressees( const KABC::Addressee::List ) ),
- SLOT( slotReadReceiveAddressees( const KABC::Addressee::List ) ) );
+ connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ),
+ TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
+ connect( &server, TQT_SIGNAL( gotAddressees( const KABC::Addressee::List ) ),
+ TQT_SLOT( slotReadReceiveAddressees( const KABC::Addressee::List ) ) );
kdDebug() << " Login" << endl;
if ( !server.login() ) {
@@ -391,12 +391,12 @@ void Groupwise::updateAddressbook( const KURL &url )
}
}
-void Groupwise::errorMessage( const QString &msg )
+void Groupwise::errorMessage( const TQString &msg )
{
error( KIO::ERR_SLAVE_DEFINED, msg );
}
-void Groupwise::debugMessage( const QString &msg )
+void Groupwise::debugMessage( const TQString &msg )
{
#if 0
data( ( msg + "\n" ).utf8() );
@@ -416,7 +416,7 @@ void Groupwise::slotReadAddressBookProcessedSize( int size )
processedSize( size );
}
-void Groupwise::slotServerErrorMessage( const QString & serverErrorMessage, bool fatal )
+void Groupwise::slotServerErrorMessage( const TQString & serverErrorMessage, bool fatal )
{
kdDebug() << "Groupwise::slotJobErrorMessage()" << serverErrorMessage << ( fatal ? ", FATAL!" : ", proceeding" ) << endl;
errorMessage( i18n( "An error occurred while communicating with the GroupWise server:\n%1" ).arg( serverErrorMessage ) );
diff --git a/kresources/groupwise/kioslave/groupwise.h b/kresources/groupwise/kioslave/groupwise.h
index c4362d634..9a816ad85 100644
--- a/kresources/groupwise/kioslave/groupwise.h
+++ b/kresources/groupwise/kioslave/groupwise.h
@@ -22,31 +22,31 @@
#include <kio/slavebase.h>
-#include <qobject.h>
+#include <tqobject.h>
-class Groupwise : public QObject, public KIO::SlaveBase
+class Groupwise : public TQObject, public KIO::SlaveBase
{
Q_OBJECT
public:
void get( const KURL &url );
- Groupwise( const QCString &protocol, const QCString &pool,
- const QCString &app );
+ Groupwise( const TQCString &protocol, const TQCString &pool,
+ const TQCString &app );
protected:
- void debugMessage( const QString & );
- void errorMessage( const QString & );
+ void debugMessage( const TQString & );
+ void errorMessage( const TQString & );
void getFreeBusy( const KURL &url );
void getCalendar( const KURL &url );
void getAddressbook( const KURL &url );
void updateAddressbook( const KURL &url );
- QString soapUrl( const KURL &url );
+ TQString soapUrl( const KURL &url );
protected slots:
void slotReadAddressBookTotalSize( int );
void slotReadAddressBookProcessedSize( int );
- void slotServerErrorMessage( const QString &, bool );
+ void slotServerErrorMessage( const TQString &, bool );
void slotReadReceiveAddressees( const KABC::Addressee::List );
};
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index a971e56a1..2abb8f452 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -110,10 +110,10 @@ ngwt__Contact* ContactConverter::convertToContact( const KABC::Addressee &addr )
ngwt__EmailAddressList* emailList = soap_new_ngwt__EmailAddressList( soap(), -1 );
std::vector<std::string>* list = soap_new_std__vectorTemplateOfstd__string( soap(), -1 );
- QStringList emails = addr.emails();
+ TQStringList emails = addr.emails();
emailList->primary = qStringToString( emails.first() );
- QStringList::Iterator it;
+ TQStringList::Iterator it;
for ( it = emails.begin(); it != emails.end(); ++it )
list->push_back( std::string( (*it).utf8() ) );
@@ -284,7 +284,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
if ( fullName->displayName )
addr.setFormattedName( stringToQString( fullName->displayName ) );
else
- addr.setFormattedName( QString::null );
+ addr.setFormattedName( TQString::null );
if ( fullName->namePrefix )
addr.setPrefix( stringToQString( fullName->namePrefix ) );
@@ -304,7 +304,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
// Emails
if ( contact->emailList ) {
- QStringList emails;
+ TQStringList emails;
if ( contact->emailList->primary )
emails.append( stringToQString( contact->emailList->primary ) );
@@ -324,7 +324,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
// Phone numbers
if ( contact->phoneList && !contact->phoneList->phone.empty() ) {
- QString defaultNumber = stringToQString( contact->phoneList->default_ );
+ TQString defaultNumber = stringToQString( contact->phoneList->default_ );
std::vector<class ngwt__PhoneNumber*> list = contact->phoneList->phone;
std::vector<class ngwt__PhoneNumber*>::const_iterator it;
@@ -371,7 +371,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
ngwt__PersonalInfo* info = contact->personalInfo;
if ( info->birthday ) {
- QDate date = stringToQDate( info->birthday );
+ TQDate date = stringToQDate( info->birthday );
if ( date.isValid() )
addr.setBirthday( date );
}
@@ -383,28 +383,28 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
// IM addresses
if ( contact->imList ) {
// put all the im addresses on the same service into the same qstringlist
- QMap<QString, QStringList> addressMap;
+ TQMap<TQString, TQStringList> addressMap;
std::vector<ngwt__ImAddress*> list = contact->imList->im;
std::vector<ngwt__ImAddress*>::const_iterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
- QStringList addressesForService = addressMap[ stringToQString( (*it)->service ) ];
+ TQStringList addressesForService = addressMap[ stringToQString( (*it)->service ) ];
addressesForService.append( stringToQString( (*it)->address ) );
addressMap.insert( stringToQString( (*it)->service ), addressesForService );
}
// then construct a custom field from each qstringlist
- QMap<QString, QStringList>::Iterator addrIt;
+ TQMap<TQString, TQStringList>::Iterator addrIt;
for ( addrIt = addressMap.begin(); addrIt != addressMap.end(); ++addrIt )
{
- QString protocol = addrIt.key();
- QStringList addresses = addrIt.data();
+ TQString protocol = addrIt.key();
+ TQStringList addresses = addrIt.data();
//kdDebug() << "got IM addresses for '" << protocol << "' : " << addresses << endl;
// TODO: map protocol to KDE's set of known protocol names (need to know the set of services in use elsewhere)
if ( protocol == "nov" )
protocol = "groupwise";
- addr.insertCustom( QString::fromLatin1("messaging/%1").arg( protocol ),
- QString::fromLatin1( "All" ),
- addresses.join( QChar( 0xE000 ) ) );
+ addr.insertCustom( TQString::fromLatin1("messaging/%1").arg( protocol ),
+ TQString::fromLatin1( "All" ),
+ addresses.join( TQChar( 0xE000 ) ) );
}
}
@@ -576,23 +576,23 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
// if it contains IM addresses
// extract each one and add it to imList
- const QStringList customs = addr.customs();
- QStringList::ConstIterator it;
+ const TQStringList customs = addr.customs();
+ TQStringList::ConstIterator it;
bool isSet = false;
for ( it = customs.begin(); it != customs.end(); ++it ) {
- QString app, name, value;
+ TQString app, name, value;
splitField( *it, app, name, value );
- if ( app.startsWith( QString::fromLatin1( "messaging/" ) ) && name == QString::fromLatin1( "All" ) ) {
+ if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) && name == TQString::fromLatin1( "All" ) ) {
// get the protocol for this field
- QString protocol = app.section( '/', 1, 1 );
+ TQString protocol = app.section( '/', 1, 1 );
if ( !protocol.isEmpty() ) {
if ( protocol == "groupwise" )
protocol = "novell";
- QStringList addresses = QStringList::split( QChar( 0xE000 ), value );
- QStringList::iterator end = addresses.end();
+ TQStringList addresses = TQStringList::split( TQChar( 0xE000 ), value );
+ TQStringList::iterator end = addresses.end();
// extract each address for this protocol, and create an ngwt__ImAddress for it, and append it to list.
- for ( QStringList::ConstIterator it = addresses.begin(); it != end; ++it ) {
+ for ( TQStringList::ConstIterator it = addresses.begin(); it != end; ++it ) {
ngwt__ImAddress* address = soap_new_ngwt__ImAddress( soap(), -1 );
address->service = soap_new_std__string( soap(), -1 );
address->address = soap_new_std__string( soap(), -1 );
@@ -616,11 +616,11 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
}
}
-void ContactConverter::splitField( const QString &str, QString &app, QString &name, QString &value )
+void ContactConverter::splitField( const TQString &str, TQString &app, TQString &name, TQString &value )
{
int colon = str.find( ':' );
if ( colon != -1 ) {
- QString tmp = str.left( colon );
+ TQString tmp = str.left( colon );
value = str.mid( colon + 1 );
int dash = tmp.find( '-' );
diff --git a/kresources/groupwise/soap/contactconverter.h b/kresources/groupwise/soap/contactconverter.h
index b4376713f..6594c6d0e 100644
--- a/kresources/groupwise/soap/contactconverter.h
+++ b/kresources/groupwise/soap/contactconverter.h
@@ -47,8 +47,8 @@ class ContactConverter : public GWConverter
which is a different structure to that used for phone numbers, email addresses etc */
ngwt__ImAddressList* convertImAddresses( const KABC::Addressee& );
// splits up an arbitrary custom field
- void splitField( const QString &str, QString &app, QString &name, QString &value );
- static QMap<QString, QString > mIMProtocolMap;
+ void splitField( const TQString &str, TQString &app, TQString &name, TQString &value );
+ static TQMap<TQString, TQString > mIMProtocolMap;
};
#endif
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 8445be9ff..28c73b68d 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -38,8 +38,8 @@
#include <kdebug.h>
#include <klocale.h>
-#include <qnamespace.h>
-#include <qfile.h>
+#include <tqnamespace.h>
+#include <tqfile.h>
#include "ksslsocket.h"
#include "contactconverter.h"
@@ -55,11 +55,11 @@
#include "groupwiseserver.h"
-static QMap<struct soap *,GroupwiseServer *> mServerMap;
+static TQMap<struct soap *,GroupwiseServer *> mServerMap;
int myOpen( struct soap *soap, const char *endpoint, const char *host, int port )
{
- QMap<struct soap *,GroupwiseServer *>::ConstIterator it;
+ TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
it = mServerMap.find( soap );
if ( it == mServerMap.end() ) {
soap->error = SOAP_FAULT;
@@ -71,7 +71,7 @@ int myOpen( struct soap *soap, const char *endpoint, const char *host, int port
int myClose( struct soap *soap )
{
- QMap<struct soap *,GroupwiseServer *>::ConstIterator it;
+ TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
it = mServerMap.find( soap );
if ( it == mServerMap.end() ) return SOAP_FAULT;
@@ -80,7 +80,7 @@ int myClose( struct soap *soap )
int mySendCallback( struct soap *soap, const char *s, size_t n )
{
- QMap<struct soap *,GroupwiseServer *>::ConstIterator it;
+ TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
it = mServerMap.find( soap );
if ( it == mServerMap.end() ) return SOAP_FAULT;
@@ -89,7 +89,7 @@ int mySendCallback( struct soap *soap, const char *s, size_t n )
size_t myReceiveCallback( struct soap *soap, char *s, size_t n )
{
- QMap<struct soap *,GroupwiseServer *>::ConstIterator it;
+ TQMap<struct soap *,GroupwiseServer *>::ConstIterator it;
it = mServerMap.find( soap );
if ( it == mServerMap.end() ) {
kdDebug() << "No soap object found" << endl;
@@ -114,11 +114,11 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
// kdDebug() << "Creating KSSLSocket()" << endl;
m_sock = new KSSLSocket();
m_sock->setTimeout( KProtocolManager::connectTimeout() );
- connect( m_sock, SIGNAL( sslFailure() ), SLOT( slotSslError() ) );
+ connect( m_sock, TQT_SIGNAL( sslFailure() ), TQT_SLOT( slotSslError() ) );
} else {
m_sock = new KExtendedSocket();
}
- mErrorText = QString::null;
+ mErrorText = TQString::null;
m_sock->reset();
m_sock->setBlockingMode( false );
@@ -128,8 +128,8 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
int rc = m_sock->lookup();
if (rc != 0 ) {
kdError() << "gSoapOpen: lookup of " << host << " failed " << rc << endl;
- QString errorMessage;
- errorMessage = QString::fromLatin1( strerror( errno ) );
+ TQString errorMessage;
+ errorMessage = TQString::fromLatin1( strerror( errno ) );
perror( 0 );
soap->error = SOAP_TCP_ERROR;
mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
@@ -139,15 +139,15 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
rc = m_sock->connect();
if ( rc != 0 ) {
kdError() << "gSoapOpen: connect failed " << rc << endl;
- QString errorMessage;
+ TQString errorMessage;
if ( rc == -1 ) {
- errorMessage = QString::fromLatin1( strerror( errno ) );
+ errorMessage = TQString::fromLatin1( strerror( errno ) );
perror( 0 );
}
//set the soap struct's error here!
else {
if ( rc == -3 )
- errorMessage = QString::fromLatin1( "Connection timed out. Check host and port number" );
+ errorMessage = TQString::fromLatin1( "Connection timed out. Check host and port number" );
}
mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
soap->error =SOAP_TCP_ERROR;
@@ -263,9 +263,9 @@ size_t GroupwiseServer::gSoapReceiveCallback( struct soap *soap, char *s,
return ret;
}
-GroupwiseServer::GroupwiseServer( const QString &url, const QString &user,
- const QString &password, QObject *parent )
- : QObject( parent, "GroupwiseServer" ),
+GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user,
+ const TQString &password, TQObject *parent )
+ : TQObject( parent, "GroupwiseServer" ),
mUrl( url ), mUser( user ), mPassword( password ),
mSSL( url.left(6)=="https:" ), m_sock( 0 ),
mError( 0 )
@@ -644,7 +644,7 @@ bool GroupwiseServer::logout()
return true;
}
-GroupWise::DeltaInfo GroupwiseServer::getDeltaInfo( const QStringList & addressBookIds )
+GroupWise::DeltaInfo GroupwiseServer::getDeltaInfo( const TQStringList & addressBookIds )
{
GroupWise::DeltaInfo info;
info.count = 0;
@@ -719,7 +719,7 @@ GroupWise::AddressBook::List GroupwiseServer::addressBookList()
return books;
}
-bool GroupwiseServer::readAddressBooksSynchronous( const QStringList &addrBookIds )
+bool GroupwiseServer::readAddressBooksSynchronous( const TQStringList &addrBookIds )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::readAddressBooksSynchronous(): no session." << endl;
@@ -735,7 +735,7 @@ bool GroupwiseServer::readAddressBooksSynchronous( const QStringList &addrBookId
return true;
}
-bool GroupwiseServer::updateAddressBooks( const QStringList &addrBookIds, const unsigned long startSequenceNumber, const unsigned long lastPORebuildTime )
+bool GroupwiseServer::updateAddressBooks( const TQStringList &addrBookIds, const unsigned long startSequenceNumber, const unsigned long lastPORebuildTime )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::updateAddressBooks(): no session." << endl;
@@ -757,7 +757,7 @@ bool GroupwiseServer::updateAddressBooks( const QStringList &addrBookIds, const
return true;
}
-std::string GroupwiseServer::getFullIDFor( const QString & gwRecordIDFromIcal )
+std::string GroupwiseServer::getFullIDFor( const TQString & gwRecordIDFromIcal )
{
// first get the ID of the calendar folder - because we don't store this in the resource we have to fetch it manually
std::string calendarFolderID;
@@ -847,12 +847,12 @@ bool GroupwiseServer::acceptIncidence( KCal::Incidence *incidence )
GWConverter conv( mSoap );
- QString qGwUid = incidence->customProperty( "GWRESOURCE", "UID" );
+ TQString qGwUid = incidence->customProperty( "GWRESOURCE", "UID" );
std::string gwUID;
if ( qGwUid.isEmpty() )
{
- QString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
+ TQString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
// we need to do a getItem to get the item's complete ID, including the container portion
// this is only necessary because the Ical GWRECORDID property is incomplete
gwUID = getFullIDFor( gwRecordIDFromIcal );
@@ -899,7 +899,7 @@ bool GroupwiseServer::declineIncidence( KCal::Incidence *incidence )
if ( gwUID.empty() )
{
- QString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
+ TQString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
// we need to do a getItem to get the item's complete ID, including the container portion
// this is only necessary because the Ical GWRECORDID property is incomplete
gwUID = getFullIDFor( gwRecordIDFromIcal );
@@ -941,7 +941,7 @@ bool GroupwiseServer::addIncidence( KCal::Incidence *incidence,
kdDebug() << "GroupwiseServer::addIncidence() " << incidence->summary()
<< endl;
- QString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
+ TQString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
if( !gwRecordIDFromIcal.isEmpty() || !incidence->customProperty( "GWRESOURCE", "UID" ).isEmpty() ) {
kdDebug() << "Incidence has GroupWise ID already: (" << gwRecordIDFromIcal << "ical|" << incidence->customProperty( "GWRESOURCE", "UID" ) << "soap) and organizer : " << incidence->organizer().email() << endl;
return acceptIncidence( incidence );
@@ -985,7 +985,7 @@ bool GroupwiseServer::addIncidence( KCal::Incidence *incidence,
{
std::string firstId = *(response.id.begin() );
incidence->setCustomProperty( "GWRESOURCE", "UID",
- QString::fromUtf8( firstId.c_str() ) );
+ TQString::fromUtf8( firstId.c_str() ) );
}
return true;
}
@@ -1106,7 +1106,7 @@ bool GroupwiseServer::checkResponse( int result, ngwt__Status *status )
kdDebug() << "SOAP call succeeded" << endl;
}
if ( status && status->code != 0 ) {
- QString msg = "SOAP Response Status: " + QString::number( status->code );
+ TQString msg = "SOAP Response Status: " + TQString::number( status->code );
if ( status->description ) {
msg += " ";
msg += status->description->c_str();
@@ -1130,11 +1130,11 @@ bool GroupwiseServer::deleteIncidence( KCal::Incidence *incidence )
<< endl;
// decline if necessary on the server
- QString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
+ TQString gwRecordIDFromIcal = incidence->nonKDECustomProperty( "X-GWRECORDID" );
// debug contents of message custom properties
kdDebug() << "incidence custom properties BEGIN" << endl;
- typedef QMap<QCString, QString> PropMap;
+ typedef TQMap<TQCString, TQString> PropMap;
PropMap customs = incidence->customProperties();
PropMap::Iterator it;
for ( it = customs.begin(); it != customs.end(); ++it )
@@ -1219,7 +1219,7 @@ bool GroupwiseServer::retractRequest( KCal::Incidence *incidence, RetractCause c
return checkResponse( result, response.status );
}
-bool GroupwiseServer::insertAddressee( const QString &addrBookId, KABC::Addressee &addr )
+bool GroupwiseServer::insertAddressee( const TQString &addrBookId, KABC::Addressee &addr )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::insertAddressee(): no session." << endl;
@@ -1244,7 +1244,7 @@ bool GroupwiseServer::insertAddressee( const QString &addrBookId, KABC::Addresse
&request, &response );
if ( !checkResponse( result, response.status ) ) return false;
- addr.insertCustom( "GWRESOURCE", "UID", QString::fromUtf8( response.id.front().c_str() ) );
+ addr.insertCustom( "GWRESOURCE", "UID", TQString::fromUtf8( response.id.front().c_str() ) );
addr.setChanged( false );
return true;
@@ -1325,8 +1325,8 @@ bool GroupwiseServer::readCalendarSynchronous( KCal::Calendar *cal )
return true;
}
-bool GroupwiseServer::readFreeBusy( const QString &email,
- const QDate &start, const QDate &end, KCal::FreeBusy *freeBusy )
+bool GroupwiseServer::readFreeBusy( const TQString &email,
+ const TQDate &start, const TQDate &end, KCal::FreeBusy *freeBusy )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::readFreeBusy(): no session." << endl;
@@ -1370,7 +1370,7 @@ bool GroupwiseServer::readFreeBusy( const QString &email,
// Get free/busy data
_ngwm__getFreeBusyRequest getFreeBusyRequest;
- getFreeBusyRequest.freeBusySessionId = QString::number( fbSessionId ).utf8();
+ getFreeBusyRequest.freeBusySessionId = TQString::number( fbSessionId ).utf8();
_ngwm__getFreeBusyResponse getFreeBusyResponse;
@@ -1408,8 +1408,8 @@ bool GroupwiseServer::readFreeBusy( const QString &email,
if ( blocks ) {
std::vector<class ngwt__FreeBusyBlock *>::const_iterator it2;
for( it2 = blocks->begin(); it2 != blocks->end(); ++it2 ) {
- QDateTime blockStart = conv.charToQDateTime( (*it2)->startDate );
- QDateTime blockEnd = conv.charToQDateTime( (*it2)->endDate );
+ TQDateTime blockStart = conv.charToQDateTime( (*it2)->startDate );
+ TQDateTime blockEnd = conv.charToQDateTime( (*it2)->endDate );
ngwt__AcceptLevel acceptLevel = *(*it2)->acceptLevel;
/* TODO: show Free/Busy subject in diagram - we need to support these as people use it for checking others' calendars */
@@ -1458,7 +1458,7 @@ void GroupwiseServer::emitReadAddressBookProcessedSize( int s )
emit readAddressBookProcessedSize( s );
}
-void GroupwiseServer::emitErrorMessage( const QString & msg, bool fatal )
+void GroupwiseServer::emitErrorMessage( const TQString & msg, bool fatal )
{
emit errorMessage( msg, fatal );
}
@@ -1468,16 +1468,16 @@ void GroupwiseServer::emitGotAddressees( const KABC::Addressee::List addressees
emit gotAddressees( addressees );
}
-void GroupwiseServer::log( const QString &prefix, const char *s, size_t n )
+void GroupwiseServer::log( const TQString &prefix, const char *s, size_t n )
{
if ( mLogFile.isEmpty() ) return;
kdDebug() << "GroupwiseServer::log() " << prefix << " " << n << " bytes"
<< endl;
- QString log = mLogFile + "_" + QString::number( getpid() ) +
+ TQString log = mLogFile + "_" + TQString::number( getpid() ) +
"_" + prefix + ".log";
- QFile f( log );
+ TQFile f( log );
if ( !f.open( IO_WriteOnly | IO_Append ) ) {
kdError() << "Unable to open log file '" << log << "'" << endl;
} else {
@@ -1564,7 +1564,7 @@ bool GroupwiseServer::readUserSettings( ngwt__Settings *&returnedSettings )
return true; /** FIXME return false if no settings fetched */
}
-bool GroupwiseServer::modifyUserSettings( QMap<QString, QString> & settings )
+bool GroupwiseServer::modifyUserSettings( TQMap<TQString, TQString> & settings )
{
kdDebug() << "GroupwiseServer::userSettings()" << endl;
@@ -1575,7 +1575,7 @@ bool GroupwiseServer::modifyUserSettings( QMap<QString, QString> & settings )
_ngwm__modifySettingsRequest request;
_ngwm__modifySettingsResponse response;
request.settings = soap_new_ngwt__SettingsList( mSoap, -1 );
- QMap<QString, QString>::Iterator it;
+ TQMap<TQString, TQString>::Iterator it;
for ( it = settings.begin(); it != settings.end(); ++it )
{
kdDebug() << " creating Custom for " << it.key() << ", " << it.data() << endl;
@@ -1610,7 +1610,7 @@ bool GroupwiseServer::setCompleted( KCal::Todo * todo )
if ( todo )
{
GWConverter conv( mSoap );
- QString id = todo->customProperty( "GWRESOURCE", "UID" );
+ TQString id = todo->customProperty( "GWRESOURCE", "UID" );
ngwt__ItemRefList * items = soap_new_ngwt__ItemRefList( mSoap, 1 );
items->item.push_back( *( conv.qStringToString( id ) ) );
if ( todo->isCompleted() )
diff --git a/kresources/groupwise/soap/groupwiseserver.h b/kresources/groupwise/soap/groupwiseserver.h
index 8197ba5cd..8117ebb2b 100644
--- a/kresources/groupwise/soap/groupwiseserver.h
+++ b/kresources/groupwise/soap/groupwiseserver.h
@@ -23,12 +23,12 @@
#include <kio/job.h>
#include <kio/jobclasses.h>
-#include <qapplication.h>
-#include <qmap.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qthread.h>
-#include <qvaluelist.h>
+#include <tqapplication.h>
+#include <tqmap.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqthread.h>
+#include <tqvaluelist.h>
#include <string>
@@ -69,13 +69,13 @@ enum ErrorCode { NoError, RefreshNeeded };
class AddressBook
{
public:
- typedef QValueList<AddressBook> List;
+ typedef TQValueList<AddressBook> List;
AddressBook() : isPersonal( false ), isFrequentContacts( false ), isSystemAddressBook( false ) {}
- QString id;
- QString name;
- QString description;
+ TQString id;
+ TQString name;
+ TQString description;
bool isPersonal;
bool isFrequentContacts;
bool isSystemAddressBook;
@@ -98,12 +98,12 @@ class GroupwiseServer : public QObject
public:
bool checkResponse( int result, ngwt__Status *status );
enum RetractCause { DueToResend, Other };
- GroupwiseServer( const QString &url, const QString &user,
- const QString &password, QObject *parent );
+ GroupwiseServer( const TQString &url, const TQString &user,
+ const TQString &password, TQObject *parent );
~GroupwiseServer();
int error() const { return mError; }
- QString errorText() const { return mErrorText; }
+ TQString errorText() const { return mErrorText; }
bool login();
bool logout();
@@ -149,22 +149,22 @@ class GroupwiseServer : public QObject
GroupWise::AddressBook::List addressBookList();
- bool readAddressBooksSynchronous( const QStringList &addrBookIds );
- bool updateAddressBooks( const QStringList &addrBookIds,
+ bool readAddressBooksSynchronous( const TQStringList &addrBookIds );
+ bool updateAddressBooks( const TQStringList &addrBookIds,
const unsigned long startSequenceNumber, const unsigned long lastPORebuildTime );
- bool insertAddressee( const QString &addrBookId, KABC::Addressee& );
+ bool insertAddressee( const TQString &addrBookId, KABC::Addressee& );
bool changeAddressee( const KABC::Addressee& );
bool removeAddressee( const KABC::Addressee& );
- bool readFreeBusy( const QString &email, const QDate &start,
- const QDate &end, KCal::FreeBusy * );
+ bool readFreeBusy( const TQString &email, const TQDate &start,
+ const TQDate &end, KCal::FreeBusy * );
bool dumpData();
void dumpFolderList();
// bool getDelta();
- GroupWise::DeltaInfo getDeltaInfo( const QStringList & addressBookIds );
+ GroupWise::DeltaInfo getDeltaInfo( const TQStringList & addressBookIds );
bool getCategoryList();
@@ -176,20 +176,20 @@ class GroupwiseServer : public QObject
void emitReadAddressBookTotalSize( int );
void emitReadAddressBookProcessedSize( int );
- void emitErrorMessage( const QString &, bool );
+ void emitErrorMessage( const TQString &, bool );
void emitGotAddressees( const KABC::Addressee::List );
bool readUserSettings( ngwt__Settings *&settings );
- bool modifyUserSettings( QMap<QString, QString> & );
+ bool modifyUserSettings( TQMap<TQString, TQString> & );
- QString userEmail() const { return mUserEmail; }
- QString userName() const { return mUserName; }
- QString userUuid() const { return mUserUuid; }
+ TQString userEmail() const { return mUserEmail; }
+ TQString userName() const { return mUserName; }
+ TQString userUuid() const { return mUserUuid; }
signals:
void readAddressBookTotalSize( int );
void readAddressBookProcessedSize( int );
- void errorMessage( const QString &, bool );
+ void errorMessage( const TQString &, bool );
void gotAddressees( const KABC::Addressee::List );
protected:
@@ -205,29 +205,29 @@ class GroupwiseServer : public QObject
/**
* Given a partial record ID, query the server for the full version from the calendar folder
*/
- std::string getFullIDFor( const QString & );
+ std::string getFullIDFor( const TQString & );
/**
* Check if an incidence involves other people
*/
bool iAmTheOrganizer( KCal::Incidence * );
- void log( const QString &prefix, const char *s, size_t n );
+ void log( const TQString &prefix, const char *s, size_t n );
protected slots:
void slotSslError();
private:
- QString mUrl;
- QString mUser;
- QString mPassword;
+ TQString mUrl;
+ TQString mUser;
+ TQString mPassword;
bool mSSL;
std::string mSession;
- QString mUserName;
- QString mUserEmail;
- QString mUserUuid;
+ TQString mUserName;
+ TQString mUserEmail;
+ TQString mUserUuid;
std::string mCalendarFolder;
std::string mCheckListFolder;
@@ -238,9 +238,9 @@ class GroupwiseServer : public QObject
KExtendedSocket *m_sock;
int mError;
- QString mErrorText;
+ TQString mErrorText;
- QString mLogFile;
+ TQString mLogFile;
};
#endif
diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp
index e005974e6..ba64cff9a 100644
--- a/kresources/groupwise/soap/gwconverter.cpp
+++ b/kresources/groupwise/soap/gwconverter.cpp
@@ -35,7 +35,7 @@ struct soap* GWConverter::soap() const
return mSoap;
}
-std::string* GWConverter::qStringToString( const QString &string )
+std::string* GWConverter::qStringToString( const TQString &string )
{
std::string *str = soap_new_std__string( mSoap, -1 );
str->append( string.utf8() );
@@ -43,20 +43,20 @@ std::string* GWConverter::qStringToString( const QString &string )
return str;
}
-QString GWConverter::stringToQString( const std::string &str )
+TQString GWConverter::stringToQString( const std::string &str )
{
- return QString::fromUtf8( str.c_str() );
+ return TQString::fromUtf8( str.c_str() );
}
-QString GWConverter::stringToQString( std::string *str )
+TQString GWConverter::stringToQString( std::string *str )
{
- if ( !str ) return QString::null;
- return QString::fromUtf8( str->c_str() );
+ if ( !str ) return TQString::null;
+ return TQString::fromUtf8( str->c_str() );
}
-char* GWConverter::qStringToChar( const QString &string )
+char* GWConverter::qStringToChar( const TQString &string )
{
- QCString str = string.utf8();
+ TQCString str = string.utf8();
char* charStr = (char*)soap_malloc( mSoap, str.length() + 1 );
memcpy( charStr, str, str.length() );
@@ -65,80 +65,80 @@ char* GWConverter::qStringToChar( const QString &string )
return charStr;
}
-QDate GWConverter::charToQDate( const char *str )
+TQDate GWConverter::charToQDate( const char *str )
{
- if ( !str ) return QDate(); // FIXME: Qt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd
- return QDate::fromString( QString::fromUtf8( str ), Qt::ISODate );
+ 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 );
}
-char *GWConverter::qDateTimeToChar( const QDateTime &dt,
- const QString &timezone )
+char *GWConverter::qDateTimeToChar( const TQDateTime &dt,
+ const TQString &timezone )
{
return qDateTimeToChar( KPimPrefs::localTimeToUtc( dt, timezone ) );
}
-char *GWConverter::qDateTimeToChar( const QDateTime &dt )
+char *GWConverter::qDateTimeToChar( const TQDateTime &dt )
{
return qStringToChar( dt.toString( "yyyyMMddThhmmZ" ) );
}
-std::string* GWConverter::qDateTimeToString( const QDateTime &dt, const QString &timezone )
+std::string* GWConverter::qDateTimeToString( const TQDateTime &dt, const TQString &timezone )
{
return qDateTimeToString( KPimPrefs::localTimeToUtc( dt, timezone ) );
}
-std::string* GWConverter::qDateTimeToString( const QDateTime &dt )
+std::string* GWConverter::qDateTimeToString( const TQDateTime &dt )
{
return qStringToString( dt.toString( "yyyyMMddThhmmZ" ) );
}
-QDateTime GWConverter::stringToQDateTime( const std::string* str )
+TQDateTime GWConverter::stringToQDateTime( const std::string* str )
{
- QDateTime dt = QDateTime::fromString( QString::fromUtf8( str->c_str() ), Qt::ISODate );
+ TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), Qt::ISODate );
return dt;
}
-char* GWConverter::qDateToChar( const QDate &date )
+char* GWConverter::qDateToChar( const TQDate &date )
{
return qStringToChar( date.toString( "yyyyMMdd" ) );
}
-std::string* GWConverter::qDateToString( const QDate &date )
+std::string* GWConverter::qDateToString( const TQDate &date )
{
return qStringToString( date.toString( "yyyyMMdd" ) );
}
-QDate GWConverter::stringToQDate( std::string* str )
+TQDate GWConverter::stringToQDate( std::string* str )
{
//NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again
- return QDate::fromString( QString::fromLatin1( str->c_str() ), Qt::ISODate );
+ return TQDate::fromString( TQString::fromLatin1( str->c_str() ), Qt::ISODate );
}
-QDateTime GWConverter::charToQDateTime( const char *str )
+TQDateTime GWConverter::charToQDateTime( const char *str )
{
- if ( !str ) return QDateTime();
+ if ( !str ) return TQDateTime();
// kdDebug() << "charToQDateTime(): " << str << endl;
// as above re Qt::ISODate
- QDateTime dt = QDateTime::fromString( QString::fromUtf8( str ), Qt::ISODate );
+ TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), Qt::ISODate );
// kdDebug() << " " << dt.toString() << endl;
return dt;
}
-QDateTime GWConverter::charToQDateTime( const char *str,
- const QString &timezone )
+TQDateTime GWConverter::charToQDateTime( const char *str,
+ const TQString &timezone )
{
- if ( !str ) return QDateTime();
- QDateTime utc = charToQDateTime( str );
+ if ( !str ) return TQDateTime();
+ TQDateTime utc = charToQDateTime( str );
return KPimPrefs::utcToLocalTime( utc, timezone );
}
-bool GWConverter::emailsMatch( const QString & email1, const QString & email2 )
+bool GWConverter::emailsMatch( const TQString & email1, const TQString & email2 )
{
// eg demo3.po1.dom1@dmz1.provo.novell.com == demo3@dmz1.provo.novell.com
if ( email1 == email2 )
return true;
- QString shorter, longer;
+ TQString shorter, longer;
if ( email1.length() < email2.length() )
{
shorter = email1;
@@ -150,12 +150,12 @@ bool GWConverter::emailsMatch( const QString & email1, const QString & email2 )
longer = email1;
}
- QString shortStem = shorter.section( '@', 0, 0 );
- QString longStem = longer.section( '@', 0, 0 );
- QString shortHost = shorter.section( '@', 1, 1 );
- QString longHost = longer.section( '@', 1, 1 );
+ TQString shortStem = shorter.section( '@', 0, 0 );
+ TQString longStem = longer.section( '@', 0, 0 );
+ TQString shortHost = shorter.section( '@', 1, 1 );
+ TQString longHost = longer.section( '@', 1, 1 );
- QString extension = longStem.right( longStem.length() - shortStem.length() );
+ TQString extension = longStem.right( longStem.length() - shortStem.length() );
kdDebug() << "gwconverter::emailsMatch(): " << shorter << " = " << longer << endl;
kdDebug() << "shortStem: " << shortStem << ", longStem: " << longStem << ", extension: " << extension << endl;
diff --git a/kresources/groupwise/soap/gwconverter.h b/kresources/groupwise/soap/gwconverter.h
index be8a8dd61..08d5220fc 100644
--- a/kresources/groupwise/soap/gwconverter.h
+++ b/kresources/groupwise/soap/gwconverter.h
@@ -21,8 +21,8 @@
#ifndef KABC_GW_CONVERTER_H
#define KABC_GW_CONVERTER_H
-#include <qdatetime.h>
-#include <qstring.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
#include "soapH.h"
@@ -33,30 +33,30 @@ class GWConverter
struct soap* soap() const;
- static QString stringToQString( const std::string& );
- static QString stringToQString( std::string* );
+ static TQString stringToQString( const std::string& );
+ static TQString stringToQString( std::string* );
- std::string* qStringToString( const QString& );
- char* qStringToChar( const QString& );
+ std::string* qStringToString( const TQString& );
+ char* qStringToChar( const TQString& );
- char* qDateToChar( const QDate& );
- QDate charToQDate( const char * );
+ char* qDateToChar( const TQDate& );
+ TQDate charToQDate( const char * );
- std::string* qDateToString( const QDate &string );
- QDate stringToQDate( std::string* );
+ std::string* qDateToString( const TQDate &string );
+ TQDate stringToQDate( std::string* );
- char *qDateTimeToChar( const QDateTime &dt, const QString &timezone );
- char *qDateTimeToChar( const QDateTime &dt );
+ char *qDateTimeToChar( const TQDateTime &dt, const TQString &timezone );
+ char *qDateTimeToChar( const TQDateTime &dt );
- QDateTime charToQDateTime( const char *str );
- QDateTime charToQDateTime( const char *str, const QString &timezone );
+ TQDateTime charToQDateTime( const char *str );
+ TQDateTime charToQDateTime( const char *str, const TQString &timezone );
- std::string* qDateTimeToString( const QDateTime &string, const QString &timezone );
- std::string* qDateTimeToString( const QDateTime &string );
+ std::string* qDateTimeToString( const TQDateTime &string, const TQString &timezone );
+ std::string* qDateTimeToString( const TQDateTime &string );
- QDateTime stringToQDateTime( const std::string* );
+ TQDateTime stringToQDateTime( const std::string* );
- bool emailsMatch( const QString & email1, const QString & email2 );
+ bool emailsMatch( const TQString & email1, const TQString & email2 );
private:
struct soap* mSoap;
};
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index f1cdd049a..43d5d58df 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -26,7 +26,7 @@
#include <libkcal/incidence.h>
#include <libkcal/resourcecached.h>
-#include <qtimer.h>
+#include <tqtimer.h>
#include "contactconverter.h"
#include "incidenceconverter.h"
@@ -38,19 +38,19 @@
#define READ_ADDRESS_FOLDER_CHUNK_SIZE 50
#define READ_CALENDAR_FOLDER_CHUNK_SIZE 50
-GWJob::GWJob( GroupwiseServer *server, struct soap *soap, const QString &url,
+GWJob::GWJob( GroupwiseServer *server, struct soap *soap, const TQString &url,
const std::string &session )
: mServer( server ), mSoap( soap ), mUrl( url ), mSession( session ), mError( GroupWise::NoError )
{
}
ReadAddressBooksJob::ReadAddressBooksJob( GroupwiseServer *server,
- struct soap *soap, const QString &url, const std::string &session )
+ struct soap *soap, const TQString &url, const std::string &session )
: GWJob( server, soap, url, session )
{
}
-void ReadAddressBooksJob::setAddressBookIds( const QStringList &ids )
+void ReadAddressBooksJob::setAddressBookIds( const TQStringList &ids )
{
mAddressBookIds = ids;
@@ -82,7 +82,7 @@ void ReadAddressBooksJob::run()
if ( !(*it)->id ) {
kdError() << "No addressbook id" << endl;
} else {
- QString id = GWConverter::stringToQString( (*it)->id );
+ TQString id = GWConverter::stringToQString( (*it)->id );
kdDebug() << "Reading ID: " << id << endl;
if ( mAddressBookIds.find( id ) != mAddressBookIds.end() ) {
readAddressBook( *(*it)->id );
@@ -93,8 +93,8 @@ void ReadAddressBooksJob::run()
}
#else
GWConverter conv( mSoap );
- QStringList::Iterator it = mAddressBookIds.begin();
- const QStringList::Iterator end = mAddressBookIds.end();
+ TQStringList::Iterator it = mAddressBookIds.begin();
+ const TQStringList::Iterator end = mAddressBookIds.end();
for ( ; it != end; ++it )
{
std::string* id = conv.qStringToString( *it );
@@ -158,7 +158,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
addr.insertCustom( "GWRESOURCE", "CONTAINER", converter.stringToQString( id ) );
- QString remoteUid = converter.stringToQString( (*it)->id );
+ TQString remoteUid = converter.stringToQString( (*it)->id );
KABC::Addressee oldAddressee = mResource->findByUid( mResource->idMapper().localId( remoteUid ) );
if ( oldAddressee.isEmpty() ) // new addressee
@@ -323,7 +323,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
#endif
}
-ReadCalendarJob::ReadCalendarJob( GroupwiseServer *server, struct soap *soap, const QString &url,
+ReadCalendarJob::ReadCalendarJob( GroupwiseServer *server, struct soap *soap, const TQString &url,
const std::string &session )
: GWJob( server, soap, url, session ), mCalendar( 0 )
{
@@ -475,8 +475,8 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
ngwt__Filter *filter = soap_new_ngwm__Filter( mSoap, -1 );
ngwt__FilterEntry *filterEntry = soap_new_ngwm__FilterEntry( mSoap, -1 );
filterEntry->op = gte;
- filterEntry->field = QString::fromLatin1( "startDate" ).utf8();
- filterEntry->value = QDateTime::currentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
+ filterEntry->field = TQString::fromLatin1( "startDate" ).utf8();
+ filterEntry->value = TQDateTime::currentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
filter->element = filterEntry;
@@ -636,12 +636,12 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
}
UpdateAddressBooksJob::UpdateAddressBooksJob( GroupwiseServer *server,
- struct soap *soap, const QString &url, const std::string &session )
+ struct soap *soap, const TQString &url, const std::string &session )
: GWJob( server, soap, url, session )
{
}
-void UpdateAddressBooksJob::setAddressBookIds( const QStringList &ids )
+void UpdateAddressBooksJob::setAddressBookIds( const TQStringList &ids )
{
mAddressBookIds = ids;
diff --git a/kresources/groupwise/soap/gwjobs.h b/kresources/groupwise/soap/gwjobs.h
index 3cf47c095..815e6261e 100644
--- a/kresources/groupwise/soap/gwjobs.h
+++ b/kresources/groupwise/soap/gwjobs.h
@@ -20,7 +20,7 @@
#ifndef GROUPWISE_JOBS_H
#define GROUPWISE_JOBS_H
-#include <qobject.h>
+#include <tqobject.h>
#include <string>
@@ -45,12 +45,12 @@ class GroupwiseServer;
class GWJob
{
public:
- GWJob( GroupwiseServer *server, struct soap *soap, const QString &url, const std::string &session );
+ GWJob( GroupwiseServer *server, struct soap *soap, const TQString &url, const std::string &session );
int error() const { return mError; }
protected:
GroupwiseServer *mServer;
struct soap *mSoap;
- QString mUrl;
+ TQString mUrl;
const std::string mSession;
int mError;
};
@@ -59,10 +59,10 @@ class ReadAddressBooksJob : public GWJob
{
public:
ReadAddressBooksJob( GroupwiseServer *server, struct soap *soap,
- const QString &url,
+ const TQString &url,
const std::string &session );
- void setAddressBookIds( const QStringList& );
+ void setAddressBookIds( const TQStringList& );
void run();
@@ -70,7 +70,7 @@ class ReadAddressBooksJob : public GWJob
void readAddressBook( std::string& );
private:
- QStringList mAddressBookIds;
+ TQStringList mAddressBookIds;
KABC::Resource *mResource;
int mProgress;
};
@@ -78,7 +78,7 @@ class ReadAddressBooksJob : public GWJob
class ReadCalendarJob : public GWJob
{
public:
- ReadCalendarJob( GroupwiseServer *server, struct soap *soap, const QString &url,
+ ReadCalendarJob( GroupwiseServer *server, struct soap *soap, const TQString &url,
const std::string &session );
void setCalendarFolder( std::string* );
@@ -101,11 +101,11 @@ class UpdateAddressBooksJob : public GWJob
{
public:
UpdateAddressBooksJob( GroupwiseServer *server, struct soap *soap,
- const QString &url,
+ const TQString &url,
const std::string &session );
/** set the address book IDs to update - at the moment this is only the System Address Book (SAB) */
- void setAddressBookIds( const QStringList& );
+ void setAddressBookIds( const TQStringList& );
/**
* set the sequence number to start reading deltas from (usually the last sequenec number
@@ -122,7 +122,7 @@ class UpdateAddressBooksJob : public GWJob
void updateAddressBook( std::string& );
private:
- QStringList mAddressBookIds;
+ TQStringList mAddressBookIds;
KABC::Resource *mResource;
int mProgress;
unsigned long mLastPORebuildTime;
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index 051f00655..5e5e4c404 100644
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@@ -39,8 +39,8 @@ IncidenceConverter::IncidenceConverter( struct soap* soap )
mTimezone = KPimPrefs::timezone();
}
-void IncidenceConverter::setFrom( const QString &name,
- const QString &email, const QString &uuid )
+void IncidenceConverter::setFrom( const TQString &name,
+ const TQString &email, const TQString &uuid )
{
mFromName = name;
mFromEmail = email;
@@ -135,8 +135,8 @@ ngwt__Appointment* IncidenceConverter::convertToAppointment( KCal::Event* event
if ( event->dtStart().isValid() ) {
/* kdDebug() << " convertToAppointment() raw start date: " << event->dtStart().toString() << endl;*/
- QDateTime start = event->dtStart();
- start.setTime( QTime( 0, 0, 0 ) );
+ TQDateTime start = event->dtStart();
+ start.setTime( TQTime( 0, 0, 0 ) );
appointment->startDate = qDateTimeToChar( start, mTimezone );
//appointment->startDay = qDateToString( event->dtStart().date()/*.addDays( -1 )*/ );
/* kdDebug() << " converted start date: " << appointment->startDate << endl;*/
@@ -145,9 +145,9 @@ ngwt__Appointment* IncidenceConverter::convertToAppointment( KCal::Event* event
kdDebug() << " event start date not valid " << endl;
if ( event->hasEndDate() ) {
// kdDebug() << " convertToAppointment() raw end date: " << event->dtEnd().toString() << endl;
- QDateTime end = event->dtEnd();
+ TQDateTime end = event->dtEnd();
end = end.addDays( 1 );
- end.setTime( QTime( 0, 0, 0 ) );
+ end.setTime( TQTime( 0, 0, 0 ) );
appointment->endDate = qDateTimeToChar( end, mTimezone );
//appointment->endDay = qDateToString( event->dtEnd().date() );
// kdDebug() << " converted end date:" << appointment->endDate << endl;
@@ -215,7 +215,7 @@ KCal::Todo* IncidenceConverter::convertFromTask( ngwt__Task* task )
}
if ( task->taskPriority ) {
- QString priority = stringToQString( task->taskPriority );
+ TQString priority = stringToQString( task->taskPriority );
// FIXME: Store priority string somewhere
@@ -256,7 +256,7 @@ ngwt__Task* IncidenceConverter::convertToTask( KCal::Todo* todo )
}
// FIXME: Restore custom priorities
- QString priority = QString::number( todo->priority() );
+ TQString priority = TQString::number( todo->priority() );
task->taskPriority = qStringToString( priority );
task->completed = (bool*)soap_malloc( soap(), 1 );
@@ -311,7 +311,7 @@ ngwt__Note* IncidenceConverter::convertToNote( KCal::Journal* journal )
}
if ( !note->subject )
- note->subject = qStringToString( QString("NO SUBJECT") );
+ note->subject = qStringToString( TQString("NO SUBJECT") );
return note;
}
@@ -362,7 +362,7 @@ bool IncidenceConverter::convertToCalendarItem( KCal::Incidence* incidence, ngwt
item->modified = 0;
item->changes = 0;
- QString id = incidence->customProperty( "GWRESOURCE", "UID" );
+ TQString id = incidence->customProperty( "GWRESOURCE", "UID" );
if ( !id.isEmpty() ) item->id = qStringToString( id );
// Container
@@ -449,7 +449,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
if ( !mFromEmail.isEmpty() ) item->distribution->from->email = qStringToString( mFromEmail );
if ( !mFromUuid.isEmpty() ) item->distribution->from->uuid = qStringToString( mFromUuid );
- QString to; // To list consists of display names of organizer and attendees separated by "; "
+ TQString to; // To list consists of display names of organizer and attendees separated by "; "
to += incidence->organizer().name();
item->distribution->sendoptions = soap_new_ngwt__SendOptions( soap(), -1 );
@@ -470,11 +470,11 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
KCal::Attendee::List::ConstIterator it;
for( it = attendees.begin(); it != attendees.end(); ++it ) {
if ( !to.isEmpty() )
- to += QString::fromLatin1( "; %1" ).arg( (*it)->name() );
+ to += TQString::fromLatin1( "; %1" ).arg( (*it)->name() );
kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName()
<< endl;
- QString uuid;
- QValueList<KABC::Addressee> addList = KABC::StdAddressBook::self()->findByEmail( (*it)->email() );
+ TQString uuid;
+ TQValueList<KABC::Addressee> addList = KABC::StdAddressBook::self()->findByEmail( (*it)->email() );
if ( !addList.first().isEmpty() )
uuid = addList.first().custom( "GWRESOURCE", "UUID" ); //uuid may be mandatory for the recipients list to be stored on the server...
item->distribution->recipients->recipient.push_back( createRecipient( (*it)->name(), (*it)->email(), uuid ) );
@@ -484,8 +484,8 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
item->distribution->bc = 0;
}
-ngwt__Recipient *IncidenceConverter::createRecipient( const QString &name,
- const QString &email, const QString &uuid )
+ngwt__Recipient *IncidenceConverter::createRecipient( const TQString &name,
+ const TQString &email, const TQString &uuid )
{
ngwt__Recipient *recipient = soap_new_ngwt__Recipient( soap(), -1 );
@@ -534,7 +534,7 @@ bool IncidenceConverter::convertFromCalendarItem( ngwt__CalendarItem* item,
getAttendees( item, incidence );
if ( item->recurrenceKey )
- incidence->setCustomProperty( "GWRESOURCE", "RECURRENCEKEY", QString::number( *item->recurrenceKey ) );
+ incidence->setCustomProperty( "GWRESOURCE", "RECURRENCEKEY", TQString::number( *item->recurrenceKey ) );
/*
// This must just be a very early cut at recurrence
@@ -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 ) {
- QDate date = QDate::fromString( s2q( *it ), Qt::ISODate );
+ TQDate date = TQDate::fromString( s2q( *it ), Qt::ISODate );
if ( date.isValid() )
}
}
@@ -568,7 +568,7 @@ void IncidenceConverter::getItemDescription( ngwt__CalendarItem *item, KCal::Inc
// text/plain should be the description
if ( stringToQString( (*it)->contentType ) == "text/plain" ) {
- QString description = QString::fromUtf8( (char*)data.__ptr, data.__size );
+ TQString description = TQString::fromUtf8( (char*)data.__ptr, data.__size );
incidence->setDescription( description );
kdDebug() << "Incidence description decodes to: " << description << endl;
return;
@@ -731,7 +731,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
*freq = Weekly;
item->rrule->frequency = freq;
// now change the bitArray of the days of the week that it recurs on to a ngwt__DayOfWeekList *
- QBitArray ba = recur->days();
+ TQBitArray ba = recur->days();
ngwt__DayOfYearWeekList * weeklyDays = soap_new_ngwt__DayOfYearWeekList( soap(), -1 );
for ( int i = 0; i < 7; ++i )
{
@@ -795,11 +795,11 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen
// TODO: translate '1st sunday in may'
ngwt__DayOfYearList * daysOfYear = soap_new_ngwt__DayOfYearList( soap(), -1 );
#if LIBKCAL_IS_VERSION( 1, 3, 0 )
- QValueList<int> rmd;
+ TQValueList<int> rmd;
rmd = recur->yearMonths();
daysOfYear->day.push_back( rmd.first() );
#else
- QPtrList<int> rmd;
+ TQPtrList<int> rmd;
rmd = recur->yearNums();
daysOfYear->day.push_back( *rmd.first() );
#endif
diff --git a/kresources/groupwise/soap/incidenceconverter.h b/kresources/groupwise/soap/incidenceconverter.h
index 8d7b6844e..6f2ced84a 100644
--- a/kresources/groupwise/soap/incidenceconverter.h
+++ b/kresources/groupwise/soap/incidenceconverter.h
@@ -35,8 +35,8 @@ class IncidenceConverter : public GWConverter
public:
IncidenceConverter( struct soap* );
- void setFrom( const QString &name, const QString &email,
- const QString &uuid );
+ void setFrom( const TQString &name, const TQString &email,
+ const TQString &uuid );
KCal::Event* convertFromAppointment( ngwt__Appointment* );
ngwt__Appointment* convertToAppointment( KCal::Event* );
@@ -61,16 +61,16 @@ class IncidenceConverter : public GWConverter
void setRecurrence( KCal::Incidence *, ngwt__CalendarItem * );
// used for converting weekly recurrences from GW
-// QBitArray getDayBitArray( ngwt__DayOfWeekList * );
+// TQBitArray getDayBitArray( ngwt__DayOfWeekList * );
- ngwt__Recipient *createRecipient( const QString &name,
- const QString &email, const QString &uuid = QString::null );
+ ngwt__Recipient *createRecipient( const TQString &name,
+ const TQString &email, const TQString &uuid = TQString::null );
- QString mTimezone;
+ TQString mTimezone;
- QString mFromName;
- QString mFromEmail;
- QString mFromUuid;
+ TQString mFromName;
+ TQString mFromEmail;
+ TQString mFromUuid;
};
#endif
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index 4fdc3f5f6..653a55317 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -17,7 +17,7 @@
*************************************************************************
*/
-#include <qsocketnotifier.h>
+#include <tqsocketnotifier.h>
#include <dcopclient.h>
#include <klocale.h>
@@ -39,8 +39,8 @@ struct KSSLSocketPrivate
mutable KSSL *kssl;
KSSLCertificateCache *cc;
DCOPClient *dcc;
- QMap<QString,QString> metaData;
- QSocketNotifier *socketNotifier;
+ TQMap<TQString,TQString> metaData;
+ TQSocketNotifier *socketNotifier;
};
KSSLSocket::KSSLSocket() : KExtendedSocket()
@@ -57,9 +57,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket()
setBlockingMode(false);
//Connect internal slots
- QObject::connect( this, SIGNAL(connectionSuccess()), this, SLOT(slotConnected()) );
- QObject::connect( this, SIGNAL(closed(int)), this, SLOT(slotDisconnected()) );
- QObject::connect( this, SIGNAL(connectionFailed(int)), this, SLOT(slotDisconnected()));
+ 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()));
}
KSSLSocket::~KSSLSocket()
@@ -142,22 +142,22 @@ void KSSLSocket::slotDisconnected()
readNotifier()->setEnabled(false);
}
-void KSSLSocket::setMetaData( const QString &key, const QVariant &data )
+void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data )
{
- QVariant v = data;
+ TQVariant v = data;
d->metaData[key] = v.asString();
}
-bool KSSLSocket::hasMetaData( const QString &key )
+bool KSSLSocket::hasMetaData( const TQString &key )
{
return d->metaData.contains(key);
}
-QString KSSLSocket::metaData( const QString &key )
+TQString KSSLSocket::metaData( const TQString &key )
{
if( d->metaData.contains(key) )
return d->metaData[key];
- return QString::null;
+ return TQString::null;
}
/*
@@ -168,13 +168,13 @@ I basically copied the below from tcpKIO::SlaveBase.hpp, with some modificaions
* Copyright (C) 2001 Dawit Alemayehu <adawit@kde.org>
*/
-int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const QString &text, const QString &caption,
- const QString &buttonYes, const QString &buttonNo )
+int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption,
+ const TQString &buttonYes, const TQString &buttonNo )
{
kdDebug(0) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl;
- QByteArray data, result;
- QCString returnType;
- QDataStream arg(data, IO_WriteOnly);
+ TQByteArray data, result;
+ TQCString returnType;
+ TQDataStream arg(data, IO_WriteOnly);
arg << (int)1 << (int)type << text << caption << buttonYes << buttonNo;
if ( ! d->dcc ){
@@ -183,16 +183,16 @@ int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const QString &
}
if (!d->dcc->isApplicationRegistered("kio_uiserver"))
{
- KApplication::startServiceByDesktopPath("kio_uiserver.desktop",QStringList());
+ KApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
}
d->dcc->call("kio_uiserver", "UIServer",
- "messageBox(int,int,QString,QString,QString,QString)", data, returnType, result);
+ "messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result);
if( returnType == "int" )
{
int res;
- QDataStream r(result, IO_ReadOnly);
+ TQDataStream r(result, IO_ReadOnly);
r >> res;
return res;
}
@@ -209,10 +209,10 @@ int KSSLSocket::verifyCertificate()
bool _IPmatchesCN = false;
int result;
bool doAddHost = false;
- QString ourHost = host();
- QString ourIp = peerAddress()->pretty();
+ TQString ourHost = host();
+ TQString ourIp = peerAddress()->pretty();
- QString theurl = "https://" + ourHost + ":" + port();
+ TQString theurl = "https://" + ourHost + ":" + port();
if (!d->cc)
d->cc = new KSSLCertificateCache;
@@ -241,15 +241,15 @@ int KSSLSocket::verifyCertificate()
setMetaData("ssl_cipher", d->kssl->connectionInfo().getCipher());
setMetaData("ssl_cipher_desc", d->kssl->connectionInfo().getCipherDescription());
setMetaData("ssl_cipher_version", d->kssl->connectionInfo().getCipherVersion());
- setMetaData("ssl_cipher_used_bits", QString::number(d->kssl->connectionInfo().getCipherUsedBits()));
- setMetaData("ssl_cipher_bits", QString::number(d->kssl->connectionInfo().getCipherBits()));
+ setMetaData("ssl_cipher_used_bits", TQString::number(d->kssl->connectionInfo().getCipherUsedBits()));
+ setMetaData("ssl_cipher_bits", TQString::number(d->kssl->connectionInfo().getCipherBits()));
setMetaData("ssl_peer_ip", ourIp );
- QString errorStr;
+ TQString errorStr;
for(KSSLCertificate::KSSLValidationList::ConstIterator it = ksvl.begin();
it != ksvl.end(); ++it)
{
- errorStr += QString::number(*it)+":";
+ errorStr += TQString::number(*it)+":";
}
setMetaData("ssl_cert_errors", errorStr);
@@ -257,8 +257,8 @@ int KSSLSocket::verifyCertificate()
if (pc.chain().isValid() && pc.chain().depth() > 1)
{
- QString theChain;
- QPtrList<KSSLCertificate> chain = pc.chain().getChain();
+ TQString theChain;
+ TQPtrList<KSSLCertificate> chain = pc.chain().getChain();
for (KSSLCertificate *c = chain.first(); c; c = chain.next())
{
theChain += c->toString();
@@ -271,7 +271,7 @@ int KSSLSocket::verifyCertificate()
setMetaData("ssl_peer_chain", "");
}
- setMetaData("ssl_cert_state", QString::number(ksv));
+ setMetaData("ssl_cert_state", TQString::number(ksv));
if (ksv == KSSLCertificate::Ok)
{
@@ -321,7 +321,7 @@ int KSSLSocket::verifyCertificate()
{
if (ksv == KSSLCertificate::InvalidHost)
{
- QString msg = i18n("The IP address of the host %1 "
+ TQString msg = i18n("The IP address of the host %1 "
"does not match the one the "
"certificate was issued to.");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
@@ -332,7 +332,7 @@ int KSSLSocket::verifyCertificate()
}
else
{
- QString msg = i18n("The server certificate failed the "
+ TQString msg = i18n("The server certificate failed the "
"authenticity test (%1).");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
msg.arg(ourHost),
diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h
index 47874e0d5..d58b41918 100644
--- a/kresources/groupwise/soap/ksslsocket.h
+++ b/kresources/groupwise/soap/ksslsocket.h
@@ -19,7 +19,7 @@
*************************************************************************
*/
-#include <qvariant.h>
+#include <tqvariant.h>
#include <kextsock.h>
#include <kio/slavebase.h>
@@ -45,14 +45,14 @@ class KSSLSocket : public KExtendedSocket
private:
int verifyCertificate();
- int messageBox( KIO::SlaveBase::MessageBoxType type, const QString &text,
- const QString &caption, const QString &buttonYes, const QString &buttonNo );
+ int messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text,
+ const TQString &caption, const TQString &buttonYes, const TQString &buttonNo );
//Copied frm tcpslavebase to simply integrating their dialog function
- void setMetaData( const QString &, const QVariant & );
- bool hasMetaData( const QString & );
- QString metaData( const QString & );
+ void setMetaData( const TQString &, const TQVariant & );
+ bool hasMetaData( const TQString & );
+ TQString metaData( const TQString & );
KSSLSocketPrivate *d;
};
diff --git a/kresources/groupwise/soap/soapdebug.cpp b/kresources/groupwise/soap/soapdebug.cpp
index 3d0e3f223..caa56e5b5 100644
--- a/kresources/groupwise/soap/soapdebug.cpp
+++ b/kresources/groupwise/soap/soapdebug.cpp
@@ -56,9 +56,9 @@ int main( int argc, char **argv )
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- QString user = args->getOption( "user" );
- QString pass = args->getOption( "password" );
- QString url = args->getOption( "server" );
+ TQString user = args->getOption( "user" );
+ TQString pass = args->getOption( "password" );
+ TQString url = args->getOption( "server" );
#if 1
if ( user.isEmpty() ) {
@@ -97,7 +97,7 @@ int main( int argc, char **argv )
#endif
#if 0
- QString fbUser = args->getOption( "freebusy-user" );
+ TQString fbUser = args->getOption( "freebusy-user" );
if ( fbUser.isEmpty() ) {
kdError() << "Need user for which the freebusy data should be retrieved."
<< endl;
@@ -105,7 +105,7 @@ int main( int argc, char **argv )
KCal::FreeBusy *fb = new KCal::FreeBusy;
server.readFreeBusy( "user1",
- QDate( 2004, 9, 1 ), QDate( 2004, 10, 31 ), fb );
+ TQDate( 2004, 9, 1 ), TQDate( 2004, 10, 31 ), fb );
}
#endif
@@ -129,17 +129,17 @@ int main( int argc, char **argv )
}
KCal::ICalFormat format;
- QString ical = format.toString( &calendar );
+ TQString ical = format.toString( &calendar );
kdDebug() << "ICALENDAR: " << ical << endl;
#endif
#if 0
- QString id = args->getOption( "addressbook-id" );
+ TQString id = args->getOption( "addressbook-id" );
kdDebug() << "ADDRESSBOOK ID: " << id << endl;
- QStringList ids;
+ TQStringList ids;
ids.append( id );
KABC::ResourceMemory resource;
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index a7f6e3299..af603d801 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -1294,7 +1294,7 @@ struct soap
int send_timeout; /* when > 0, gives socket send timeout in seconds, < 0 in usec */
int connect_timeout; /* when > 0, gives socket connect() timeout in seconds, < 0 in usec */
int accept_timeout; /* when > 0, gives socket accept() timeout in seconds, < 0 in usec */
- int socket_flags; /* socket recv() and send() flags, e.g. set to MSG_NOSIGNAL to disable sigpipe */
+ int socket_flags; /* socket recv() and send() flags, e.g. set to MSG_NOQT_SIGNAL to disable sigpipe */
int connect_flags; /* connect() SOL_SOCKET sockopt flags, e.g. set to SO_DEBUG to debug socket */
int bind_flags; /* bind() SOL_SOCKET sockopt flags, e.g. set to SO_REUSEADDR to enable reuse */
int accept_flags; /* accept() SOL_SOCKET sockopt flags */
diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index c5e819b3f..fc9087316 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -38,7 +38,7 @@
#include <libkdepim/distributionlist.h>
#include <kio/netaccess.h>
#include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <float.h>
using namespace Kolab;
@@ -56,7 +56,7 @@ Contact::Contact( const KABC::Addressee* addr )
}
// loading (xml->addressee)
-Contact::Contact( const QString& xml, KABC::ResourceKolab* resource, const QString& subResource, Q_UINT32 sernum )
+Contact::Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
: mHasGeo( false )
{
load( xml );
@@ -72,252 +72,252 @@ Contact::~Contact()
{
}
-void Contact::setGivenName( const QString& name )
+void Contact::setGivenName( const TQString& name )
{
mGivenName = name;
}
-QString Contact::givenName() const
+TQString Contact::givenName() const
{
return mGivenName;
}
-void Contact::setMiddleNames( const QString& names )
+void Contact::setMiddleNames( const TQString& names )
{
mMiddleNames = names;
}
-QString Contact::middleNames() const
+TQString Contact::middleNames() const
{
return mMiddleNames;
}
-void Contact::setLastName( const QString& name )
+void Contact::setLastName( const TQString& name )
{
mLastName = name;
}
-QString Contact::lastName() const
+TQString Contact::lastName() const
{
return mLastName;
}
-void Contact::setFullName( const QString& name )
+void Contact::setFullName( const TQString& name )
{
mFullName = name;
}
-QString Contact::fullName() const
+TQString Contact::fullName() const
{
return mFullName;
}
-void Contact::setInitials( const QString& initials )
+void Contact::setInitials( const TQString& initials )
{
mInitials = initials;
}
-QString Contact::initials() const
+TQString Contact::initials() const
{
return mInitials;
}
-void Contact::setPrefix( const QString& prefix )
+void Contact::setPrefix( const TQString& prefix )
{
mPrefix = prefix;
}
-QString Contact::prefix() const
+TQString Contact::prefix() const
{
return mPrefix;
}
-void Contact::setSuffix( const QString& suffix )
+void Contact::setSuffix( const TQString& suffix )
{
mSuffix = suffix;
}
-QString Contact::suffix() const
+TQString Contact::suffix() const
{
return mSuffix;
}
-void Contact::setRole( const QString& role )
+void Contact::setRole( const TQString& role )
{
mRole = role;
}
-QString Contact::role() const
+TQString Contact::role() const
{
return mRole;
}
-void Contact::setFreeBusyUrl( const QString& fbUrl )
+void Contact::setFreeBusyUrl( const TQString& fbUrl )
{
mFreeBusyUrl = fbUrl;
}
-QString Contact::freeBusyUrl() const
+TQString Contact::freeBusyUrl() const
{
return mFreeBusyUrl;
}
-void Contact::setOrganization( const QString& organization )
+void Contact::setOrganization( const TQString& organization )
{
mOrganization = organization;
}
-QString Contact::organization() const
+TQString Contact::organization() const
{
return mOrganization;
}
-void Contact::setWebPage( const QString& url )
+void Contact::setWebPage( const TQString& url )
{
mWebPage = url;
}
-QString Contact::webPage() const
+TQString Contact::webPage() const
{
return mWebPage;
}
-void Contact::setIMAddress( const QString& imAddress )
+void Contact::setIMAddress( const TQString& imAddress )
{
mIMAddress = imAddress;
}
-QString Contact::imAddress() const
+TQString Contact::imAddress() const
{
return mIMAddress;
}
-void Contact::setDepartment( const QString& department )
+void Contact::setDepartment( const TQString& department )
{
mDepartment = department;
}
-QString Contact::department() const
+TQString Contact::department() const
{
return mDepartment;
}
-void Contact::setOfficeLocation( const QString& location )
+void Contact::setOfficeLocation( const TQString& location )
{
mOfficeLocation = location;
}
-QString Contact::officeLocation() const
+TQString Contact::officeLocation() const
{
return mOfficeLocation;
}
-void Contact::setProfession( const QString& profession )
+void Contact::setProfession( const TQString& profession )
{
mProfession = profession;
}
-QString Contact::profession() const
+TQString Contact::profession() const
{
return mProfession;
}
-// void Contact::setJobTitle( const QString& title )
+// void Contact::setJobTitle( const TQString& title )
// {
// mJobTitle = title;
// }
-// QString Contact::jobTitle() const
+// TQString Contact::jobTitle() const
// {
// return mJobTitle;
// }
-void Contact::setManagerName( const QString& name )
+void Contact::setManagerName( const TQString& name )
{
mManagerName = name;
}
-QString Contact::managerName() const
+TQString Contact::managerName() const
{
return mManagerName;
}
-void Contact::setAssistant( const QString& name )
+void Contact::setAssistant( const TQString& name )
{
mAssistant = name;
}
-QString Contact::assistant() const
+TQString Contact::assistant() const
{
return mAssistant;
}
-void Contact::setNickName( const QString& name )
+void Contact::setNickName( const TQString& name )
{
mNickName = name;
}
-QString Contact::nickName() const
+TQString Contact::nickName() const
{
return mNickName;
}
-void Contact::setSpouseName( const QString& name )
+void Contact::setSpouseName( const TQString& name )
{
mSpouseName = name;
}
-QString Contact::spouseName() const
+TQString Contact::spouseName() const
{
return mSpouseName;
}
-void Contact::setBirthday( const QDate& date )
+void Contact::setBirthday( const TQDate& date )
{
mBirthday = date;
}
-QDate Contact::birthday() const
+TQDate Contact::birthday() const
{
return mBirthday;
}
-void Contact::setAnniversary( const QDate& date )
+void Contact::setAnniversary( const TQDate& date )
{
mAnniversary = date;
}
-QDate Contact::anniversary() const
+TQDate Contact::anniversary() const
{
return mAnniversary;
}
-void Contact::setChildren( const QString& children )
+void Contact::setChildren( const TQString& children )
{
mChildren = children;
}
-QString Contact::children() const
+TQString Contact::children() const
{
return mChildren;
}
-void Contact::setGender( const QString& gender )
+void Contact::setGender( const TQString& gender )
{
mGender = gender;
}
-QString Contact::gender() const
+TQString Contact::gender() const
{
return mGender;
}
-void Contact::setLanguage( const QString& language )
+void Contact::setLanguage( const TQString& language )
{
mLanguage = language;
}
-QString Contact::language() const
+TQString Contact::language() const
{
return mLanguage;
}
@@ -327,12 +327,12 @@ void Contact::addPhoneNumber( const PhoneNumber& number )
mPhoneNumbers.append( number );
}
-QValueList<Contact::PhoneNumber>& Contact::phoneNumbers()
+TQValueList<Contact::PhoneNumber>& Contact::phoneNumbers()
{
return mPhoneNumbers;
}
-const QValueList<Contact::PhoneNumber>& Contact::phoneNumbers() const
+const TQValueList<Contact::PhoneNumber>& Contact::phoneNumbers() const
{
return mPhoneNumbers;
}
@@ -342,12 +342,12 @@ void Contact::addEmail( const Email& email )
mEmails.append( email );
}
-QValueList<Contact::Email>& Contact::emails()
+TQValueList<Contact::Email>& Contact::emails()
{
return mEmails;
}
-const QValueList<Contact::Email>& Contact::emails() const
+const TQValueList<Contact::Email>& Contact::emails() const
{
return mEmails;
}
@@ -357,34 +357,34 @@ void Contact::addAddress( const Contact::Address& address )
mAddresses.append( address );
}
-QValueList<Contact::Address>& Contact::addresses()
+TQValueList<Contact::Address>& Contact::addresses()
{
return mAddresses;
}
-const QValueList<Contact::Address>& Contact::addresses() const
+const TQValueList<Contact::Address>& Contact::addresses() const
{
return mAddresses;
}
-void Contact::setPreferredAddress( const QString& address )
+void Contact::setPreferredAddress( const TQString& address )
{
mPreferredAddress = address;
}
-QString Contact::preferredAddress() const
+TQString Contact::preferredAddress() const
{
return mPreferredAddress;
}
-bool Contact::loadNameAttribute( QDomElement& element )
+bool Contact::loadNameAttribute( TQDomElement& element )
{
- for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
- QString tagName = e.tagName();
+ TQDomElement e = n.toElement();
+ TQString tagName = e.tagName();
if ( tagName == "given-name" )
setGivenName( e.text() );
@@ -410,9 +410,9 @@ bool Contact::loadNameAttribute( QDomElement& element )
return true;
}
-void Contact::saveNameAttribute( QDomElement& element ) const
+void Contact::saveNameAttribute( TQDomElement& element ) const
{
- QDomElement e = element.ownerDocument().createElement( "name" );
+ TQDomElement e = element.ownerDocument().createElement( "name" );
element.appendChild( e );
writeString( e, "given-name", givenName() );
@@ -424,15 +424,15 @@ void Contact::saveNameAttribute( QDomElement& element ) const
writeString( e, "suffix", suffix() );
}
-bool Contact::loadPhoneAttribute( QDomElement& element )
+bool Contact::loadPhoneAttribute( TQDomElement& element )
{
PhoneNumber number;
- for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
- QString tagName = e.tagName();
+ TQDomElement e = n.toElement();
+ TQString tagName = e.tagName();
if ( tagName == "type" )
number.type = e.text();
@@ -449,11 +449,11 @@ bool Contact::loadPhoneAttribute( QDomElement& element )
return true;
}
-void Contact::savePhoneAttributes( QDomElement& element ) const
+void Contact::savePhoneAttributes( TQDomElement& element ) const
{
- QValueList<PhoneNumber>::ConstIterator it = mPhoneNumbers.begin();
+ TQValueList<PhoneNumber>::ConstIterator it = mPhoneNumbers.begin();
for ( ; it != mPhoneNumbers.end(); ++it ) {
- QDomElement e = element.ownerDocument().createElement( "phone" );
+ TQDomElement e = element.ownerDocument().createElement( "phone" );
element.appendChild( e );
const PhoneNumber& p = *it;
writeString( e, "type", p.type );
@@ -461,14 +461,14 @@ void Contact::savePhoneAttributes( QDomElement& element ) const
}
}
-void Contact::saveEmailAttributes( QDomElement& element ) const
+void Contact::saveEmailAttributes( TQDomElement& element ) const
{
- QValueList<Email>::ConstIterator it = mEmails.begin();
+ TQValueList<Email>::ConstIterator it = mEmails.begin();
for ( ; it != mEmails.end(); ++it )
saveEmailAttribute( element, *it );
}
-void Contact::loadCustomAttributes( QDomElement& element )
+void Contact::loadCustomAttributes( TQDomElement& element )
{
Custom custom;
custom.app = element.attribute( "app" );
@@ -477,16 +477,16 @@ void Contact::loadCustomAttributes( QDomElement& element )
mCustomList.append( custom );
}
-void Contact::saveCustomAttributes( QDomElement& element ) const
+void Contact::saveCustomAttributes( TQDomElement& element ) const
{
- QValueList<Custom>::ConstIterator it = mCustomList.begin();
+ TQValueList<Custom>::ConstIterator it = mCustomList.begin();
for ( ; it != mCustomList.end(); ++it ) {
Q_ASSERT( !(*it).name.isEmpty() );
if ( (*it).app == s_unhandledTagAppName ) {
writeString( element, (*it).name, (*it).value );
} else {
// Let's use attributes so that other tag-preserving-code doesn't need sub-elements
- QDomElement e = element.ownerDocument().createElement( "x-custom" );
+ TQDomElement e = element.ownerDocument().createElement( "x-custom" );
element.appendChild( e );
e.setAttribute( "app", (*it).app );
e.setAttribute( "name", (*it).name );
@@ -495,16 +495,16 @@ void Contact::saveCustomAttributes( QDomElement& element ) const
}
}
-bool Contact::loadAddressAttribute( QDomElement& element )
+bool Contact::loadAddressAttribute( TQDomElement& element )
{
Address address;
- for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
- QString tagName = e.tagName();
+ TQDomElement e = n.toElement();
+ TQString tagName = e.tagName();
if ( tagName == "type" )
address.type = e.text();
@@ -533,15 +533,15 @@ bool Contact::loadAddressAttribute( QDomElement& element )
return true;
}
-void Contact::saveAddressAttributes( QDomElement& element ) const
+void Contact::saveAddressAttributes( TQDomElement& element ) const
{
- QValueList<Address>::ConstIterator it = mAddresses.begin();
+ TQValueList<Address>::ConstIterator it = mAddresses.begin();
for ( ; it != mAddresses.end(); ++it ) {
- QDomElement e = element.ownerDocument().createElement( "address" );
+ TQDomElement e = element.ownerDocument().createElement( "address" );
element.appendChild( e );
const Address& a = *it;
writeString( e, "type", a.type );
- writeString( e, "x-kde-type", QString::number( a.kdeAddressType ) );
+ writeString( e, "x-kde-type", TQString::number( a.kdeAddressType ) );
if ( !a.street.isEmpty() )
writeString( e, "street", a.street );
if ( !a.pobox.isEmpty() )
@@ -558,15 +558,15 @@ void Contact::saveAddressAttributes( QDomElement& element ) const
}
-void Kolab::Contact::loadDistrListMember( const QDomElement& element )
+void Kolab::Contact::loadDistrListMember( const TQDomElement& element )
{
Member member;
- for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
- QString tagName = e.tagName();
+ TQDomElement e = n.toElement();
+ TQString tagName = e.tagName();
if ( tagName == "display-name" )
member.displayName = e.text();
else if ( tagName == "smtp-address" )
@@ -576,11 +576,11 @@ void Kolab::Contact::loadDistrListMember( const QDomElement& element )
mDistrListMembers.append( member );
}
-void Contact::saveDistrListMembers( QDomElement& element ) const
+void Contact::saveDistrListMembers( TQDomElement& element ) const
{
- QValueList<Member>::ConstIterator it = mDistrListMembers.begin();
+ TQValueList<Member>::ConstIterator it = mDistrListMembers.begin();
for( ; it != mDistrListMembers.end(); ++it ) {
- QDomElement e = element.ownerDocument().createElement( "member" );
+ TQDomElement e = element.ownerDocument().createElement( "member" );
element.appendChild( e );
const Member& m = *it;
writeString( e, "display-name", m.displayName );
@@ -588,9 +588,9 @@ void Contact::saveDistrListMembers( QDomElement& element ) const
}
}
-bool Contact::loadAttribute( QDomElement& element )
+bool Contact::loadAttribute( TQDomElement& element )
{
- const QString tagName = element.tagName();
+ const TQString tagName = element.tagName();
switch ( tagName[0].latin1() ) {
case 'a':
if ( tagName == "address" )
@@ -762,7 +762,7 @@ bool Contact::loadAttribute( QDomElement& element )
return KolabBase::loadAttribute( element );
}
-bool Contact::saveAttributes( QDomElement& element ) const
+bool Contact::saveAttributes( TQDomElement& element ) const
{
// Save the base class elements
KolabBase::saveAttributes( element );
@@ -804,8 +804,8 @@ bool Contact::saveAttributes( QDomElement& element ) const
saveAddressAttributes( element );
writeString( element, "preferred-address", preferredAddress() );
if ( mHasGeo ) {
- writeString( element, "latitude", QString::number( latitude(), 'g', DBL_DIG ) );
- writeString( element, "longitude", QString::number( longitude(), 'g', DBL_DIG ) );
+ writeString( element, "latitude", TQString::number( latitude(), 'g', DBL_DIG ) );
+ writeString( element, "longitude", TQString::number( longitude(), 'g', DBL_DIG ) );
}
}
saveCustomAttributes( element );
@@ -813,9 +813,9 @@ bool Contact::saveAttributes( QDomElement& element ) const
return true;
}
-bool Contact::loadXML( const QDomDocument& document )
+bool Contact::loadXML( const TQDomDocument& document )
{
- QDomElement top = document.documentElement();
+ TQDomElement top = document.documentElement();
mIsDistributionList = top.tagName() == "distribution-list";
if ( top.tagName() != "contact" && !mIsDistributionList ) {
@@ -825,11 +825,11 @@ bool Contact::loadXML( const QDomDocument& document )
}
- for ( QDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if ( !loadAttribute( e ) ) {
// Unhandled tag - save for later storage
//kdDebug() << "Saving unhandled tag " << e.tagName() << endl;
@@ -846,10 +846,10 @@ bool Contact::loadXML( const QDomDocument& document )
return true;
}
-QString Contact::saveXML() const
+TQString Contact::saveXML() const
{
- QDomDocument document = domTree();
- QDomElement element = document.createElement(
+ TQDomDocument document = domTree();
+ TQDomElement element = document.createElement(
mIsDistributionList ? "distribution-list" : "contact" );
element.setAttribute( "version", "1.0" );
saveAttributes( element );
@@ -857,7 +857,7 @@ QString Contact::saveXML() const
return document.toString();
}
-static QString addressTypeToString( int /*KABC::Address::Type*/ type )
+static TQString addressTypeToString( int /*KABC::Address::Type*/ type )
{
if ( type & KABC::Address::Home )
return "home";
@@ -866,7 +866,7 @@ static QString addressTypeToString( int /*KABC::Address::Type*/ type )
return "other";
}
-static int addressTypeFromString( const QString& type )
+static int addressTypeFromString( const TQString& type )
{
if ( type == "home" )
return KABC::Address::Home;
@@ -876,12 +876,12 @@ static int addressTypeFromString( const QString& type )
return KABC::Address::Dom | KABC::Address::Intl | KABC::Address::Postal | KABC::Address::Parcel;
}
-static QStringList phoneTypeToString( int /*KABC::PhoneNumber::Types*/ type )
+static TQStringList phoneTypeToString( int /*KABC::PhoneNumber::Types*/ type )
{
// KABC has a bitfield, i.e. the same phone number can be used for work and home
// and fax and cellphone etc. etc.
// So when saving we need to create as many tags as bits that were set.
- QStringList types;
+ TQStringList types;
if ( type & KABC::PhoneNumber::Fax ) {
if ( type & KABC::PhoneNumber::Home )
types << "homefax";
@@ -936,7 +936,7 @@ static QStringList phoneTypeToString( int /*KABC::PhoneNumber::Types*/ type )
return types;
}
-static int /*KABC::PhoneNumber::Types*/ phoneTypeFromString( const QString& type )
+static int /*KABC::PhoneNumber::Types*/ phoneTypeFromString( const TQString& type )
{
if ( type == "homefax" )
return KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax;
@@ -1030,15 +1030,15 @@ void Contact::setFields( const KABC::Addressee* addressee )
setSpouseName( addressee->custom( "KADDRESSBOOK", "X-SpousesName" ) );
if ( !addressee->birthday().isNull() )
setBirthday( addressee->birthday().date() );
- const QString& anniversary = addressee->custom( "KADDRESSBOOK", "X-Anniversary" );
+ const TQString& anniversary = addressee->custom( "KADDRESSBOOK", "X-Anniversary" );
if ( !anniversary.isEmpty() )
setAnniversary( stringToDate( anniversary ) );
- const QStringList emails = addressee->emails();
+ const TQStringList emails = addressee->emails();
// Conversion problem here:
// KABC::Addressee has only one full name and N addresses, but the XML format
// has N times (fullname+address). So we just copy the fullname over and ignore it on loading.
- for ( QStringList::ConstIterator it = emails.begin(); it != emails.end(); ++it ) {
+ for ( TQStringList::ConstIterator it = emails.begin(); it != emails.end(); ++it ) {
Email email;
email.displayName = fullName();
email.smtpAddress = *it;
@@ -1046,7 +1046,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
}
// Now the real-world addresses
- QString preferredAddress = "home";
+ TQString preferredAddress = "home";
const KABC::Address::List addresses = addressee->addresses();
for ( KABC::Address::List::ConstIterator it = addresses.begin() ; it != addresses.end(); ++it ) {
Address address;
@@ -1070,8 +1070,8 @@ void Contact::setFields( const KABC::Addressee* addressee )
const KABC::PhoneNumber::List phones = addressee->phoneNumbers();
for ( KABC::PhoneNumber::List::ConstIterator it = phones.begin(); it != phones.end(); ++it ) {
// Create a tag per phone type set in the bitfield
- QStringList types = phoneTypeToString( (*it).type() );
- for( QStringList::Iterator typit = types.begin(); typit != types.end(); ++typit ) {
+ TQStringList types = phoneTypeToString( (*it).type() );
+ for( TQStringList::Iterator typit = types.begin(); typit != types.end(); ++typit ) {
PhoneNumber phoneNumber;
phoneNumber.type = *typit;
phoneNumber.number = (*it).number();
@@ -1102,21 +1102,21 @@ void Contact::setFields( const KABC::Addressee* addressee )
// Other KADDRESSBOOK custom fields than those already handled
// (includes e.g. crypto settings, and extra im addresses)
- QStringList knownCustoms;
+ TQStringList knownCustoms;
for ( const char** p = s_knownCustomFields; *p; ++p )
- knownCustoms << QString::fromLatin1( *p );
- QStringList customs = addressee->customs();
- for( QStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) {
+ knownCustoms << TQString::fromLatin1( *p );
+ TQStringList customs = addressee->customs();
+ for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) {
// KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves
// The format is "app-name:value".
int pos = (*it).find( '-' );
if ( pos == -1 ) continue;
- QString app = (*it).left( pos );
+ TQString app = (*it).left( pos );
if ( app == "KOLAB" ) continue;
- QString name = (*it).mid( pos + 1 );
+ TQString name = (*it).mid( pos + 1 );
pos = name.find( ':' );
if ( pos == -1 ) continue;
- QString value = name.mid( pos + 1 );
+ TQString value = name.mid( pos + 1 );
name = name.left( pos );
if ( !knownCustoms.contains( name ) ) {
//kdDebug() << k_funcinfo << "app=" << app << " name=" << name << " value=" << value << endl;
@@ -1150,9 +1150,9 @@ void Contact::saveTo( KABC::Addressee* addressee )
if ( mIsDistributionList ) {
KPIM::DistributionList distrList( *addressee );
distrList.setName( fullName() );
- QValueList<Member>::ConstIterator mit = mDistrListMembers.begin();
+ TQValueList<Member>::ConstIterator mit = mDistrListMembers.begin();
for ( ; mit != mDistrListMembers.end(); ++mit ) {
- QString displayName = (*mit).displayName;
+ TQString displayName = (*mit).displayName;
// fixup the display name DistributionList::assumes neither ',' nor ';' is present
displayName.replace( ',', ' ' );
displayName.replace( ';', ' ' );
@@ -1183,7 +1183,7 @@ void Contact::saveTo( KABC::Addressee* addressee )
addressee->setNickName( nickName() );
addressee->insertCustom( "KADDRESSBOOK", "X-SpousesName", spouseName() );
if ( birthday().isValid() )
- addressee->setBirthday( QDateTime( birthday() ) );
+ addressee->setBirthday( TQDateTime( birthday() ) );
if ( anniversary().isValid() )
addressee->insertCustom( "KADDRESSBOOK", "X-Anniversary",
@@ -1208,14 +1208,14 @@ void Contact::saveTo( KABC::Addressee* addressee )
if ( mHasGeo )
addressee->setGeo( KABC::Geo( mLatitude, mLongitude ) );
- QStringList emailAddresses;
- for ( QValueList<Email>::ConstIterator it = mEmails.begin(); it != mEmails.end(); ++it ) {
+ TQStringList emailAddresses;
+ for ( TQValueList<Email>::ConstIterator it = mEmails.begin(); it != mEmails.end(); ++it ) {
// we can't do anything with (*it).displayName
emailAddresses.append( (*it).smtpAddress );
}
addressee->setEmails( emailAddresses );
- for ( QValueList<Address>::ConstIterator it = mAddresses.begin(); it != mAddresses.end(); ++it ) {
+ for ( TQValueList<Address>::ConstIterator it = mAddresses.begin(); it != mAddresses.end(); ++it ) {
KABC::Address address;
int type = (*it).kdeAddressType;
if ( type == -1 ) { // no kde-specific type available
@@ -1233,37 +1233,37 @@ void Contact::saveTo( KABC::Addressee* addressee )
addressee->insertAddress( address );
}
- for ( QValueList<PhoneNumber>::ConstIterator it = mPhoneNumbers.begin(); it != mPhoneNumbers.end(); ++it ) {
+ for ( TQValueList<PhoneNumber>::ConstIterator it = mPhoneNumbers.begin(); it != mPhoneNumbers.end(); ++it ) {
KABC::PhoneNumber number;
number.setType( phoneTypeFromString( (*it).type ) );
number.setNumber( (*it).number );
addressee->insertPhoneNumber( number );
}
- for( QValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) {
- QString app = (*it).app.isEmpty() ? QString::fromLatin1( "KADDRESSBOOK" ) : (*it).app;
+ for( TQValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) {
+ TQString app = (*it).app.isEmpty() ? TQString::fromLatin1( "KADDRESSBOOK" ) : (*it).app;
addressee->insertCustom( app, (*it).name, (*it).value );
}
//kdDebug(5006) << addressee->customs() << endl;
}
-QImage Contact::loadPictureFromKMail( const QString& attachmentName, KABC::ResourceKolab* resource, const QString& subResource, Q_UINT32 sernum )
+TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
{
- QImage img;
+ TQImage img;
KURL url;
if ( resource->kmailGetAttachment( url, subResource, sernum, attachmentName ) && !url.isEmpty() ) {
- const QString path = url.path();
+ const TQString path = url.path();
img.load( path );
- QFile::remove(path);
+ TQFile::remove(path);
}
return img;
}
-QImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
+TQImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
{
- QImage img;
+ TQImage img;
if ( !picture.isIntern() && !picture.url().isEmpty() ) {
- QString tmpFile;
+ TQString tmpFile;
if ( KIO::NetAccess::download( picture.url(), tmpFile, 0 /*no widget known*/ ) ) {
img.load( tmpFile );
KIO::NetAccess::removeTempFile( tmpFile );
@@ -1273,12 +1273,12 @@ QImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
return img;
}
-QByteArray Kolab::Contact::loadDataFromKMail( const QString& attachmentName, KABC::ResourceKolab* resource, const QString& subResource, Q_UINT32 sernum )
+TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
{
- QByteArray data;
+ TQByteArray data;
KURL url;
if ( resource->kmailGetAttachment( url, subResource, sernum, attachmentName ) && !url.isEmpty() ) {
- QFile f( url.path() );
+ TQFile f( url.path() );
if ( f.open( IO_ReadOnly ) ) {
data = f.readAll();
f.close();
@@ -1288,13 +1288,13 @@ QByteArray Kolab::Contact::loadDataFromKMail( const QString& attachmentName, KAB
return data;
}
-QByteArray Kolab::Contact::loadSoundFromAddressee( const KABC::Sound& sound )
+TQByteArray Kolab::Contact::loadSoundFromAddressee( const KABC::Sound& sound )
{
- QByteArray data;
+ TQByteArray data;
if ( !sound.isIntern() && !sound.url().isEmpty() ) {
- QString tmpFile;
+ TQString tmpFile;
if ( KIO::NetAccess::download( sound.url(), tmpFile, 0 /*no widget known*/ ) ) {
- QFile f( tmpFile );
+ TQFile f( tmpFile );
if ( f.open( IO_ReadOnly ) ) {
data = f.readAll();
f.close();
@@ -1306,7 +1306,7 @@ QByteArray Kolab::Contact::loadSoundFromAddressee( const KABC::Sound& sound )
return data;
}
-QString Kolab::Contact::productID() const
+TQString Kolab::Contact::productID() const
{
// TODO: When KAB has the version number in a header file, don't hardcode (Bo)
// Or we could use Addressee::productID? (David)
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index 0c06dfb8a..39a235cc2 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -34,7 +34,7 @@
#define KOLABCONTACT_H
#include <kolabbase.h>
-#include <qimage.h>
+#include <tqimage.h>
namespace KABC {
class Addressee;
@@ -49,8 +49,8 @@ class Contact : public KolabBase {
public:
struct PhoneNumber {
public:
- QString type;
- QString number;
+ TQString type;
+ TQString number;
};
struct Address {
@@ -59,126 +59,126 @@ public:
{
}
int kdeAddressType; // KABC::Address::Type
- QString type; // kolab-compliant address type: home, work or other
- QString street;
- QString pobox;
- QString locality;
- QString region;
- QString postalCode;
- QString country;
+ TQString type; // kolab-compliant address type: home, work or other
+ TQString street;
+ TQString pobox;
+ TQString locality;
+ TQString region;
+ TQString postalCode;
+ TQString country;
};
explicit Contact( const KABC::Addressee* address );
- Contact( const QString& xml, KABC::ResourceKolab* resource, const QString& subResource, Q_UINT32 sernum );
+ Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
~Contact();
void saveTo( KABC::Addressee* address );
- QString type() const { return "Contact"; }
+ TQString type() const { return "Contact"; }
- void setGivenName( const QString& name );
- QString givenName() const;
+ void setGivenName( const TQString& name );
+ TQString givenName() const;
- void setMiddleNames( const QString& names );
- QString middleNames() const;
+ void setMiddleNames( const TQString& names );
+ TQString middleNames() const;
- void setLastName( const QString& name );
- QString lastName() const;
+ void setLastName( const TQString& name );
+ TQString lastName() const;
- void setFullName( const QString& name );
- QString fullName() const;
+ void setFullName( const TQString& name );
+ TQString fullName() const;
- void setInitials( const QString& initials );
- QString initials() const;
+ void setInitials( const TQString& initials );
+ TQString initials() const;
- void setPrefix( const QString& prefix );
- QString prefix() const;
+ void setPrefix( const TQString& prefix );
+ TQString prefix() const;
- void setSuffix( const QString& suffix );
- QString suffix() const;
+ void setSuffix( const TQString& suffix );
+ TQString suffix() const;
- void setRole( const QString& role );
- QString role() const;
+ void setRole( const TQString& role );
+ TQString role() const;
- void setFreeBusyUrl( const QString& fbUrl );
- QString freeBusyUrl() const;
+ void setFreeBusyUrl( const TQString& fbUrl );
+ TQString freeBusyUrl() const;
- void setOrganization( const QString& organization );
- QString organization() const;
+ void setOrganization( const TQString& organization );
+ TQString organization() const;
- void setWebPage( const QString& url );
- QString webPage() const;
+ void setWebPage( const TQString& url );
+ TQString webPage() const;
- void setIMAddress( const QString& imAddress );
- QString imAddress() const;
+ void setIMAddress( const TQString& imAddress );
+ TQString imAddress() const;
- void setDepartment( const QString& department );
- QString department() const;
+ void setDepartment( const TQString& department );
+ TQString department() const;
- void setOfficeLocation( const QString& location );
- QString officeLocation() const;
+ void setOfficeLocation( const TQString& location );
+ TQString officeLocation() const;
- void setProfession( const QString& profession );
- QString profession() const;
+ void setProfession( const TQString& profession );
+ TQString profession() const;
// not shown in the kaddressbook GUI
- //void setJobTitle( const QString& title );
- //QString jobTitle() const;
+ //void setJobTitle( const TQString& title );
+ //TQString jobTitle() const;
- void setManagerName( const QString& name );
- QString managerName() const;
+ void setManagerName( const TQString& name );
+ TQString managerName() const;
- void setAssistant( const QString& name );
- QString assistant() const;
+ void setAssistant( const TQString& name );
+ TQString assistant() const;
- void setNickName( const QString& name );
- QString nickName() const;
+ void setNickName( const TQString& name );
+ TQString nickName() const;
- void setSpouseName( const QString& name );
- QString spouseName() const;
+ void setSpouseName( const TQString& name );
+ TQString spouseName() const;
- void setBirthday( const QDate& date );
- QDate birthday() const;
+ void setBirthday( const TQDate& date );
+ TQDate birthday() const;
- void setAnniversary( const QDate& date );
- QDate anniversary() const;
+ void setAnniversary( const TQDate& date );
+ TQDate anniversary() const;
- void setPicture( const QImage& image) { mPicture = image; }
- QString pictureAttachmentName() const { return mPictureAttachmentName; }
- QImage picture() const { return mPicture; }
+ void setPicture( const TQImage& image) { mPicture = image; }
+ TQString pictureAttachmentName() const { return mPictureAttachmentName; }
+ TQImage picture() const { return mPicture; }
- void setLogo( const QImage& image ) { mLogo = image; }
- QString logoAttachmentName() const { return mLogoAttachmentName; }
- QImage logo() const { return mLogo; }
+ void setLogo( const TQImage& image ) { mLogo = image; }
+ TQString logoAttachmentName() const { return mLogoAttachmentName; }
+ TQImage logo() const { return mLogo; }
- void setSound( const QByteArray& sound ) { mSound = sound; }
- QString soundAttachmentName() const { return mSoundAttachmentName; }
- QByteArray sound() const { return mSound; }
+ void setSound( const TQByteArray& sound ) { mSound = sound; }
+ TQString soundAttachmentName() const { return mSoundAttachmentName; }
+ TQByteArray sound() const { return mSound; }
- void setChildren( const QString& children );
- QString children() const;
+ void setChildren( const TQString& children );
+ TQString children() const;
- void setGender( const QString& gender );
- QString gender() const;
+ void setGender( const TQString& gender );
+ TQString gender() const;
- void setLanguage( const QString& language );
- QString language() const;
+ void setLanguage( const TQString& language );
+ TQString language() const;
void addPhoneNumber( const PhoneNumber& number );
- QValueList<PhoneNumber>& phoneNumbers();
- const QValueList<PhoneNumber>& phoneNumbers() const;
+ TQValueList<PhoneNumber>& phoneNumbers();
+ const TQValueList<PhoneNumber>& phoneNumbers() const;
void addEmail( const Email& email );
- QValueList<Email>& emails();
- const QValueList<Email>& emails() const;
+ TQValueList<Email>& emails();
+ const TQValueList<Email>& emails() const;
void addAddress( const Address& address );
- QValueList<Address>& addresses();
- const QValueList<Address>& addresses() const;
+ TQValueList<Address>& addresses();
+ const TQValueList<Address>& addresses() const;
// which address is preferred: home or business or other
- void setPreferredAddress( const QString& address );
- QString preferredAddress() const;
+ void setPreferredAddress( const TQString& address );
+ TQString preferredAddress() const;
float latitude() const { return mLatitude; }
void setLatitude( float latitude ) { mLatitude = latitude; }
@@ -187,16 +187,16 @@ public:
void setLongitude( float longitude ) { mLongitude = longitude; }
// Load the attributes of this class
- bool loadAttribute( QDomElement& );
+ bool loadAttribute( TQDomElement& );
// Save the attributes of this class
- bool saveAttributes( QDomElement& ) const;
+ bool saveAttributes( TQDomElement& ) const;
// Load this note by reading the XML file
- bool loadXML( const QDomDocument& xml );
+ bool loadXML( const TQDomDocument& xml );
// Serialize this note to an XML string
- QString saveXML() const;
+ TQString saveXML() const;
// Return true if this contact is a distr list
bool isDistributionList() const { return mIsDistributionList; }
@@ -205,81 +205,81 @@ protected:
void setFields( const KABC::Addressee* );
private:
- bool loadNameAttribute( QDomElement& element );
- void saveNameAttribute( QDomElement& element ) const;
-
- bool loadPhoneAttribute( QDomElement& element );
- void savePhoneAttributes( QDomElement& element ) const;
-
- void saveEmailAttributes( QDomElement& element ) const;
-
- bool loadAddressAttribute( QDomElement& element );
- void saveAddressAttributes( QDomElement& element ) const;
-
- void loadCustomAttributes( QDomElement& element );
- void saveCustomAttributes( QDomElement& element ) const;
-
- void loadDistrListMember( const QDomElement& element );
- void saveDistrListMembers( QDomElement& element ) const;
-
- QImage loadPictureFromKMail( const QString& attachmentName, KABC::ResourceKolab* resource, const QString& subResource, Q_UINT32 sernum );
- QImage loadPictureFromAddressee( const KABC::Picture& picture );
-
- QByteArray loadDataFromKMail( const QString& attachmentName, KABC::ResourceKolab* resource, const QString& subResource, Q_UINT32 sernum );
- QByteArray loadSoundFromAddressee( const KABC::Sound& sound );
-
- QString productID() const;
-
- QString mGivenName;
- QString mMiddleNames;
- QString mLastName;
- QString mFullName;
- QString mInitials;
- QString mPrefix;
- QString mSuffix;
- QString mRole;
- QString mFreeBusyUrl;
- QString mOrganization;
- QString mWebPage;
- QString mIMAddress;
- QString mDepartment;
- QString mOfficeLocation;
- QString mProfession;
- //QString mJobTitle;
- QString mManagerName;
- QString mAssistant;
- QString mNickName;
- QString mSpouseName;
- QDate mBirthday;
- QDate mAnniversary;
- QImage mPicture;
- QImage mLogo;
- QByteArray mSound;
- QString mPictureAttachmentName;
- QString mLogoAttachmentName;
- QString mSoundAttachmentName;
- QString mChildren;
- QString mGender;
- QString mLanguage;
- QValueList<PhoneNumber> mPhoneNumbers;
- QValueList<Email> mEmails;
- QValueList<Address> mAddresses;
- QString mPreferredAddress;
+ bool loadNameAttribute( TQDomElement& element );
+ void saveNameAttribute( TQDomElement& element ) const;
+
+ bool loadPhoneAttribute( TQDomElement& element );
+ void savePhoneAttributes( TQDomElement& element ) const;
+
+ void saveEmailAttributes( TQDomElement& element ) const;
+
+ bool loadAddressAttribute( TQDomElement& element );
+ void saveAddressAttributes( TQDomElement& element ) const;
+
+ void loadCustomAttributes( TQDomElement& element );
+ void saveCustomAttributes( TQDomElement& element ) const;
+
+ void loadDistrListMember( const TQDomElement& element );
+ void saveDistrListMembers( TQDomElement& element ) const;
+
+ TQImage loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+ TQImage loadPictureFromAddressee( const KABC::Picture& picture );
+
+ TQByteArray loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+ TQByteArray loadSoundFromAddressee( const KABC::Sound& sound );
+
+ TQString productID() const;
+
+ TQString mGivenName;
+ TQString mMiddleNames;
+ TQString mLastName;
+ TQString mFullName;
+ TQString mInitials;
+ TQString mPrefix;
+ TQString mSuffix;
+ TQString mRole;
+ TQString mFreeBusyUrl;
+ TQString mOrganization;
+ TQString mWebPage;
+ TQString mIMAddress;
+ TQString mDepartment;
+ TQString mOfficeLocation;
+ TQString mProfession;
+ //TQString mJobTitle;
+ TQString mManagerName;
+ TQString mAssistant;
+ TQString mNickName;
+ TQString mSpouseName;
+ TQDate mBirthday;
+ TQDate mAnniversary;
+ TQImage mPicture;
+ TQImage mLogo;
+ TQByteArray mSound;
+ TQString mPictureAttachmentName;
+ TQString mLogoAttachmentName;
+ TQString mSoundAttachmentName;
+ TQString mChildren;
+ TQString mGender;
+ TQString mLanguage;
+ TQValueList<PhoneNumber> mPhoneNumbers;
+ TQValueList<Email> mEmails;
+ TQValueList<Address> mAddresses;
+ TQString mPreferredAddress;
float mLatitude;
float mLongitude;
bool mHasGeo;
bool mIsDistributionList;
struct Custom {
- QString app;
- QString name;
- QString value;
+ TQString app;
+ TQString name;
+ TQString value;
};
- QValueList<Custom> mCustomList;
+ TQValueList<Custom> mCustomList;
struct Member {
- QString displayName;
- QString email;
+ TQString displayName;
+ TQString email;
};
- QValueList<Member> mDistrListMembers;
+ TQValueList<Member> mDistrListMembers;
};
}
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index 464c9c610..034c32d78 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -45,11 +45,11 @@
#include <kapplication.h>
#include <dcopclient.h>
-#include <qobject.h>
-#include <qtimer.h>
-#include <qstring.h>
-#include <qfile.h>
-#include <qapplication.h>
+#include <tqobject.h>
+#include <tqtimer.h>
+#include <tqstring.h>
+#include <tqfile.h>
+#include <tqapplication.h>
#include <assert.h>
@@ -63,7 +63,7 @@ class KolabFactory : public KRES::PluginFactoryBase
return new KABC::ResourceKolab( config );
}
- KRES::ConfigWidget *configWidget( QWidget* )
+ KRES::ConfigWidget *configWidget( TQWidget* )
{
return 0;
}
@@ -79,7 +79,7 @@ static const char* s_inlineMimeType = "text/x-vcard";
KABC::ResourceKolab::ResourceKolab( const KConfig *config )
: KPIM::ResourceABC( config ),
Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
- mCachedSubresource( QString::null ), mLocked( false )
+ mCachedSubresource( TQString::null ), mLocked( false )
{
setType( "imap" );
}
@@ -94,8 +94,8 @@ KABC::ResourceKolab::~ResourceKolab()
}
void KABC::ResourceKolab::loadSubResourceConfig( KConfig& config,
- const QString& name,
- const QString& label,
+ const TQString& name,
+ const TQString& label,
bool writable )
{
KConfigGroup group( &config, name );
@@ -110,11 +110,11 @@ bool KABC::ResourceKolab::doOpen()
KConfig config( configFile() );
// Read the calendar entries
- QValueList<KMailICalIface::SubResource> subResources;
+ TQValueList<KMailICalIface::SubResource> subResources;
if ( !kmailSubresources( subResources, s_kmailContentsType ) )
return false;
mSubResources.clear();
- QValueList<KMailICalIface::SubResource>::ConstIterator it;
+ TQValueList<KMailICalIface::SubResource>::ConstIterator it;
for ( it = subResources.begin(); it != subResources.end(); ++it ) {
loadSubResourceConfig( config, (*it).location, (*it).label, (*it).writable );
}
@@ -148,12 +148,12 @@ KABC::Ticket * KABC::ResourceKolab::requestSaveTicket()
void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
{
mLocked = false;
- mCachedSubresource = QString::null;
+ mCachedSubresource = TQString::null;
delete ticket;
}
-QString KABC::ResourceKolab::loadContact( const QString& contactData,
- const QString& subResource,
+TQString KABC::ResourceKolab::loadContact( const TQString& contactData,
+ const TQString& subResource,
Q_UINT32 sernum,
KMailICalIface::StorageFormat format )
{
@@ -181,10 +181,10 @@ static const struct { const char* mimetype; KMailICalIface::StorageFormat format
{ s_inlineMimeType, KMailICalIface::StorageIcalVcard }
};
-bool KABC::ResourceKolab::loadSubResource( const QString& subResource )
+bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
{
int count = 0;
- if ( !kmailIncidencesCount( count, QString::null, subResource ) ) {
+ if ( !kmailIncidencesCount( count, TQString::null, subResource ) ) {
kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
return false;
}
@@ -210,11 +210,11 @@ bool KABC::ResourceKolab::loadSubResource( const QString& subResource )
// TODO it would be faster to pass the s_formats array to kmail and let it load
// all events - to avoid loading each mail 3 times. But then we need to extend the returned
- // QMap to also tell us the StorageFormat of each found contact...
+ // TQMap to also tell us the StorageFormat of each found contact...
for ( int indexFormat = 0; indexFormat < 3; ++indexFormat ) {
const char* mimetype = s_formats[indexFormat].mimetype;
KMailICalIface::StorageFormat format = s_formats[indexFormat].format;
- QMap<Q_UINT32, QString> lst;
+ TQMap<Q_UINT32, TQString> lst;
if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
if ( progressId )
@@ -222,7 +222,7 @@ bool KABC::ResourceKolab::loadSubResource( const QString& subResource )
return false;
}
- for( QMap<Q_UINT32, QString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+ for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
loadContact( it.data(), subResource, it.key(), format );
}
@@ -280,24 +280,24 @@ bool KABC::ResourceKolab::save( Ticket* )
namespace Kolab {
struct AttachmentList {
- QStringList attachmentURLs;
- QStringList attachmentNames;
- QStringList attachmentMimeTypes;
- QStringList deletedAttachments;
- QValueList<KTempFile *> tempFiles;
+ TQStringList attachmentURLs;
+ TQStringList attachmentNames;
+ TQStringList attachmentMimeTypes;
+ TQStringList deletedAttachments;
+ TQValueList<KTempFile *> tempFiles;
- void addAttachment( const QString& url, const QString& name, const QString& mimetype ) {
+ void addAttachment( const TQString& url, const TQString& name, const TQString& mimetype ) {
attachmentURLs.append( url );
attachmentNames.append( name );
attachmentMimeTypes.append( mimetype );
}
- void updatePictureAttachment( const QImage& image, const QString& name );
- void updateAttachment( const QByteArray& data, const QString& name, const char* mimetype );
+ void updatePictureAttachment( const TQImage& image, const TQString& name );
+ void updateAttachment( const TQByteArray& data, const TQString& name, const char* mimetype );
};
} // namespace
-void AttachmentList::updatePictureAttachment( const QImage& image, const QString& name )
+void AttachmentList::updatePictureAttachment( const TQImage& image, const TQString& name )
{
assert( !name.isEmpty() );
if ( !image.isNull() ) {
@@ -313,7 +313,7 @@ void AttachmentList::updatePictureAttachment( const QImage& image, const QString
}
}
-void AttachmentList::updateAttachment( const QByteArray& data, const QString& name, const char* mimetype )
+void AttachmentList::updateAttachment( const TQByteArray& data, const TQString& name, const char* mimetype )
{
assert( !name.isEmpty() );
if ( !data.isNull() ) {
@@ -331,8 +331,8 @@ void AttachmentList::updateAttachment( const QByteArray& data, const QString& na
bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
{
- const QString uid = addr.uid();
- QString subResource;
+ const TQString uid = addr.uid();
+ TQString subResource;
Q_UINT32 sernum;
if ( mUidMap.find( uid ) != mUidMap.end() ) {
subResource = mUidMap[ uid ].resource();
@@ -355,11 +355,11 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
return false;
sernum = 0;
}
- QString data;
- QString mimetype;
+ TQString data;
+ TQString mimetype;
AttachmentList att;
bool isXMLStorageFormat = kmailStorageFormat( subResource ) == KMailICalIface::StorageXML;
- QString subject = uid; // as per kolab2 spec
+ TQString subject = uid; // as per kolab2 spec
if ( isXMLStorageFormat ) {
Contact contact( &addr );
// The addressee is converted to: 1) the xml 2) the optional picture 3) the optional logo 4) the optional sound
@@ -393,7 +393,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
const_cast<Addressee&>(addr).setChanged( false );
}
- for( QValueList<KTempFile *>::Iterator it = att.tempFiles.begin(); it != att.tempFiles.end(); ++it ) {
+ for( TQValueList<KTempFile *>::Iterator it = att.tempFiles.begin(); it != att.tempFiles.end(); ++it ) {
(*it)->setAutoDelete( true );
delete (*it);
}
@@ -402,7 +402,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
{
- const QString uid = addr.uid();
+ const TQString uid = addr.uid();
//kdDebug(5650) << k_funcinfo << uid << endl;
bool ok = false;
if ( mUidMap.contains( uid ) ) {
@@ -419,10 +419,10 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
{
- const QString uid = addr.uid();
+ const TQString uid = addr.uid();
if ( mUidMap.find( uid ) == mUidMap.end() ) return;
//kdDebug(5650) << k_funcinfo << uid << endl;
- const QString resource = mUidMap[ uid ].resource();
+ const TQString resource = mUidMap[ uid ].resource();
if ( !subresourceWritable( resource ) ) {
kdWarning() << "Wow! Something tried to delete a non-writable addressee! Fix this caller: " << kdBacktrace() << endl;
return;
@@ -440,18 +440,18 @@ void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
* These are the DCOP slots that KMail call to notify when something
* changed.
*/
-bool KABC::ResourceKolab::fromKMailAddIncidence( const QString& type,
- const QString& subResource,
+bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
+ const TQString& subResource,
Q_UINT32 sernum,
int format,
- const QString& contactXML )
+ const TQString& contactXML )
{
// Check if this is a contact
if( type != s_kmailContentsType || !subresourceActive( subResource ) )
return false;
// Load contact to find the UID
- const QString uid = loadContact( contactXML, subResource, sernum,
+ const TQString uid = loadContact( contactXML, subResource, sernum,
( KMailICalIface::StorageFormat )format );
//kdDebug(5650) << k_funcinfo << uid << endl;
@@ -468,9 +468,9 @@ bool KABC::ResourceKolab::fromKMailAddIncidence( const QString& type,
return true;
}
-void KABC::ResourceKolab::fromKMailDelIncidence( const QString& type,
- const QString& subResource,
- const QString& uid )
+void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
+ const TQString& subResource,
+ const TQString& uid )
{
// Check if this is a contact
if( type != s_kmailContentsType || !subresourceActive( subResource ) )
@@ -492,8 +492,8 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const QString& type,
}
}
-void KABC::ResourceKolab::fromKMailRefresh( const QString& type,
- const QString& /*subResource*/ )
+void KABC::ResourceKolab::fromKMailRefresh( const TQString& type,
+ const TQString& /*subResource*/ )
{
// Check if this is a contact
if( type != s_kmailContentsType ) return;
@@ -504,9 +504,9 @@ void KABC::ResourceKolab::fromKMailRefresh( const QString& type,
addressBook()->emitAddressBookChanged();
}
-void KABC::ResourceKolab::fromKMailAddSubresource( const QString& type,
- const QString& subResource,
- const QString& label,
+void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
+ const TQString& subResource,
+ const TQString& label,
bool writable,
bool )
{
@@ -524,8 +524,8 @@ void KABC::ResourceKolab::fromKMailAddSubresource( const QString& type,
emit signalSubresourceAdded( this, type, subResource );
}
-void KABC::ResourceKolab::fromKMailDelSubresource( const QString& type,
- const QString& subResource )
+void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
+ const TQString& subResource )
{
if( type != s_kmailContentsType ) return;
@@ -542,7 +542,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const QString& type,
// Make a list of all uids to remove
Kolab::UidMap::ConstIterator mapIt;
- QStringList uids;
+ TQStringList uids;
for ( mapIt = mUidMap.begin(); mapIt != mUidMap.end(); ++mapIt )
if ( mapIt.data().resource() == subResource )
// We have a match
@@ -550,7 +550,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const QString& type,
// Finally delete all the incidences
if ( !uids.isEmpty() ) {
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for ( it = uids.begin(); it != uids.end(); ++it ) {
mAddrMap.remove( *it );
mUidMap.remove( *it );
@@ -564,13 +564,13 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const QString& type,
-void KABC::ResourceKolab::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& /* type */,
- const QString& folder )
+void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& /* type */,
+ const TQString& folder )
{
// FIXME
KMailICalIface::StorageFormat format = KMailICalIface::StorageXML;
- for( QMap<Q_UINT32, QString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+ for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
loadContact( it.data(), folder, it.key(), format );
}
if ( !addressBook() ){
@@ -579,12 +579,12 @@ void KABC::ResourceKolab::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString
addressBook()->emitAddressBookChanged();
}
-QStringList KABC::ResourceKolab::subresources() const
+TQStringList KABC::ResourceKolab::subresources() const
{
return mSubResources.keys();
}
-bool KABC::ResourceKolab::subresourceActive( const QString& subresource ) const
+bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].active();
@@ -596,7 +596,7 @@ bool KABC::ResourceKolab::subresourceActive( const QString& subresource ) const
return true;
}
-bool KABC::ResourceKolab::subresourceWritable( const QString& subresource ) const
+bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].writable();
@@ -604,7 +604,7 @@ bool KABC::ResourceKolab::subresourceWritable( const QString& subresource ) cons
return false; //better a safe default
}
-int KABC::ResourceKolab::subresourceCompletionWeight( const QString& subresource ) const
+int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].completionWeight();
@@ -615,17 +615,17 @@ int KABC::ResourceKolab::subresourceCompletionWeight( const QString& subresource
return 80;
}
-QString KABC::ResourceKolab::subresourceLabel( const QString& subresource ) const
+TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].label();
}
kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!\n";
- return QString::null;
+ return TQString::null;
}
-void KABC::ResourceKolab::setSubresourceCompletionWeight( const QString& subresource, int completionWeight )
+void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
{
if ( mSubResources.contains( subresource ) ) {
mSubResources[ subresource ].setCompletionWeight( completionWeight );
@@ -634,17 +634,17 @@ void KABC::ResourceKolab::setSubresourceCompletionWeight( const QString& subreso
}
}
-QMap<QString, QString> KABC::ResourceKolab::uidToResourceMap() const
+TQMap<TQString, TQString> KABC::ResourceKolab::uidToResourceMap() const
{
// TODO: Couldn't this be made simpler?
- QMap<QString, QString> map;
+ TQMap<TQString, TQString> map;
Kolab::UidMap::ConstIterator mapIt;
for ( mapIt = mUidMap.begin(); mapIt != mUidMap.end(); ++mapIt )
map[ mapIt.key() ] = mapIt.data().resource();
return map;
}
-void KABC::ResourceKolab::setSubresourceActive( const QString &subresource, bool active )
+void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, bool active )
{
if ( mSubResources.contains( subresource ) ) {
mSubResources[ subresource ].setActive( active );
@@ -656,13 +656,13 @@ void KABC::ResourceKolab::setSubresourceActive( const QString &subresource, bool
/*virtual*/
-bool KABC::ResourceKolab::addSubresource( const QString& label, const QString& parent )
+bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& parent )
{
return kmailAddSubresource( label, parent, s_kmailContentsType );
}
/*virtual*/
-bool KABC::ResourceKolab::removeSubresource( const QString& id )
+bool KABC::ResourceKolab::removeSubresource( const TQString& id )
{
return kmailRemoveSubresource( id );
}
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index e01922681..1da472015 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -106,67 +106,67 @@ public:
virtual void removeAddressee( const Addressee& addr );
// Listen to KMail changes in the amount of sub resources
- void fromKMailAddSubresource( const QString& type, const QString& id,
- const QString& label, bool writable,
+ void fromKMailAddSubresource( const TQString& type, const TQString& id,
+ const TQString& label, bool writable,
bool alarmRelevant );
- void fromKMailDelSubresource( const QString& type, const QString& id );
+ void fromKMailDelSubresource( const TQString& type, const TQString& id );
- bool fromKMailAddIncidence( const QString& type, const QString& resource,
- Q_UINT32 sernum, int format, const QString& contact );
- void fromKMailDelIncidence( const QString& type, const QString& resource,
- const QString& contact );
- void fromKMailRefresh( const QString& type, const QString& resource );
+ bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
+ Q_UINT32 sernum, int format, const TQString& contact );
+ void fromKMailDelIncidence( const TQString& type, const TQString& resource,
+ const TQString& contact );
+ void fromKMailRefresh( const TQString& type, const TQString& resource );
- void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder );
+ void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder );
/// Return the list of subresources.
- QStringList subresources() const;
+ TQStringList subresources() const;
/// Is this subresource active?
- bool subresourceActive( const QString& ) const;
+ bool subresourceActive( const TQString& ) const;
/// Is this subresource writable?
- virtual bool subresourceWritable( const QString& ) const;
+ virtual bool subresourceWritable( const TQString& ) const;
- virtual void setSubresourceActive( const QString &, bool );
+ virtual void setSubresourceActive( const TQString &, bool );
- virtual bool addSubresource( const QString&, const QString& );
+ virtual bool addSubresource( const TQString&, const TQString& );
- virtual bool removeSubresource( const QString& );
+ virtual bool removeSubresource( const TQString& );
virtual bool canHaveSubresources() const { return true; }
/// Completion weight for a given subresource
- virtual int subresourceCompletionWeight( const QString& ) const;
+ virtual int subresourceCompletionWeight( const TQString& ) const;
/// Label for a given subresource
- virtual QString subresourceLabel( const QString& ) const;
+ virtual TQString subresourceLabel( const TQString& ) const;
/// Set completion weight for a given subresource
- virtual void setSubresourceCompletionWeight( const QString&, int );
+ virtual void setSubresourceCompletionWeight( const TQString&, int );
/// Give the uidmap. Used for ordered searching
- QMap<QString, QString> uidToResourceMap() const;
+ TQMap<TQString, TQString> uidToResourceMap() const;
protected:
bool kmailUpdateAddressee( const Addressee& );
void doClose();
- void loadSubResourceConfig( KConfig& config, const QString& name,
- const QString& label, bool writable );
- bool loadSubResource( const QString& subResource );
- QString loadContact( const QString& contactData, const QString& subResource,
+ void loadSubResourceConfig( KConfig& config, const TQString& name,
+ const TQString& label, bool writable );
+ bool loadSubResource( const TQString& subResource );
+ TQString loadContact( const TQString& contactData, const TQString& subResource,
Q_UINT32 sernum, const KMailICalIface::StorageFormat format );
- QString configFile() const {
+ TQString configFile() const {
return Kolab::ResourceKolabBase::configFile( "kabc" );
}
// The list of subresources
Kolab::ResourceMap mSubResources;
- QString mCachedSubresource;
+ TQString mCachedSubresource;
bool mLocked;
};
diff --git a/kresources/kolab/kabc/resourcekolab_plugin.cpp b/kresources/kolab/kabc/resourcekolab_plugin.cpp
index be87772b3..c4f1b3333 100644
--- a/kresources/kolab/kabc/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kabc/resourcekolab_plugin.cpp
@@ -42,7 +42,7 @@ class KolabFactory : public KRES::PluginFactoryBase
return new KABC::ResourceKolab( config );
}
- KRES::ConfigWidget *configWidget( QWidget* )
+ KRES::ConfigWidget *configWidget( TQWidget* )
{
return 0;
}
diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp
index a53ca4162..0f25eb73d 100644
--- a/kresources/kolab/kcal/event.cpp
+++ b/kresources/kolab/kcal/event.cpp
@@ -39,8 +39,8 @@
using namespace Kolab;
-KCal::Event* Event::xmlToEvent( const QString& xml, const QString& tz, KCal::ResourceKolab* res,
- const QString& subResource, Q_UINT32 sernum )
+KCal::Event* Event::xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res,
+ const TQString& subResource, Q_UINT32 sernum )
{
Event event( res, subResource, sernum, tz );
event.load( xml );
@@ -49,14 +49,14 @@ KCal::Event* Event::xmlToEvent( const QString& xml, const QString& tz, KCal::Res
return kcalEvent;
}
-QString Event::eventToXML( KCal::Event* kcalEvent, const QString& tz )
+TQString Event::eventToXML( KCal::Event* kcalEvent, const TQString& tz )
{
- Event event( 0, QString::null, 0, tz, kcalEvent );
+ Event event( 0, TQString::null, 0, tz, kcalEvent );
return event.saveXML();
}
-Event::Event( KCal::ResourceKolab *res, const QString &subResource, Q_UINT32 sernum,
- const QString& tz, KCal::Event* event )
+Event::Event( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+ const TQString& tz, KCal::Event* event )
: Incidence( res, subResource, sernum, tz ),
mShowTimeAs( KCal::Event::Opaque ), mHasEndDate( false )
{
@@ -78,7 +78,7 @@ KCal::Event::Transparency Event::transparency() const
return mShowTimeAs;
}
-void Event::setEndDate( const QDateTime& date )
+void Event::setEndDate( const TQDateTime& date )
{
mEndDate = date;
mHasEndDate = true;
@@ -87,7 +87,7 @@ void Event::setEndDate( const QDateTime& date )
mFloatingStatus = HasTime;
}
-void Event::setEndDate( const QDate& date )
+void Event::setEndDate( const TQDate& date )
{
mEndDate = date;
mHasEndDate = true;
@@ -96,7 +96,7 @@ void Event::setEndDate( const QDate& date )
mFloatingStatus = AllDay;
}
-void Event::setEndDate( const QString& endDate )
+void Event::setEndDate( const TQString& endDate )
{
if ( endDate.length() > 10 )
// This is a date + time
@@ -106,15 +106,15 @@ void Event::setEndDate( const QString& endDate )
setEndDate( stringToDate( endDate ) );
}
-QDateTime Event::endDate() const
+TQDateTime Event::endDate() const
{
return mEndDate;
}
-bool Event::loadAttribute( QDomElement& element )
+bool Event::loadAttribute( TQDomElement& element )
{
// This method doesn't handle the color-label tag yet
- QString tagName = element.tagName();
+ TQString tagName = element.tagName();
if ( tagName == "show-time-as" ) {
// TODO: Support tentative and outofoffice
@@ -131,7 +131,7 @@ bool Event::loadAttribute( QDomElement& element )
return true;
}
-bool Event::saveAttributes( QDomElement& element ) const
+bool Event::saveAttributes( TQDomElement& element ) const
{
// Save the base class elements
Incidence::saveAttributes( element );
@@ -152,9 +152,9 @@ bool Event::saveAttributes( QDomElement& element ) const
}
-bool Event::loadXML( const QDomDocument& document )
+bool Event::loadXML( const TQDomDocument& document )
{
- QDomElement top = document.documentElement();
+ TQDomElement top = document.documentElement();
if ( top.tagName() != "event" ) {
qWarning( "XML error: Top tag was %s instead of the expected event",
@@ -162,11 +162,11 @@ bool Event::loadXML( const QDomDocument& document )
return false;
}
- for ( QDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
loadAttribute( e );
} else
kdDebug() << "Node is not a comment or an element???" << endl;
@@ -176,10 +176,10 @@ bool Event::loadXML( const QDomDocument& document )
return true;
}
-QString Event::saveXML() const
+TQString Event::saveXML() const
{
- QDomDocument document = domTree();
- QDomElement element = document.createElement( "event" );
+ TQDomDocument document = domTree();
+ TQDomElement element = document.createElement( "event" );
element.setAttribute( "version", "1.0" );
saveAttributes( element );
document.appendChild( element );
diff --git a/kresources/kolab/kcal/event.h b/kresources/kolab/kcal/event.h
index ad33db520..879bda2da 100644
--- a/kresources/kolab/kcal/event.h
+++ b/kresources/kolab/kcal/event.h
@@ -53,47 +53,47 @@ class Event : public Incidence {
public:
/// Use this to parse an xml string to a event entry
/// The caller is responsible for deleting the returned event
- static KCal::Event* xmlToEvent( const QString& xml, const QString& tz, KCal::ResourceKolab* res = 0,
- const QString& subResource = QString::null, Q_UINT32 sernum = 0 );
+ static KCal::Event* xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res = 0,
+ const TQString& subResource = TQString::null, Q_UINT32 sernum = 0 );
/// Use this to get an xml string describing this event entry
- static QString eventToXML( KCal::Event*, const QString& tz );
+ static TQString eventToXML( KCal::Event*, const TQString& tz );
/// Create a event object and
- explicit Event( KCal::ResourceKolab *res, const QString &subResource, Q_UINT32 sernum,
- const QString& tz, KCal::Event* event = 0 );
+ explicit Event( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+ const TQString& tz, KCal::Event* event = 0 );
virtual ~Event();
void saveTo( KCal::Event* event );
- virtual QString type() const { return "Event"; }
+ virtual TQString type() const { return "Event"; }
virtual void setTransparency( KCal::Event::Transparency transparency );
virtual KCal::Event::Transparency transparency() const;
- virtual void setEndDate( const QDateTime& date );
- virtual void setEndDate( const QDate& date );
- virtual void setEndDate( const QString& date );
- virtual QDateTime endDate() const;
+ virtual void setEndDate( const TQDateTime& date );
+ virtual void setEndDate( const TQDate& date );
+ virtual void setEndDate( const TQString& date );
+ virtual TQDateTime endDate() const;
// Load the attributes of this class
- virtual bool loadAttribute( QDomElement& );
+ virtual bool loadAttribute( TQDomElement& );
// Save the attributes of this class
- virtual bool saveAttributes( QDomElement& ) const;
+ virtual bool saveAttributes( TQDomElement& ) const;
// Load this event by reading the XML file
- virtual bool loadXML( const QDomDocument& xml );
+ virtual bool loadXML( const TQDomDocument& xml );
// Serialize this event to an XML string
- virtual QString saveXML() const;
+ virtual TQString saveXML() const;
protected:
// Read all known fields from this ical incidence
void setFields( const KCal::Event* );
KCal::Event::Transparency mShowTimeAs;
- QDateTime mEndDate;
+ TQDateTime mEndDate;
bool mHasEndDate;
};
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index 8c74e3bdf..74f41fd8d 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -34,8 +34,8 @@
#include "incidence.h"
#include "resourcekolab.h"
-#include <qfile.h>
-#include <qvaluelist.h>
+#include <tqfile.h>
+#include <tqvaluelist.h>
#include <libkcal/journal.h>
#include <korganizer/version.h>
@@ -47,8 +47,8 @@
using namespace Kolab;
-Incidence::Incidence( KCal::ResourceKolab *res, const QString &subResource, Q_UINT32 sernum,
- const QString& tz )
+Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+ const TQString& tz )
: KolabBase( tz ), mFloatingStatus( Unset ), mHasAlarm( false ),
mRevision( 0 ),
mResource( res ),
@@ -61,22 +61,22 @@ Incidence::~Incidence()
{
}
-void Incidence::setSummary( const QString& summary )
+void Incidence::setSummary( const TQString& summary )
{
mSummary = summary;
}
-QString Incidence::summary() const
+TQString Incidence::summary() const
{
return mSummary;
}
-void Incidence::setLocation( const QString& location )
+void Incidence::setLocation( const TQString& location )
{
mLocation = location;
}
-QString Incidence::location() const
+TQString Incidence::location() const
{
return mLocation;
}
@@ -91,7 +91,7 @@ KolabBase::Email Incidence::organizer() const
return mOrganizer;
}
-void Incidence::setStartDate( const QDateTime& startDate )
+void Incidence::setStartDate( const TQDateTime& startDate )
{
mStartDate = startDate;
if ( mFloatingStatus == AllDay )
@@ -99,7 +99,7 @@ void Incidence::setStartDate( const QDateTime& startDate )
mFloatingStatus = HasTime;
}
-void Incidence::setStartDate( const QDate& startDate )
+void Incidence::setStartDate( const TQDate& startDate )
{
mStartDate = startDate;
if ( mFloatingStatus == HasTime )
@@ -107,7 +107,7 @@ void Incidence::setStartDate( const QDate& startDate )
mFloatingStatus = AllDay;
}
-void Incidence::setStartDate( const QString& startDate )
+void Incidence::setStartDate( const TQString& startDate )
{
if ( startDate.length() > 10 )
// This is a date + time
@@ -117,7 +117,7 @@ void Incidence::setStartDate( const QString& startDate )
setStartDate( stringToDate( startDate ) );
}
-QDateTime Incidence::startDate() const
+TQDateTime Incidence::startDate() const
{
return mStartDate;
}
@@ -143,22 +143,22 @@ void Incidence::addAttendee( const Attendee& attendee )
mAttendees.append( attendee );
}
-QValueList<Incidence::Attendee>& Incidence::attendees()
+TQValueList<Incidence::Attendee>& Incidence::attendees()
{
return mAttendees;
}
-const QValueList<Incidence::Attendee>& Incidence::attendees() const
+const TQValueList<Incidence::Attendee>& Incidence::attendees() const
{
return mAttendees;
}
-void Incidence::setInternalUID( const QString& iuid )
+void Incidence::setInternalUID( const TQString& iuid )
{
mInternalUID = iuid;
}
-QString Incidence::internalUID() const
+TQString Incidence::internalUID() const
{
return mInternalUID;
}
@@ -173,15 +173,15 @@ int Incidence::revision() const
return mRevision;
}
-bool Incidence::loadAttendeeAttribute( QDomElement& element,
+bool Incidence::loadAttendeeAttribute( TQDomElement& element,
Attendee& attendee )
{
- for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
- QString tagName = e.tagName();
+ TQDomElement e = n.toElement();
+ TQString tagName = e.tagName();
if ( tagName == "display-name" )
attendee.displayName = e.text();
@@ -212,10 +212,10 @@ bool Incidence::loadAttendeeAttribute( QDomElement& element,
return true;
}
-void Incidence::saveAttendeeAttribute( QDomElement& element,
+void Incidence::saveAttendeeAttribute( TQDomElement& element,
const Attendee& attendee ) const
{
- QDomElement e = element.ownerDocument().createElement( "attendee" );
+ TQDomElement e = element.ownerDocument().createElement( "attendee" );
element.appendChild( e );
writeString( e, "display-name", attendee.displayName );
writeString( e, "smtp-address", attendee.smtpAddress );
@@ -229,14 +229,14 @@ void Incidence::saveAttendeeAttribute( QDomElement& element,
writeString( e, "delegated-from", attendee.delegator );
}
-void Incidence::saveAttendees( QDomElement& element ) const
+void Incidence::saveAttendees( TQDomElement& element ) const
{
- QValueList<Attendee>::ConstIterator it = mAttendees.begin();
+ TQValueList<Attendee>::ConstIterator it = mAttendees.begin();
for ( ; it != mAttendees.end(); ++it )
saveAttendeeAttribute( element, *it );
}
-void Incidence::saveAttachments( QDomElement& element ) const
+void Incidence::saveAttachments( TQDomElement& element ) const
{
KCal::Attachment::List::ConstIterator it = mAttachments.begin();
for ( ; it != mAttachments.end(); ++it ) {
@@ -249,15 +249,15 @@ void Incidence::saveAttachments( QDomElement& element ) const
}
}
-void Incidence::saveRecurrence( QDomElement& element ) const
+void Incidence::saveRecurrence( TQDomElement& element ) const
{
- QDomElement e = element.ownerDocument().createElement( "recurrence" );
+ TQDomElement e = element.ownerDocument().createElement( "recurrence" );
element.appendChild( e );
e.setAttribute( "cycle", mRecurrence.cycle );
if ( !mRecurrence.type.isEmpty() )
e.setAttribute( "type", mRecurrence.type );
- writeString( e, "interval", QString::number( mRecurrence.interval ) );
- for( QStringList::ConstIterator it = mRecurrence.days.begin(); it != mRecurrence.days.end(); ++it ) {
+ writeString( e, "interval", TQString::number( mRecurrence.interval ) );
+ for( TQStringList::ConstIterator it = mRecurrence.days.begin(); it != mRecurrence.days.end(); ++it ) {
writeString( e, "day", *it );
}
if ( !mRecurrence.dayNumber.isEmpty() )
@@ -265,29 +265,29 @@ void Incidence::saveRecurrence( QDomElement& element ) const
if ( !mRecurrence.month.isEmpty() )
writeString( e, "month", mRecurrence.month );
if ( !mRecurrence.rangeType.isEmpty() ) {
- QDomElement range = element.ownerDocument().createElement( "range" );
+ TQDomElement range = element.ownerDocument().createElement( "range" );
e.appendChild( range );
range.setAttribute( "type", mRecurrence.rangeType );
- QDomText t = element.ownerDocument().createTextNode( mRecurrence.range );
+ TQDomText t = element.ownerDocument().createTextNode( mRecurrence.range );
range.appendChild( t );
}
- for( QValueList<QDate>::ConstIterator it = mRecurrence.exclusions.begin();
+ for( TQValueList<TQDate>::ConstIterator it = mRecurrence.exclusions.begin();
it != mRecurrence.exclusions.end(); ++it ) {
writeString( e, "exclusion", dateToString( *it ) );
}
}
-void Incidence::loadRecurrence( const QDomElement& element )
+void Incidence::loadRecurrence( const TQDomElement& element )
{
mRecurrence.interval = 0;
mRecurrence.cycle = element.attribute( "cycle" );
mRecurrence.type = element.attribute( "type" );
- for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
- QString tagName = e.tagName();
+ TQDomElement e = n.toElement();
+ TQString tagName = e.tagName();
if ( tagName == "interval" )
mRecurrence.interval = e.text().toInt();
@@ -309,9 +309,9 @@ void Incidence::loadRecurrence( const QDomElement& element )
}
}
-bool Incidence::loadAttribute( QDomElement& element )
+bool Incidence::loadAttribute( TQDomElement& element )
{
- QString tagName = element.tagName();
+ TQString tagName = element.tagName();
if ( tagName == "summary" )
setSummary( element.text() );
@@ -355,7 +355,7 @@ bool Incidence::loadAttribute( QDomElement& element )
// Unhandled tag - save for later storage
kdDebug() << "Saving unhandled tag " << element.tagName() << endl;
Custom c;
- c.key = QCString( "X-KDE-KolabUnhandled-" ) + element.tagName().latin1();
+ c.key = TQCString( "X-KDE-KolabUnhandled-" ) + element.tagName().latin1();
c.value = element.text();
mCustomList.append( c );
}
@@ -364,7 +364,7 @@ bool Incidence::loadAttribute( QDomElement& element )
return true;
}
-bool Incidence::saveAttributes( QDomElement& element ) const
+bool Incidence::saveAttributes( TQDomElement& element ) const
{
// Save the base class elements
KolabBase::saveAttributes( element );
@@ -383,26 +383,26 @@ bool Incidence::saveAttributes( QDomElement& element ) const
if ( mHasAlarm ) {
// Alarms should be minutes before. Libkcal uses event time + alarm time
int alarmTime = qRound( -alarm() );
- writeString( element, "alarm", QString::number( alarmTime ) );
+ writeString( element, "alarm", TQString::number( alarmTime ) );
}
writeString( element, "x-kde-internaluid", internalUID() );
- writeString( element, "revision", QString::number( revision() ) );
+ writeString( element, "revision", TQString::number( revision() ) );
saveCustomAttributes( element );
return true;
}
-void Incidence::saveCustomAttributes( QDomElement& element ) const
+void Incidence::saveCustomAttributes( TQDomElement& element ) const
{
- QValueList<Custom>::ConstIterator it = mCustomList.begin();
+ TQValueList<Custom>::ConstIterator it = mCustomList.begin();
for ( ; it != mCustomList.end(); ++it ) {
- QString key = (*it).key;
+ TQString key = (*it).key;
Q_ASSERT( !key.isEmpty() );
if ( key.startsWith( "X-KDE-KolabUnhandled-" ) ) {
key = key.mid( strlen( "X-KDE-KolabUnhandled-" ) );
writeString( element, key, (*it).value );
} else {
// Let's use attributes so that other tag-preserving-code doesn't need sub-elements
- QDomElement e = element.ownerDocument().createElement( "x-custom" );
+ TQDomElement e = element.ownerDocument().createElement( "x-custom" );
element.appendChild( e );
e.setAttribute( "key", key );
e.setAttribute( "value", (*it).value );
@@ -410,7 +410,7 @@ void Incidence::saveCustomAttributes( QDomElement& element ) const
}
}
-void Incidence::loadCustomAttributes( QDomElement& element )
+void Incidence::loadCustomAttributes( TQDomElement& element )
{
Custom custom;
custom.key = element.attribute( "key" ).latin1();
@@ -418,7 +418,7 @@ void Incidence::loadCustomAttributes( QDomElement& element )
mCustomList.append( custom );
}
-static KCal::Attendee::PartStat attendeeStringToStatus( const QString& s )
+static KCal::Attendee::PartStat attendeeStringToStatus( const TQString& s )
{
if ( s == "none" )
return KCal::Attendee::NeedsAction;
@@ -433,7 +433,7 @@ static KCal::Attendee::PartStat attendeeStringToStatus( const QString& s )
return KCal::Attendee::Accepted;
}
-static QString attendeeStatusToString( KCal::Attendee::PartStat status )
+static TQString attendeeStatusToString( KCal::Attendee::PartStat status )
{
switch( status ) {
case KCal::Attendee::NeedsAction:
@@ -456,7 +456,7 @@ static QString attendeeStatusToString( KCal::Attendee::PartStat status )
return "accepted";
}
-static KCal::Attendee::Role attendeeStringToRole( const QString& s )
+static KCal::Attendee::Role attendeeStringToRole( const TQString& s )
{
if ( s == "optional" )
return KCal::Attendee::OptParticipant;
@@ -465,7 +465,7 @@ static KCal::Attendee::Role attendeeStringToRole( const QString& s )
return KCal::Attendee::ReqParticipant;
}
-static QString attendeeRoleToString( KCal::Attendee::Role role )
+static TQString attendeeRoleToString( KCal::Attendee::Role role )
{
switch( role ) {
case KCal::Attendee::ReqParticipant:
@@ -511,7 +511,7 @@ void Incidence::setRecurrence( KCal::Recurrence* recur )
case KCal::Recurrence::rWeekly: // every X weeks
mRecurrence.cycle = "weekly";
{
- QBitArray arr = recur->days();
+ TQBitArray arr = recur->days();
for ( uint idx = 0 ; idx < 7 ; ++idx )
if ( arr.testBit( idx ) )
mRecurrence.days.append( s_weekDayName[idx] );
@@ -520,11 +520,11 @@ void Incidence::setRecurrence( KCal::Recurrence* recur )
case KCal::Recurrence::rMonthlyPos: {
mRecurrence.cycle = "monthly";
mRecurrence.type = "weekday";
- QValueList<KCal::RecurrenceRule::WDayPos> monthPositions = recur->monthPositions();
+ TQValueList<KCal::RecurrenceRule::WDayPos> monthPositions = recur->monthPositions();
if ( !monthPositions.isEmpty() ) {
KCal::RecurrenceRule::WDayPos monthPos = monthPositions.first();
// TODO: Handle multiple days in the same week
- mRecurrence.dayNumber = QString::number( monthPos.pos() );
+ mRecurrence.dayNumber = TQString::number( monthPos.pos() );
mRecurrence.days.append( s_weekDayName[ monthPos.day()-1 ] );
// Not (properly) handled(?): monthPos.negative (nth days before end of month)
}
@@ -533,20 +533,20 @@ void Incidence::setRecurrence( KCal::Recurrence* recur )
case KCal::Recurrence::rMonthlyDay: {
mRecurrence.cycle = "monthly";
mRecurrence.type = "daynumber";
- QValueList<int> monthDays = recur->monthDays();
+ TQValueList<int> monthDays = recur->monthDays();
// ####### Kolab XML limitation: only the first month day is used
if ( !monthDays.isEmpty() )
- mRecurrence.dayNumber = QString::number( monthDays.first() );
+ mRecurrence.dayNumber = TQString::number( monthDays.first() );
break;
}
case KCal::Recurrence::rYearlyMonth: // (day n of Month Y)
{
mRecurrence.cycle = "yearly";
mRecurrence.type = "monthday";
- QValueList<int> rmd = recur->yearDates();
+ TQValueList<int> rmd = recur->yearDates();
int day = !rmd.isEmpty() ? rmd.first() : recur->startDate().day();
- mRecurrence.dayNumber = QString::number( day );
- QValueList<int> months = recur->yearMonths();
+ mRecurrence.dayNumber = TQString::number( day );
+ TQValueList<int> months = recur->yearMonths();
if ( !months.isEmpty() )
mRecurrence.month = s_monthName[ months.first() - 1 ]; // #### Kolab XML limitation: only one month specified
break;
@@ -554,22 +554,22 @@ void Incidence::setRecurrence( KCal::Recurrence* recur )
case KCal::Recurrence::rYearlyDay: // YearlyDay (day N of the year). Not supported by Outlook
mRecurrence.cycle = "yearly";
mRecurrence.type = "yearday";
- mRecurrence.dayNumber = QString::number( recur->yearDays().first() );
+ mRecurrence.dayNumber = TQString::number( recur->yearDays().first() );
break;
case KCal::Recurrence::rYearlyPos: // (weekday X of week N of month Y)
mRecurrence.cycle = "yearly";
mRecurrence.type = "weekday";
- QValueList<int> months = recur->yearMonths();
+ TQValueList<int> months = recur->yearMonths();
if ( !months.isEmpty() )
mRecurrence.month = s_monthName[ months.first() - 1 ]; // #### Kolab XML limitation: only one month specified
- QValueList<KCal::RecurrenceRule::WDayPos> monthPositions = recur->yearPositions();
+ TQValueList<KCal::RecurrenceRule::WDayPos> monthPositions = recur->yearPositions();
if ( !monthPositions.isEmpty() ) {
KCal::RecurrenceRule::WDayPos monthPos = monthPositions.first();
// TODO: Handle multiple days in the same week
- mRecurrence.dayNumber = QString::number( monthPos.pos() );
+ mRecurrence.dayNumber = TQString::number( monthPos.pos() );
mRecurrence.days.append( s_weekDayName[ monthPos.day()-1 ] );
- //mRecurrence.dayNumber = QString::number( *recur->yearNums().getFirst() );
+ //mRecurrence.dayNumber = TQString::number( *recur->yearNums().getFirst() );
// Not handled: monthPos.negative (nth days before end of month)
}
break;
@@ -577,7 +577,7 @@ void Incidence::setRecurrence( KCal::Recurrence* recur )
int howMany = recur->duration();
if ( howMany > 0 ) {
mRecurrence.rangeType = "number";
- mRecurrence.range = QString::number( howMany );
+ mRecurrence.range = TQString::number( howMany );
} else if ( howMany == 0 ) {
mRecurrence.rangeType = "date";
mRecurrence.range = dateToString( recur->endDate() );
@@ -657,7 +657,7 @@ void Incidence::setFields( const KCal::Incidence* incidence )
// Handle the scheduling ID
if ( incidence->schedulingID() == incidence->uid() ) {
// There is no scheduling ID
- setInternalUID( QString::null );
+ setInternalUID( TQString::null );
} else {
// We've internally been using a different uid, so save that as the
// temporary (internal) uid and restore the original uid, the one that
@@ -672,8 +672,8 @@ void Incidence::setFields( const KCal::Incidence* incidence )
setPilotSyncStatus( incidence->syncStatus() );
// Unhandled tags and other custom properties (see libkcal/customproperties.h)
- const QMap<QCString, QString> map = incidence->customProperties();
- QMap<QCString, QString>::ConstIterator cit = map.begin();
+ const TQMap<TQCString, TQString> map = incidence->customProperties();
+ TQMap<TQCString, TQString>::ConstIterator cit = map.begin();
for ( ; cit != map.end() ; ++cit ) {
Custom c;
c.key = cit.key();
@@ -682,11 +682,11 @@ void Incidence::setFields( const KCal::Incidence* incidence )
}
}
-static QBitArray daysListToBitArray( const QStringList& days )
+static TQBitArray daysListToBitArray( const TQStringList& days )
{
- QBitArray arr( 7 );
+ TQBitArray arr( 7 );
arr.fill( false );
- for( QStringList::ConstIterator it = days.begin(); it != days.end(); ++it ) {
+ for( TQStringList::ConstIterator it = days.begin(); it != days.end(); ++it ) {
for ( uint i = 0; i < 7 ; ++i )
if ( *it == s_weekDayName[i] )
arr.setBit( i, true );
@@ -724,7 +724,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
+ organizer().smtpAddress + ">" );
incidence->clearAttendees();
- QValueList<Attendee>::ConstIterator it;
+ TQValueList<Attendee>::ConstIterator it;
for ( it = mAttendees.begin(); it != mAttendees.end(); ++it ) {
KCal::Attendee::PartStat status = attendeeStringToStatus( (*it).status );
KCal::Attendee::Role role = attendeeStringToRole( (*it).role );
@@ -755,7 +755,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
} else if ( mRecurrence.cycle == "daily" ) {
recur->setDaily( mRecurrence.interval );
} else if ( mRecurrence.cycle == "weekly" ) {
- QBitArray rDays = daysListToBitArray( mRecurrence.days );
+ TQBitArray rDays = daysListToBitArray( mRecurrence.days );
recur->setWeekly( mRecurrence.interval, rDays );
} else if ( mRecurrence.cycle == "monthly" ) {
recur->setMonthly( mRecurrence.interval );
@@ -803,7 +803,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
if ( hasPilotSyncStatus() )
incidence->setSyncStatus( pilotSyncStatus() );
- for( QValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) {
+ for( TQValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) {
incidence->setNonKDECustomProperty( (*it).key, (*it).value );
}
@@ -811,16 +811,16 @@ void Incidence::saveTo( KCal::Incidence* incidence )
void Incidence::loadAttachments()
{
- QStringList attachments;
+ TQStringList attachments;
if ( mResource->kmailListAttachments( attachments, mSubResource, mSernum ) ) {
- for ( QStringList::ConstIterator it = attachments.constBegin(); it != attachments.constEnd(); ++it ) {
- QByteArray data;
+ for ( TQStringList::ConstIterator it = attachments.constBegin(); it != attachments.constEnd(); ++it ) {
+ TQByteArray data;
KURL url;
if ( mResource->kmailGetAttachment( url, mSubResource, mSernum, *it ) && !url.isEmpty() ) {
- QFile f( url.path() );
+ TQFile f( url.path() );
if ( f.open( IO_ReadOnly ) ) {
data = f.readAll();
- QString mimeType;
+ TQString mimeType;
if ( !mResource->kmailAttachmentMimetype( mimeType, mSubResource, mSernum, *it ) )
mimeType = "application/octet-stream";
KCal::Attachment *a = new KCal::Attachment( KCodecs::base64Encode( data ).data(), mimeType );
@@ -834,9 +834,9 @@ void Incidence::loadAttachments()
}
}
-QString Incidence::productID() const
+TQString Incidence::productID() const
{
- return QString( "KOrganizer " ) + korgVersion + ", Kolab resource";
+ return TQString( "KOrganizer " ) + korgVersion + ", Kolab resource";
}
// Unhandled KCal::Incidence fields:
diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index de549328e..e8f8b9fa8 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -55,46 +55,46 @@ namespace Kolab {
class Incidence : public KolabBase {
public:
struct Recurrence {
- QString cycle;
- QString type;
+ TQString cycle;
+ TQString type;
int interval;
- QStringList days; // list of days-of-the-week
- QString dayNumber;
- QString month;
- QString rangeType;
- QString range; // date or number or nothing
- QValueList<QDate> exclusions;
+ TQStringList days; // list of days-of-the-week
+ TQString dayNumber;
+ TQString month;
+ TQString rangeType;
+ TQString range; // date or number or nothing
+ TQValueList<TQDate> exclusions;
};
struct Attendee : Email {
Attendee() : requestResponse( true ), invitationSent( false ) {}
- QString status;
+ TQString status;
bool requestResponse;
bool invitationSent;
- QString role;
- QString delegate;
- QString delegator;
+ TQString role;
+ TQString delegate;
+ TQString delegator;
};
- explicit Incidence( KCal::ResourceKolab *res, const QString &subResource, Q_UINT32 sernum,
- const QString& tz );
+ explicit Incidence( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+ const TQString& tz );
virtual ~Incidence();
void saveTo( KCal::Incidence* incidence );
- virtual void setSummary( const QString& summary );
- virtual QString summary() const;
+ virtual void setSummary( const TQString& summary );
+ virtual TQString summary() const;
- virtual void setLocation( const QString& location );
- virtual QString location() const;
+ virtual void setLocation( const TQString& location );
+ virtual TQString location() const;
virtual void setOrganizer( const Email& organizer );
virtual Email organizer() const;
- virtual void setStartDate( const QDateTime& startDate );
- virtual void setStartDate( const QDate& startDate );
- virtual void setStartDate( const QString& startDate );
- virtual QDateTime startDate() const;
+ virtual void setStartDate( const TQDateTime& startDate );
+ virtual void setStartDate( const TQDate& startDate );
+ virtual void setStartDate( const TQString& startDate );
+ virtual TQDateTime startDate() const;
virtual void setAlarm( float alarm );
virtual float alarm() const;
@@ -103,8 +103,8 @@ public:
virtual Recurrence recurrence() const;
virtual void addAttendee( const Attendee& attendee );
- QValueList<Attendee>& attendees();
- const QValueList<Attendee>& attendees() const;
+ TQValueList<Attendee>& attendees();
+ const TQValueList<Attendee>& attendees() const;
/**
* The internal uid is used as the uid inside KOrganizer whenever
@@ -112,17 +112,17 @@ public:
* can't handle. To avoid keep that interal uid from changing all the
* time, it is persisted in the XML between a save and the next load.
*/
- void setInternalUID( const QString& iuid );
- QString internalUID() const;
+ void setInternalUID( const TQString& iuid );
+ TQString internalUID() const;
virtual void setRevision( int );
virtual int revision() const;
// Load the attributes of this class
- virtual bool loadAttribute( QDomElement& );
+ virtual bool loadAttribute( TQDomElement& );
// Save the attributes of this class
- virtual bool saveAttributes( QDomElement& ) const;
+ virtual bool saveAttributes( TQDomElement& ) const;
protected:
enum FloatingStatus { Unset, AllDay, HasTime };
@@ -130,42 +130,42 @@ protected:
// Read all known fields from this ical incidence
void setFields( const KCal::Incidence* );
- bool loadAttendeeAttribute( QDomElement&, Attendee& );
- void saveAttendeeAttribute( QDomElement& element,
+ bool loadAttendeeAttribute( TQDomElement&, Attendee& );
+ void saveAttendeeAttribute( TQDomElement& element,
const Attendee& attendee ) const;
- void saveAttendees( QDomElement& element ) const;
- void saveAttachments( QDomElement& element ) const;
+ void saveAttendees( TQDomElement& element ) const;
+ void saveAttachments( TQDomElement& element ) const;
- void loadRecurrence( const QDomElement& element );
- void saveRecurrence( QDomElement& element ) const;
- void saveCustomAttributes( QDomElement& element ) const;
- void loadCustomAttributes( QDomElement& element );
+ void loadRecurrence( const TQDomElement& element );
+ void saveRecurrence( TQDomElement& element ) const;
+ void saveCustomAttributes( TQDomElement& element ) const;
+ void loadCustomAttributes( TQDomElement& element );
void loadAttachments();
- QString productID() const;
+ TQString productID() const;
- QString mSummary;
- QString mLocation;
+ TQString mSummary;
+ TQString mLocation;
Email mOrganizer;
- QDateTime mStartDate;
+ TQDateTime mStartDate;
FloatingStatus mFloatingStatus;
float mAlarm;
bool mHasAlarm;
Recurrence mRecurrence;
- QValueList<Attendee> mAttendees;
- QValueList<KCal::Attachment*> mAttachments;
- QString mInternalUID;
+ TQValueList<Attendee> mAttendees;
+ TQValueList<KCal::Attachment*> mAttachments;
+ TQString mInternalUID;
int mRevision;
struct Custom {
- QCString key;
- QString value;
+ TQCString key;
+ TQString value;
};
- QValueList<Custom> mCustomList;
+ TQValueList<Custom> mCustomList;
KCal::ResourceKolab *mResource;
- QString mSubResource;
+ TQString mSubResource;
Q_UINT32 mSernum;
};
diff --git a/kresources/kolab/kcal/journal.cpp b/kresources/kolab/kcal/journal.cpp
index 45b91587d..462cfe3ca 100644
--- a/kresources/kolab/kcal/journal.cpp
+++ b/kresources/kolab/kcal/journal.cpp
@@ -40,7 +40,7 @@
using namespace Kolab;
-KCal::Journal* Journal::xmlToJournal( const QString& xml, const QString& tz )
+KCal::Journal* Journal::xmlToJournal( const TQString& xml, const TQString& tz )
{
Journal journal( tz );
journal.load( xml );
@@ -49,13 +49,13 @@ KCal::Journal* Journal::xmlToJournal( const QString& xml, const QString& tz )
return kcalJournal;
}
-QString Journal::journalToXML( KCal::Journal* kcalJournal, const QString& tz )
+TQString Journal::journalToXML( KCal::Journal* kcalJournal, const TQString& tz )
{
Journal journal( tz, kcalJournal );
return journal.saveXML();
}
-Journal::Journal( const QString& tz, KCal::Journal* journal )
+Journal::Journal( const TQString& tz, KCal::Journal* journal )
: KolabBase( tz )
{
if ( journal )
@@ -66,39 +66,39 @@ Journal::~Journal()
{
}
-void Journal::setSummary( const QString& summary )
+void Journal::setSummary( const TQString& summary )
{
mSummary = summary;
}
-QString Journal::summary() const
+TQString Journal::summary() const
{
return mSummary;
}
-void Journal::setStartDate( const QDateTime& startDate )
+void Journal::setStartDate( const TQDateTime& startDate )
{
mStartDate = startDate;
}
-QDateTime Journal::startDate() const
+TQDateTime Journal::startDate() const
{
return mStartDate;
}
-void Journal::setEndDate( const QDateTime& endDate )
+void Journal::setEndDate( const TQDateTime& endDate )
{
mEndDate = endDate;
}
-QDateTime Journal::endDate() const
+TQDateTime Journal::endDate() const
{
return mEndDate;
}
-bool Journal::loadAttribute( QDomElement& element )
+bool Journal::loadAttribute( TQDomElement& element )
{
- QString tagName = element.tagName();
+ TQString tagName = element.tagName();
if ( tagName == "summary" )
setSummary( element.text() );
@@ -112,7 +112,7 @@ bool Journal::loadAttribute( QDomElement& element )
return true;
}
-bool Journal::saveAttributes( QDomElement& element ) const
+bool Journal::saveAttributes( TQDomElement& element ) const
{
// Save the base class elements
KolabBase::saveAttributes( element );
@@ -124,9 +124,9 @@ bool Journal::saveAttributes( QDomElement& element ) const
}
-bool Journal::loadXML( const QDomDocument& document )
+bool Journal::loadXML( const TQDomDocument& document )
{
- QDomElement top = document.documentElement();
+ TQDomElement top = document.documentElement();
if ( top.tagName() != "journal" ) {
qWarning( "XML error: Top tag was %s instead of the expected Journal",
@@ -134,11 +134,11 @@ bool Journal::loadXML( const QDomDocument& document )
return false;
}
- for ( QDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if ( !loadAttribute( e ) ) {
// Unhandled tag - save for later storage
//qDebug( "Unhandled tag: %s", e.toCString().data() );
@@ -150,10 +150,10 @@ bool Journal::loadXML( const QDomDocument& document )
return true;
}
-QString Journal::saveXML() const
+TQString Journal::saveXML() const
{
- QDomDocument document = domTree();
- QDomElement element = document.createElement( "journal" );
+ TQDomDocument document = domTree();
+ TQDomElement element = document.createElement( "journal" );
element.setAttribute( "version", "1.0" );
saveAttributes( element );
document.appendChild( element );
@@ -178,7 +178,7 @@ void Journal::setFields( const KCal::Journal* journal )
setStartDate( localToUTC( journal->dtStart() ) );
}
-QString Journal::productID() const
+TQString Journal::productID() const
{
- return QString( "KOrganizer " ) + korgVersion + ", Kolab resource";
+ return TQString( "KOrganizer " ) + korgVersion + ", Kolab resource";
}
diff --git a/kresources/kolab/kcal/journal.h b/kresources/kolab/kcal/journal.h
index d8b09bb96..7505e0703 100644
--- a/kresources/kolab/kcal/journal.h
+++ b/kresources/kolab/kcal/journal.h
@@ -54,48 +54,48 @@ class Journal : public KolabBase {
public:
/// Use this to parse an xml string to a journal entry
/// The caller is responsible for deleting the returned journal
- static KCal::Journal* xmlToJournal( const QString& xml, const QString& tz );
+ static KCal::Journal* xmlToJournal( const TQString& xml, const TQString& tz );
/// Use this to get an xml string describing this journal entry
- static QString journalToXML( KCal::Journal*, const QString& tz );
+ static TQString journalToXML( KCal::Journal*, const TQString& tz );
- explicit Journal( const QString& tz, KCal::Journal* journal = 0 );
+ explicit Journal( const TQString& tz, KCal::Journal* journal = 0 );
virtual ~Journal();
- virtual QString type() const { return "Journal"; }
+ virtual TQString type() const { return "Journal"; }
void saveTo( KCal::Journal* journal );
- virtual void setSummary( const QString& summary );
- virtual QString summary() const;
+ virtual void setSummary( const TQString& summary );
+ virtual TQString summary() const;
- virtual void setStartDate( const QDateTime& startDate );
- virtual QDateTime startDate() const;
+ virtual void setStartDate( const TQDateTime& startDate );
+ virtual TQDateTime startDate() const;
- virtual void setEndDate( const QDateTime& endDate );
- virtual QDateTime endDate() const;
+ virtual void setEndDate( const TQDateTime& endDate );
+ virtual TQDateTime endDate() const;
// Load the attributes of this class
- virtual bool loadAttribute( QDomElement& );
+ virtual bool loadAttribute( TQDomElement& );
// Save the attributes of this class
- virtual bool saveAttributes( QDomElement& ) const;
+ virtual bool saveAttributes( TQDomElement& ) const;
// Load this journal by reading the XML file
- virtual bool loadXML( const QDomDocument& xml );
+ virtual bool loadXML( const TQDomDocument& xml );
// Serialize this journal to an XML string
- virtual QString saveXML() const;
+ virtual TQString saveXML() const;
protected:
// Read all known fields from this ical journal
void setFields( const KCal::Journal* );
- QString productID() const;
+ TQString productID() const;
- QString mSummary;
- QDateTime mStartDate;
- QDateTime mEndDate;
+ TQString mSummary;
+ TQDateTime mStartDate;
+ TQDateTime mEndDate;
};
}
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 3c1c80e10..b61b12110 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -50,10 +50,10 @@
#include <ktempfile.h>
#include <kmdcodec.h>
-#include <qfile.h>
-#include <qobject.h>
-#include <qtimer.h>
-#include <qapplication.h>
+#include <tqfile.h>
+#include <tqobject.h>
+#include <tqtimer.h>
+#include <tqapplication.h>
#include <assert.h>
@@ -71,12 +71,12 @@ static const char* incidenceInlineMimeType = "text/calendar";
ResourceKolab::ResourceKolab( const KConfig *config )
: ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ),
- mCalendar( QString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
+ mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
"mResourceChangedTimer" )
{
setType( "imap" );
- connect( &mResourceChangedTimer, SIGNAL( timeout() ),
- this, SLOT( slotEmitResourceChanged() ) );
+ connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotEmitResourceChanged() ) );
}
ResourceKolab::~ResourceKolab()
@@ -89,8 +89,8 @@ ResourceKolab::~ResourceKolab()
}
void ResourceKolab::loadSubResourceConfig( KConfig& config,
- const QString& name,
- const QString& label,
+ const TQString& name,
+ const TQString& label,
bool writable,
bool alarmRelevant,
ResourceMap& subResource )
@@ -105,11 +105,11 @@ bool ResourceKolab::openResource( KConfig& config, const char* contentType,
ResourceMap& map )
{
// Read the subresource entries from KMail
- QValueList<KMailICalIface::SubResource> subResources;
+ TQValueList<KMailICalIface::SubResource> subResources;
if ( !kmailSubresources( subResources, contentType ) )
return false;
map.clear();
- QValueList<KMailICalIface::SubResource>::ConstIterator it;
+ TQValueList<KMailICalIface::SubResource>::ConstIterator it;
for ( it = subResources.begin(); it != subResources.end(); ++it )
loadSubResourceConfig( config, (*it).location, (*it).label, (*it).writable,
(*it).alarmRelevant, map );
@@ -154,7 +154,7 @@ void ResourceKolab::doClose()
closeResource( config, mJournalSubResources );
}
-bool ResourceKolab::loadSubResource( const QString& subResource,
+bool ResourceKolab::loadSubResource( const TQString& subResource,
const char* mimetype )
{
int count = 0;
@@ -168,10 +168,10 @@ bool ResourceKolab::loadSubResource( const QString& subResource,
const int nbMessages = 200; // read 200 mails at a time (see kabc resource)
- const QString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
+ const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
: !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." )
: i18n( "Loading events..." );
- const bool useProgress = qApp && qApp->type() != QApplication::Tty && count > mProgressDialogIncidenceLimit;
+ const bool useProgress = qApp && qApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
if ( useProgress )
(void)::Observer::self(); // ensure kio_uiserver is running
UIServer_stub uiserver( "kio_uiserver", "UIServer" );
@@ -184,7 +184,7 @@ bool ResourceKolab::loadSubResource( const QString& subResource,
}
for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) {
- QMap<Q_UINT32, QString> lst;
+ TQMap<Q_UINT32, TQString> lst;
if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
kdError(5650) << "Communication problem in ResourceKolab::load()\n";
if ( progressId )
@@ -194,7 +194,7 @@ bool ResourceKolab::loadSubResource( const QString& subResource,
{ // for RAII scoping below
TemporarySilencer t( this );
- for( QMap<Q_UINT32, QString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+ for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
addIncidence( mimetype, it.data(), subResource, it.key() );
}
}
@@ -266,7 +266,7 @@ bool ResourceKolab::loadAllJournals()
return kolabStyle && icalStyle;
}
-void ResourceKolab::removeIncidences( const QCString& incidenceType )
+void ResourceKolab::removeIncidences( const TQCString& incidenceType )
{
Kolab::UidMap::Iterator mapIt = mUidMap.begin();
while ( mapIt != mUidMap.end() )
@@ -278,7 +278,7 @@ void ResourceKolab::removeIncidences( const QCString& incidenceType )
// A faster but hackish way would probably be to check the type of the resource,
// like mEventSubResources.find( it.data().resource() ) != mEventSubResources.end() ?
- const QString& uid = it.key();
+ const TQString& uid = it.key();
if ( incidenceType == "Event" && mCalendar.event( uid ) )
mUidMap.remove( it );
else if ( incidenceType == "Todo" && mCalendar.todo( uid ) )
@@ -299,7 +299,7 @@ bool ResourceKolab::doSave()
}
void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase)
{
- const QString uid = incidencebase->uid();
+ const TQString uid = incidencebase->uid();
//kdDebug() << k_funcinfo << uid << endl;
if ( mUidsPendingUpdate.contains( uid ) || mUidsPendingAdding.contains( uid ) ) {
@@ -310,7 +310,7 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase)
return;
}
- QString subResource;
+ TQString subResource;
Q_UINT32 sernum = 0;
if ( mUidMap.contains( uid ) ) {
subResource = mUidMap[ uid ].resource();
@@ -324,7 +324,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
{
if ( incidencebase->isReadOnly() ) return;
incidencebase->setSyncStatusSilent( KCal::Event::SYNCMOD );
- incidencebase->setLastModified( QDateTime::currentDateTime() );
+ incidencebase->setLastModified( TQDateTime::currentDateTime() );
// we should probably update the revision number here,
// or internally in the Event itself when certain things change.
// need to verify with ical documentation.
@@ -332,7 +332,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
}
-void ResourceKolab::resolveConflict( KCal::Incidence* inc, const QString& subresource, Q_UINT32 sernum )
+void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subresource, Q_UINT32 sernum )
{
if ( ! inc )
return;
@@ -341,7 +341,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const QString& subres
delete inc;
return;
}
- const QString origUid = inc->uid();
+ const TQString origUid = inc->uid();
Incidence* local = mCalendar.incidence( origUid );
Incidence* localIncidence = 0;
Incidence* addedIncidence = 0;
@@ -354,7 +354,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const QString& subres
KIncidenceChooser* ch = new KIncidenceChooser();
ch->setIncidence( local ,inc );
if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) {
- connect ( this, SIGNAL( useGlobalMode() ), ch, SLOT ( useGlobalMode() ) );
+ connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) );
if ( ch->exec() )
if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask )
emit useGlobalMode() ;
@@ -390,8 +390,8 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const QString& subres
}
mSilent = silent;
}
-void ResourceKolab::addIncidence( const char* mimetype, const QString& data,
- const QString& subResource, Q_UINT32 sernum )
+void ResourceKolab::addIncidence( const char* mimetype, const TQString& data,
+ const TQString& subResource, Q_UINT32 sernum )
{
// This uses pointer comparison, so it only works if we use the static
// objects defined in the top of the file
@@ -408,12 +408,12 @@ void ResourceKolab::addIncidence( const char* mimetype, const QString& data,
}
-bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const QString& subresource,
+bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const TQString& subresource,
Q_UINT32 sernum )
{
- const QString& type = incidencebase->type();
+ const TQString& type = incidencebase->type();
const char* mimetype = 0;
- QString data;
+ TQString data;
bool isXMLStorageFormat = kmailStorageFormat( subresource ) == KMailICalIface::StorageXML;
if ( type == "Event" ) {
if( isXMLStorageFormat ) {
@@ -454,11 +454,11 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const Q
KCal::Incidence* incidence = static_cast<KCal::Incidence *>( incidencebase );
KCal::Attachment::List atts = incidence->attachments();
- QStringList attURLs, attMimeTypes, attNames;
- QValueList<KTempFile*> tmpFiles;
+ TQStringList attURLs, attMimeTypes, attNames;
+ TQValueList<KTempFile*> tmpFiles;
for ( KCal::Attachment::List::ConstIterator it = atts.constBegin(); it != atts.constEnd(); ++it ) {
KTempFile* tempFile = new KTempFile;
- QCString decoded = KCodecs::base64Decode( QCString( (*it)->data() ) );
+ TQCString decoded = KCodecs::base64Decode( TQCString( (*it)->data() ) );
tempFile->file()->writeBlock( decoded.data(), decoded.length() );
tempFile->close();
KURL url;
@@ -467,9 +467,9 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const Q
attMimeTypes.append( (*it)->mimeType() );
attNames.append( (*it)->label() );
}
- QStringList deletedAtts;
+ TQStringList deletedAtts;
if ( kmailListAttachments( deletedAtts, subresource, sernum ) ) {
- for ( QStringList::ConstIterator it = attNames.constBegin(); it != attNames.constEnd(); ++it ) {
+ for ( TQStringList::ConstIterator it = attNames.constBegin(); it != attNames.constEnd(); ++it ) {
deletedAtts.remove( *it );
}
}
@@ -477,7 +477,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const Q
if ( incidence->schedulingID() != incidence->uid() )
customHeaders.insert( "X-Kolab-SchedulingID", incidence->schedulingID() );
- QString subject = incidencebase->uid();
+ TQString subject = incidencebase->uid();
if ( !isXMLStorageFormat ) subject.prepend( "iCal " ); // conform to the old style
// behold, sernum is an in-parameter
@@ -487,7 +487,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const Q
mUidMap[ incidencebase->uid() ].setSerialNumber( sernum );
}
- for( QValueList<KTempFile *>::Iterator it = tmpFiles.begin(); it != tmpFiles.end(); ++it ) {
+ for( TQValueList<KTempFile *>::Iterator it = tmpFiles.begin(); it != tmpFiles.end(); ++it ) {
(*it)->setAutoDelete( true );
delete (*it);
}
@@ -495,17 +495,17 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const Q
return rc;
}
-bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const QString& _subresource,
+bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _subresource,
Q_UINT32 sernum )
{
Q_ASSERT( incidence );
if ( !incidence ) return false;
- QString uid = incidence->uid();
- QString subResource = _subresource;
+ TQString uid = incidence->uid();
+ TQString subResource = _subresource;
Kolab::ResourceMap *map = &mEventSubResources; // don't use a ref here!
- const QString& type = incidence->type();
+ const TQString& type = incidence->type();
if ( type == "Event" )
map = &mEventSubResources;
else if ( type == "Todo" )
@@ -520,7 +520,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const QString& _su
bool newIncidence = _subresource.isEmpty();
if ( newIncidence ) {
// Add a description of the incidence
- QString text = "<b><font size=\"+1\">";
+ TQString text = "<b><font size=\"+1\">";
if ( incidence->type() == "Event" )
text += i18n( "Choose the folder where you want to store this event" );
else if ( incidence->type() == "Todo" )
@@ -642,10 +642,10 @@ bool ResourceKolab::addEvent( KCal::Event* event )
if ( mUidMap.contains( event->uid() ) )
return true; //noop
else
- return addIncidence( event, QString::null, 0 );
+ return addIncidence( event, TQString::null, 0 );
}
-void ResourceKolab::addEvent( const QString& xml, const QString& subresource,
+void ResourceKolab::addEvent( const TQString& xml, const TQString& subresource,
Q_UINT32 sernum )
{
KCal::Event* event = Kolab::Event::xmlToEvent( xml, mCalendar.timeZoneId(), this, subresource, sernum );
@@ -659,7 +659,7 @@ bool ResourceKolab::deleteIncidence( KCal::Incidence* incidence )
{
if ( incidence->isReadOnly() ) return false;
- const QString uid = incidence->uid();
+ const TQString uid = incidence->uid();
if( !mUidMap.contains( uid ) ) return false; // Odd
/* The user told us to delete, tell KMail */
if ( !mSilent ) {
@@ -680,7 +680,7 @@ bool ResourceKolab::deleteEvent( KCal::Event* event )
return deleteIncidence( event );
}
-KCal::Event* ResourceKolab::event( const QString& uid )
+KCal::Event* ResourceKolab::event( const TQString& uid )
{
return mCalendar.event(uid);
}
@@ -690,20 +690,20 @@ KCal::Event::List ResourceKolab::rawEvents( EventSortField sortField, SortDirect
return mCalendar.rawEvents( sortField, sortDirection );
}
-KCal::Event::List ResourceKolab::rawEventsForDate( const QDate& date,
+KCal::Event::List ResourceKolab::rawEventsForDate( const TQDate& date,
EventSortField sortField,
SortDirection sortDirection )
{
return mCalendar.rawEventsForDate( date, sortField, sortDirection );
}
-KCal::Event::List ResourceKolab::rawEventsForDate( const QDateTime& qdt )
+KCal::Event::List ResourceKolab::rawEventsForDate( const TQDateTime& qdt )
{
return mCalendar.rawEventsForDate( qdt );
}
-KCal::Event::List ResourceKolab::rawEvents( const QDate& start,
- const QDate& end,
+KCal::Event::List ResourceKolab::rawEvents( const TQDate& start,
+ const TQDate& end,
bool inclusive )
{
return mCalendar.rawEvents( start, end, inclusive );
@@ -714,10 +714,10 @@ bool ResourceKolab::addTodo( KCal::Todo* todo )
if ( mUidMap.contains( todo->uid() ) )
return true; //noop
else
- return addIncidence( todo, QString::null, 0 );
+ return addIncidence( todo, TQString::null, 0 );
}
-void ResourceKolab::addTodo( const QString& xml, const QString& subresource,
+void ResourceKolab::addTodo( const TQString& xml, const TQString& subresource,
Q_UINT32 sernum )
{
KCal::Todo* todo = Kolab::Task::xmlToTask( xml, mCalendar.timeZoneId(), this, subresource, sernum );
@@ -731,7 +731,7 @@ bool ResourceKolab::deleteTodo( KCal::Todo* todo )
return deleteIncidence( todo );
}
-KCal::Todo* ResourceKolab::todo( const QString& uid )
+KCal::Todo* ResourceKolab::todo( const TQString& uid )
{
return mCalendar.todo( uid );
}
@@ -741,7 +741,7 @@ KCal::Todo::List ResourceKolab::rawTodos( TodoSortField sortField, SortDirection
return mCalendar.rawTodos( sortField, sortDirection );
}
-KCal::Todo::List ResourceKolab::rawTodosForDate( const QDate& date )
+KCal::Todo::List ResourceKolab::rawTodosForDate( const TQDate& date )
{
return mCalendar.rawTodosForDate( date );
}
@@ -751,10 +751,10 @@ bool ResourceKolab::addJournal( KCal::Journal* journal )
if ( mUidMap.contains( journal->uid() ) )
return true; //noop
else
- return addIncidence( journal, QString::null, 0 );
+ return addIncidence( journal, TQString::null, 0 );
}
-void ResourceKolab::addJournal( const QString& xml, const QString& subresource,
+void ResourceKolab::addJournal( const TQString& xml, const TQString& subresource,
Q_UINT32 sernum )
{
KCal::Journal* journal =
@@ -770,7 +770,7 @@ bool ResourceKolab::deleteJournal( KCal::Journal* journal )
return deleteIncidence( journal );
}
-KCal::Journal* ResourceKolab::journal( const QString& uid )
+KCal::Journal* ResourceKolab::journal( const TQString& uid )
{
return mCalendar.journal(uid);
}
@@ -780,7 +780,7 @@ KCal::Journal::List ResourceKolab::rawJournals( JournalSortField sortField, Sort
return mCalendar.rawJournals( sortField, sortDirection );
}
-KCal::Journal::List ResourceKolab::rawJournalsForDate( const QDate &date )
+KCal::Journal::List ResourceKolab::rawJournalsForDate( const TQDate &date )
{
return mCalendar.rawJournalsForDate( date );
}
@@ -792,9 +792,9 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
while ( it != alarms.end() ) {
KCal::Alarm *a = (*it);
++it;
- const QString &uid = a->parent()->uid();
+ const TQString &uid = a->parent()->uid();
if ( mUidMap.contains( uid ) ) {
- const QString &sr = mUidMap[ uid ].resource();
+ const TQString &sr = mUidMap[ uid ].resource();
Kolab::SubResource *subResource = 0;
if ( mEventSubResources.contains( sr ) )
subResource = &( mEventSubResources[ sr ] );
@@ -813,28 +813,28 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
-KCal::Alarm::List ResourceKolab::alarms( const QDateTime& from,
- const QDateTime& to )
+KCal::Alarm::List ResourceKolab::alarms( const TQDateTime& from,
+ const TQDateTime& to )
{
return relevantAlarms( mCalendar.alarms( from, to ) );
}
-KCal::Alarm::List ResourceKolab::alarmsTo( const QDateTime& to )
+KCal::Alarm::List ResourceKolab::alarmsTo( const TQDateTime& to )
{
return relevantAlarms( mCalendar.alarmsTo(to) );
}
-void ResourceKolab::setTimeZoneId( const QString& tzid )
+void ResourceKolab::setTimeZoneId( const TQString& tzid )
{
mCalendar.setTimeZoneId( tzid );
mFormat.setTimeZone( mCalendar.timeZoneId(), !mCalendar.isLocalTime() );
}
-bool ResourceKolab::fromKMailAddIncidence( const QString& type,
- const QString& subResource,
+bool ResourceKolab::fromKMailAddIncidence( const TQString& type,
+ const TQString& subResource,
Q_UINT32 sernum,
int format,
- const QString& data )
+ const TQString& data )
{
bool rc = true;
TemporarySilencer t( this ); // RAII
@@ -864,9 +864,9 @@ bool ResourceKolab::fromKMailAddIncidence( const QString& type,
return rc;
}
-void ResourceKolab::fromKMailDelIncidence( const QString& type,
- const QString& subResource,
- const QString& uid )
+void ResourceKolab::fromKMailDelIncidence( const TQString& type,
+ const TQString& subResource,
+ const TQString& uid )
{
if ( type != kmailCalendarContentsType && type != kmailTodoContentsType
&& type != kmailJournalContentsType )
@@ -892,8 +892,8 @@ void ResourceKolab::fromKMailDelIncidence( const QString& type,
}
}
-void ResourceKolab::fromKMailRefresh( const QString& type,
- const QString& /*subResource*/ )
+void ResourceKolab::fromKMailRefresh( const TQString& type,
+ const TQString& /*subResource*/ )
{
// TODO: Only load the specified subResource
if ( type == "Calendar" )
@@ -907,9 +907,9 @@ void ResourceKolab::fromKMailRefresh( const QString& type,
mResourceChangedTimer.changeInterval( 100 );
}
-void ResourceKolab::fromKMailAddSubresource( const QString& type,
- const QString& subResource,
- const QString& label,
+void ResourceKolab::fromKMailAddSubresource( const TQString& type,
+ const TQString& subResource,
+ const TQString& label,
bool writable, bool alarmRelevant )
{
ResourceMap* map = 0;
@@ -941,8 +941,8 @@ void ResourceKolab::fromKMailAddSubresource( const QString& type,
emit signalSubresourceAdded( this, type, subResource, label );
}
-void ResourceKolab::fromKMailDelSubresource( const QString& type,
- const QString& subResource )
+void ResourceKolab::fromKMailDelSubresource( const TQString& type,
+ const TQString& subResource )
{
ResourceMap* map = subResourceMap( type );
if ( !map ) // not ours
@@ -963,7 +963,7 @@ void ResourceKolab::fromKMailDelSubresource( const QString& type,
emit signalSubresourceRemoved( this, type, subResource );
}
-QStringList ResourceKolab::subresources() const
+TQStringList ResourceKolab::subresources() const
{
// Workaround: The ResourceView in KOrganizer wants to know this
// before it opens the resource :-( Make sure we are open
@@ -974,7 +974,7 @@ QStringList ResourceKolab::subresources() const
}
const QString
-ResourceKolab::labelForSubresource( const QString& subresource ) const
+ResourceKolab::labelForSubresource( const TQString& subresource ) const
{
if ( mEventSubResources.contains( subresource ) )
return mEventSubResources[ subresource ].label();
@@ -985,16 +985,16 @@ ResourceKolab::labelForSubresource( const QString& subresource ) const
return subresource;
}
-void ResourceKolab::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder )
+void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder )
{
TemporarySilencer t( this );
- for( QMap<Q_UINT32, QString>::ConstIterator it = map.begin(); it != map.end(); ++it )
+ for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
addIncidence( type.latin1(), it.data(), folder, it.key() );
}
-bool ResourceKolab::subresourceActive( const QString& subresource ) const
+bool ResourceKolab::subresourceActive( const TQString& subresource ) const
{
// Workaround: The ResourceView in KOrganizer wants to know this
// before it opens the resource :-( Make sure we are open
@@ -1013,7 +1013,7 @@ bool ResourceKolab::subresourceActive( const QString& subresource ) const
return true;
}
-void ResourceKolab::setSubresourceActive( const QString &subresource, bool v )
+void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v )
{
ResourceMap *map = 0;
const char* mimeType = 0;
@@ -1054,7 +1054,7 @@ KABC::Lock* ResourceKolab::lock()
}
-Kolab::ResourceMap* ResourceKolab::subResourceMap( const QString& contentsType )
+Kolab::ResourceMap* ResourceKolab::subResourceMap( const TQString& contentsType )
{
if ( contentsType == kmailCalendarContentsType ) {
return &mEventSubResources;
@@ -1069,10 +1069,10 @@ Kolab::ResourceMap* ResourceKolab::subResourceMap( const QString& contentsType )
/*virtual*/
-bool ResourceKolab::addSubresource( const QString& resource, const QString& parent )
+bool ResourceKolab::addSubresource( const TQString& resource, const TQString& parent )
{
kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl;
- QString contentsType = kmailCalendarContentsType;
+ TQString contentsType = kmailCalendarContentsType;
if ( !parent.isEmpty() ) {
if ( mEventSubResources.contains( parent ) )
contentsType = kmailCalendarContentsType;
@@ -1081,10 +1081,10 @@ bool ResourceKolab::addSubresource( const QString& resource, const QString& pare
else if ( mJournalSubResources.contains( parent ) )
contentsType = kmailJournalContentsType;
} else {
- QStringList contentTypeChoices;
+ TQStringList contentTypeChoices;
contentTypeChoices << i18n("Calendar") << i18n("Tasks") << i18n("Journals");
- const QString caption = i18n("Which kind of subresource should this be?");
- const QString choice = KInputDialog::getItem( caption, QString::null, contentTypeChoices );
+ const TQString caption = i18n("Which kind of subresource should this be?");
+ const TQString choice = KInputDialog::getItem( caption, TQString::null, contentTypeChoices );
if ( choice == contentTypeChoices[0] )
contentsType = kmailCalendarContentsType;
else if ( choice == contentTypeChoices[1] )
@@ -1097,27 +1097,27 @@ bool ResourceKolab::addSubresource( const QString& resource, const QString& pare
}
/*virtual*/
-bool ResourceKolab::removeSubresource( const QString& resource )
+bool ResourceKolab::removeSubresource( const TQString& resource )
{
kdDebug(5650) << "KCal Kolab resource - removing subresource: " << resource << endl;
return kmailRemoveSubresource( resource );
}
/*virtual*/
-QString ResourceKolab::subresourceIdentifier( Incidence *incidence )
+TQString ResourceKolab::subresourceIdentifier( Incidence *incidence )
{
- QString uid = incidence->uid();
+ TQString uid = incidence->uid();
if ( mUidMap.contains( uid ) )
return mUidMap[ uid ].resource();
else
if ( mNewIncidencesMap.contains( uid ) )
return mNewIncidencesMap[ uid ];
else
- return QString();
+ return TQString();
}
-bool ResourceKolab::unloadSubResource( const QString& subResource )
+bool ResourceKolab::unloadSubResource( const TQString& subResource )
{
const bool silent = mSilent;
mSilent = true;
@@ -1139,7 +1139,7 @@ bool ResourceKolab::unloadSubResource( const QString& subResource )
return true;
}
-QString ResourceKolab::subresourceType( const QString &resource )
+TQString ResourceKolab::subresourceType( const TQString &resource )
{
if ( mEventSubResources.contains( resource ) )
return "event";
@@ -1147,7 +1147,7 @@ QString ResourceKolab::subresourceType( const QString &resource )
return "todo";
if ( mJournalSubResources.contains( resource ) )
return "journal";
- return QString();
+ return TQString();
}
#include "resourcekolab.moc"
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index 0974e4ada..e68c2c6bf 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -35,7 +35,7 @@
#ifndef KCAL_RESOURCEKOLAB_H
#define KCAL_RESOURCEKOLAB_H
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kdepimmacros.h>
#include <libkcal/calendarlocal.h>
@@ -72,71 +72,71 @@ public:
// The libkcal functions. See the resource for descriptions
bool addEvent( KCal::Event* anEvent );
bool deleteEvent( KCal::Event* );
- KCal::Event* event( const QString &UniqueStr );
+ KCal::Event* event( const TQString &UniqueStr );
KCal::Event::List rawEvents( EventSortField sortField = EventSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
KCal::Event::List rawEventsForDate(
- const QDate& date,
+ const TQDate& date,
EventSortField sortField=EventSortUnsorted,
SortDirection sortDirection=SortDirectionAscending );
- KCal::Event::List rawEventsForDate( const QDateTime& qdt );
- KCal::Event::List rawEvents( const QDate& start, const QDate& end,
+ KCal::Event::List rawEventsForDate( const TQDateTime& qdt );
+ KCal::Event::List rawEvents( const TQDate& start, const TQDate& end,
bool inclusive = false );
bool addTodo( KCal::Todo* todo );
bool deleteTodo( KCal::Todo* );
- KCal::Todo* todo( const QString& uid );
+ KCal::Todo* todo( const TQString& uid );
KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
- KCal::Todo::List rawTodosForDate( const QDate& date );
+ KCal::Todo::List rawTodosForDate( const TQDate& date );
bool addJournal( KCal::Journal* );
bool deleteJournal( KCal::Journal* );
- KCal::Journal* journal( const QString& uid );
+ KCal::Journal* journal( const TQString& uid );
KCal::Journal::List rawJournals( JournalSortField sortField = JournalSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
- KCal::Journal::List rawJournalsForDate( const QDate &date );
+ KCal::Journal::List rawJournalsForDate( const TQDate &date );
- KCal::Alarm::List alarms( const QDateTime& from, const QDateTime& to );
- KCal::Alarm::List alarmsTo( const QDateTime& to );
+ KCal::Alarm::List alarms( const TQDateTime& from, const TQDateTime& to );
+ KCal::Alarm::List alarmsTo( const TQDateTime& to );
- void setTimeZoneId( const QString& tzid );
+ void setTimeZoneId( const TQString& tzid );
bool deleteIncidence( KCal::Incidence* i );
/// The ResourceKolabBase methods called by KMail
- bool fromKMailAddIncidence( const QString& type, const QString& subResource,
- Q_UINT32 sernum, int format, const QString& data );
- void fromKMailDelIncidence( const QString& type, const QString& subResource,
- const QString& uid );
- void fromKMailRefresh( const QString& type, const QString& subResource );
+ bool fromKMailAddIncidence( const TQString& type, const TQString& subResource,
+ Q_UINT32 sernum, int format, const TQString& data );
+ void fromKMailDelIncidence( const TQString& type, const TQString& subResource,
+ const TQString& uid );
+ void fromKMailRefresh( const TQString& type, const TQString& subResource );
/// Listen to KMail changes in the amount of sub resources
- void fromKMailAddSubresource( const QString& type, const QString& subResource,
- const QString& label, bool writable,
+ void fromKMailAddSubresource( const TQString& type, const TQString& subResource,
+ const TQString& label, bool writable,
bool alarmRelevant );
- void fromKMailDelSubresource( const QString& type, const QString& subResource );
+ void fromKMailDelSubresource( const TQString& type, const TQString& subResource );
- void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder );
+ void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder );
/** Return the list of subresources. */
- QStringList subresources() const;
+ TQStringList subresources() const;
bool canHaveSubresources() const { return true; }
/** Is this subresource active? */
- bool subresourceActive( const QString& ) const;
+ bool subresourceActive( const TQString& ) const;
/** (De)activate the subresource */
- virtual void setSubresourceActive( const QString &, bool );
+ virtual void setSubresourceActive( const TQString &, bool );
/** What is the label for this subresource? */
- virtual const QString labelForSubresource( const QString& resource ) const;
+ virtual const TQString labelForSubresource( const TQString& resource ) const;
- virtual QString subresourceIdentifier( Incidence *incidence );
+ virtual TQString subresourceIdentifier( Incidence *incidence );
- virtual bool addSubresource( const QString& resource, const QString& parent );
- virtual bool removeSubresource( const QString& resource );
+ virtual bool addSubresource( const TQString& resource, const TQString& parent );
+ virtual bool removeSubresource( const TQString& resource );
- virtual QString subresourceType( const QString &resource );
+ virtual TQString subresourceType( const TQString &resource );
KABC::Lock* lock();
@@ -152,19 +152,19 @@ protected:
KCal::Alarm::List relevantAlarms( const KCal::Alarm::List &alarms );
private:
- void removeIncidences( const QCString& incidenceType );
- void resolveConflict( KCal::Incidence*, const QString& subresource, Q_UINT32 sernum );
- void addIncidence( const char* mimetype, const QString& xml,
- const QString& subResource, Q_UINT32 sernum );
+ void removeIncidences( const TQCString& incidenceType );
+ void resolveConflict( KCal::Incidence*, const TQString& subresource, Q_UINT32 sernum );
+ void addIncidence( const char* mimetype, const TQString& xml,
+ const TQString& subResource, Q_UINT32 sernum );
- bool addIncidence( KCal::Incidence* i, const QString& subresource,
+ bool addIncidence( KCal::Incidence* i, const TQString& subresource,
Q_UINT32 sernum );
- void addEvent( const QString& xml, const QString& subresource,
+ void addEvent( const TQString& xml, const TQString& subresource,
Q_UINT32 sernum );
- void addTodo( const QString& xml, const QString& subresource,
+ void addTodo( const TQString& xml, const TQString& subresource,
Q_UINT32 sernum );
- void addJournal( const QString& xml, const QString& subresource,
+ void addJournal( const TQString& xml, const TQString& subresource,
Q_UINT32 sernum );
@@ -180,19 +180,19 @@ private:
bool openResource( KConfig& config, const char* contentType,
Kolab::ResourceMap& map );
- void loadSubResourceConfig( KConfig& config, const QString& name,
- const QString& label, bool writable,
+ void loadSubResourceConfig( KConfig& config, const TQString& name,
+ const TQString& label, bool writable,
bool alarmRelevant, Kolab::ResourceMap& subResource );
- bool loadSubResource( const QString& subResource, const char* mimetype );
- bool unloadSubResource( const QString& subResource );
+ bool loadSubResource( const TQString& subResource, const char* mimetype );
+ bool unloadSubResource( const TQString& subResource );
- QString configFile() const {
+ TQString configFile() const {
return ResourceKolabBase::configFile( "kcal" );
}
- Kolab::ResourceMap* subResourceMap( const QString& contentsType );
+ Kolab::ResourceMap* subResourceMap( const TQString& contentsType );
- bool sendKMailUpdate( KCal::IncidenceBase* incidence, const QString& _subresource,
+ bool sendKMailUpdate( KCal::IncidenceBase* incidence, const TQString& _subresource,
Q_UINT32 sernum );
@@ -202,8 +202,8 @@ private:
Kolab::ResourceMap mEventSubResources, mTodoSubResources, mJournalSubResources;
bool mOpen; // If the resource is open, this is true
- QDict<KCal::IncidenceBase> mPendingUpdates;
- QTimer mResourceChangedTimer;
+ TQDict<KCal::IncidenceBase> mPendingUpdates;
+ TQTimer mResourceChangedTimer;
ICalFormat mFormat;
/**
@@ -213,7 +213,7 @@ private:
We can't trust on mUidMap here, because it contains only non-pending uids.
*/
- QMap<QString, QString> mNewIncidencesMap;
+ TQMap<TQString, TQString> mNewIncidencesMap;
int mProgressDialogIncidenceLimit;
};
diff --git a/kresources/kolab/kcal/resourcekolab_plugin.cpp b/kresources/kolab/kcal/resourcekolab_plugin.cpp
index afc83e1d6..14d09465a 100644
--- a/kresources/kolab/kcal/resourcekolab_plugin.cpp
+++ b/kresources/kolab/kcal/resourcekolab_plugin.cpp
@@ -40,7 +40,7 @@ public:
return new KCal::ResourceKolab( config );
}
- KRES::ConfigWidget *configWidget( QWidget* )
+ KRES::ConfigWidget *configWidget( TQWidget* )
{
return 0;
}
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index b66c9827b..7bbdba978 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -39,8 +39,8 @@
using namespace Kolab;
-KCal::Todo* Task::xmlToTask( const QString& xml, const QString& tz, KCal::ResourceKolab *res,
- const QString& subResource, Q_UINT32 sernum )
+KCal::Todo* Task::xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res,
+ const TQString& subResource, Q_UINT32 sernum )
{
Task task( res, subResource, sernum, tz );
task.load( xml );
@@ -49,14 +49,14 @@ KCal::Todo* Task::xmlToTask( const QString& xml, const QString& tz, KCal::Resour
return todo;
}
-QString Task::taskToXML( KCal::Todo* todo, const QString& tz )
+TQString Task::taskToXML( KCal::Todo* todo, const TQString& tz )
{
- Task task( 0, QString::null, 0, tz, todo );
+ Task task( 0, TQString::null, 0, tz, todo );
return task.saveXML();
}
-Task::Task( KCal::ResourceKolab *res, const QString &subResource, Q_UINT32 sernum,
- const QString& tz, KCal::Todo* task )
+Task::Task( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+ const TQString& tz, KCal::Todo* task )
: Incidence( res, subResource, sernum, tz ),
mPriority( 5 ), mPercentCompleted( 0 ),
mStatus( KCal::Incidence::StatusNone ),
@@ -101,23 +101,23 @@ KCal::Incidence::Status Task::status() const
return mStatus;
}
-void Task::setParent( const QString& parentUid )
+void Task::setParent( const TQString& parentUid )
{
mParent = parentUid;
}
-QString Task::parent() const
+TQString Task::parent() const
{
return mParent;
}
-void Task::setDueDate( const QDateTime& date )
+void Task::setDueDate( const TQDateTime& date )
{
mDueDate = date;
mHasDueDate = true;
}
-QDateTime Task::dueDate() const
+TQDateTime Task::dueDate() const
{
return mDueDate;
}
@@ -137,13 +137,13 @@ bool Task::hasDueDate() const
return mHasDueDate;
}
-void Task::setCompletedDate( const QDateTime& date )
+void Task::setCompletedDate( const TQDateTime& date )
{
mCompletedDate = date;
mHasCompletedDate = true;
}
-QDateTime Task::completedDate() const
+TQDateTime Task::completedDate() const
{
return mCompletedDate;
}
@@ -153,9 +153,9 @@ bool Task::hasCompletedDate() const
return mHasCompletedDate;
}
-bool Task::loadAttribute( QDomElement& element )
+bool Task::loadAttribute( TQDomElement& element )
{
- QString tagName = element.tagName();
+ TQString tagName = element.tagName();
if ( tagName == "priority" ) {
bool ok;
@@ -198,13 +198,13 @@ bool Task::loadAttribute( QDomElement& element )
return true;
}
-bool Task::saveAttributes( QDomElement& element ) const
+bool Task::saveAttributes( TQDomElement& element ) const
{
// Save the base class elements
Incidence::saveAttributes( element );
- writeString( element, "priority", QString::number( priority() ) );
- writeString( element, "completed", QString::number( percentCompleted() ) );
+ writeString( element, "priority", TQString::number( priority() ) );
+ writeString( element, "completed", TQString::number( percentCompleted() ) );
switch( status() ) {
case KCal::Incidence::StatusInProcess:
@@ -245,9 +245,9 @@ bool Task::saveAttributes( QDomElement& element ) const
}
-bool Task::loadXML( const QDomDocument& document )
+bool Task::loadXML( const TQDomDocument& document )
{
- QDomElement top = document.documentElement();
+ TQDomElement top = document.documentElement();
if ( top.tagName() != "task" ) {
qWarning( "XML error: Top tag was %s instead of the expected task",
@@ -256,11 +256,11 @@ bool Task::loadXML( const QDomDocument& document )
}
setHasStartDate( false ); // todo's don't necessarily have one
- for ( QDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if ( !loadAttribute( e ) )
// TODO: Unhandled tag - save for later storage
kdDebug() << "Warning: Unhandled tag " << e.tagName() << endl;
@@ -272,17 +272,17 @@ bool Task::loadXML( const QDomDocument& document )
return true;
}
-QString Task::saveXML() const
+TQString Task::saveXML() const
{
- QDomDocument document = domTree();
- QDomElement element = document.createElement( "task" );
+ TQDomDocument document = domTree();
+ TQDomElement element = document.createElement( "task" );
element.setAttribute( "version", "1.0" );
saveAttributes( element );
if ( !hasStartDate() ) {
// events and journals always have a start date, but tasks don't.
// Remove the entry done by the inherited save above, because we
// don't have one.
- QDomNodeList l = element.elementsByTagName( "start-date" );
+ TQDomNodeList l = element.elementsByTagName( "start-date" );
Q_ASSERT( l.count() == 1 );
element.removeChild( l.item( 0 ) );
}
@@ -308,7 +308,7 @@ void Task::setFields( const KCal::Todo* task )
else if ( !task->relatedToUid().isEmpty() )
setParent( task->relatedToUid() );
else
- setParent( QString::null );
+ setParent( TQString::null );
if ( task->hasCompletedDate() && task->percentComplete() == 100 )
setCompletedDate( localToUTC( task->completed() ) );
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index 96bcafd96..32095bcab 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -57,17 +57,17 @@ class Task : public Incidence {
public:
/// Use this to parse an xml string to a task entry
/// The caller is responsible for deleting the returned task
- static KCal::Todo* xmlToTask( const QString& xml, const QString& tz, KCal::ResourceKolab *res = 0,
- const QString& subResource = QString::null, Q_UINT32 sernum = 0 );
+ static KCal::Todo* xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res = 0,
+ const TQString& subResource = TQString::null, Q_UINT32 sernum = 0 );
/// Use this to get an xml string describing this task entry
- static QString taskToXML( KCal::Todo*, const QString& tz );
+ static TQString taskToXML( KCal::Todo*, const TQString& tz );
- explicit Task( KCal::ResourceKolab *res, const QString& subResource, Q_UINT32 sernum,
- const QString& tz, KCal::Todo* todo = 0 );
+ explicit Task( KCal::ResourceKolab *res, const TQString& subResource, Q_UINT32 sernum,
+ const TQString& tz, KCal::Todo* todo = 0 );
virtual ~Task();
- virtual QString type() const { return "Task"; }
+ virtual TQString type() const { return "Task"; }
void saveTo( KCal::Todo* todo );
@@ -80,31 +80,31 @@ public:
virtual void setStatus( KCal::Incidence::Status status );
virtual KCal::Incidence::Status status() const;
- virtual void setParent( const QString& parentUid );
- virtual QString parent() const;
+ virtual void setParent( const TQString& parentUid );
+ virtual TQString parent() const;
virtual void setHasStartDate( bool );
virtual bool hasStartDate() const;
- virtual void setDueDate( const QDateTime& date );
- virtual QDateTime dueDate() const;
+ virtual void setDueDate( const TQDateTime& date );
+ virtual TQDateTime dueDate() const;
virtual bool hasDueDate() const;
- virtual void setCompletedDate( const QDateTime& date );
- virtual QDateTime completedDate() const;
+ virtual void setCompletedDate( const TQDateTime& date );
+ virtual TQDateTime completedDate() const;
virtual bool hasCompletedDate() const;
// Load the attributes of this class
- virtual bool loadAttribute( QDomElement& );
+ virtual bool loadAttribute( TQDomElement& );
// Save the attributes of this class
- virtual bool saveAttributes( QDomElement& ) const;
+ virtual bool saveAttributes( TQDomElement& ) const;
// Load this task by reading the XML file
- virtual bool loadXML( const QDomDocument& xml );
+ virtual bool loadXML( const TQDomDocument& xml );
// Serialize this task to an XML string
- virtual QString saveXML() const;
+ virtual TQString saveXML() const;
protected:
// Read all known fields from this ical todo
@@ -113,15 +113,15 @@ protected:
int mPriority;
int mPercentCompleted;
KCal::Incidence::Status mStatus;
- QString mParent;
+ TQString mParent;
bool mHasStartDate;
bool mHasDueDate;
- QDateTime mDueDate;
+ TQDateTime mDueDate;
bool mHasCompletedDate;
- QDateTime mCompletedDate;
+ TQDateTime mCompletedDate;
};
}
diff --git a/kresources/kolab/knotes/note.cpp b/kresources/kolab/knotes/note.cpp
index 76ecdd9db..66556aaf8 100644
--- a/kresources/kolab/knotes/note.cpp
+++ b/kresources/kolab/knotes/note.cpp
@@ -40,7 +40,7 @@
using namespace Kolab;
-KCal::Journal* Note::xmlToJournal( const QString& xml )
+KCal::Journal* Note::xmlToJournal( const TQString& xml )
{
Note note;
note.load( xml );
@@ -49,7 +49,7 @@ KCal::Journal* Note::xmlToJournal( const QString& xml )
return journal;
}
-QString Note::journalToXML( KCal::Journal* journal )
+TQString Note::journalToXML( KCal::Journal* journal )
{
Note note( journal );
return note.saveXML();
@@ -65,32 +65,32 @@ Note::~Note()
{
}
-void Note::setSummary( const QString& summary )
+void Note::setSummary( const TQString& summary )
{
mSummary = summary;
}
-QString Note::summary() const
+TQString Note::summary() const
{
return mSummary;
}
-void Note::setBackgroundColor( const QColor& bgColor )
+void Note::setBackgroundColor( const TQColor& bgColor )
{
mBackgroundColor = bgColor;
}
-QColor Note::backgroundColor() const
+TQColor Note::backgroundColor() const
{
return mBackgroundColor;
}
-void Note::setForegroundColor( const QColor& fgColor )
+void Note::setForegroundColor( const TQColor& fgColor )
{
mForegroundColor = fgColor;
}
-QColor Note::foregroundColor() const
+TQColor Note::foregroundColor() const
{
return mForegroundColor;
}
@@ -105,9 +105,9 @@ bool Note::richText() const
return mRichText;
}
-bool Note::loadAttribute( QDomElement& element )
+bool Note::loadAttribute( TQDomElement& element )
{
- QString tagName = element.tagName();
+ TQString tagName = element.tagName();
if ( tagName == "summary" )
setSummary( element.text() );
@@ -124,14 +124,14 @@ bool Note::loadAttribute( QDomElement& element )
return true;
}
-bool Note::saveAttributes( QDomElement& element ) const
+bool Note::saveAttributes( TQDomElement& element ) const
{
// Save the base class elements
KolabBase::saveAttributes( element );
// Save the elements
#if 0
- QDomComment c = element.ownerDocument().createComment( "Note specific attributes" );
+ TQDomComment c = element.ownerDocument().createComment( "Note specific attributes" );
element.appendChild( c );
#endif
@@ -144,9 +144,9 @@ bool Note::saveAttributes( QDomElement& element ) const
}
-bool Note::loadXML( const QDomDocument& document )
+bool Note::loadXML( const TQDomDocument& document )
{
- QDomElement top = document.documentElement();
+ TQDomElement top = document.documentElement();
if ( top.tagName() != "note" ) {
qWarning( "XML error: Top tag was %s instead of the expected note",
@@ -154,11 +154,11 @@ bool Note::loadXML( const QDomDocument& document )
return false;
}
- for ( QDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if ( !loadAttribute( e ) )
// TODO: Unhandled tag - save for later storage
kdDebug() << "Warning: Unhandled tag " << e.tagName() << endl;
@@ -169,10 +169,10 @@ bool Note::loadXML( const QDomDocument& document )
return true;
}
-QString Note::saveXML() const
+TQString Note::saveXML() const
{
- QDomDocument document = domTree();
- QDomElement element = document.createElement( "note" );
+ TQDomDocument document = domTree();
+ TQDomElement element = document.createElement( "note" );
element.setAttribute( "version", "1.0" );
saveAttributes( element );
document.appendChild( element );
@@ -204,7 +204,7 @@ void Note::saveTo( KCal::Journal* journal )
richText() ? "true" : "false" );
}
-QString Note::productID() const
+TQString Note::productID() const
{
- return QString( "KNotes %1, Kolab resource" ).arg( KNOTES_VERSION );
+ return TQString( "KNotes %1, Kolab resource" ).arg( KNOTES_VERSION );
}
diff --git a/kresources/kolab/knotes/note.h b/kresources/kolab/knotes/note.h
index 45769f97b..7a1c42407 100644
--- a/kresources/kolab/knotes/note.h
+++ b/kresources/kolab/knotes/note.h
@@ -54,10 +54,10 @@ class Note : public KolabBase {
public:
/// Use this to parse an xml string to a journal entry
/// The caller is responsible for deleting the returned journal
- static KCal::Journal* xmlToJournal( const QString& xml );
+ static KCal::Journal* xmlToJournal( const TQString& xml );
/// Use this to get an xml string describing this journal entry
- static QString journalToXML( KCal::Journal* );
+ static TQString journalToXML( KCal::Journal* );
/// Create a note object and
explicit Note( KCal::Journal* journal = 0 );
@@ -65,31 +65,31 @@ public:
void saveTo( KCal::Journal* journal );
- virtual QString type() const { return "Note"; }
+ virtual TQString type() const { return "Note"; }
- virtual void setSummary( const QString& summary );
- virtual QString summary() const;
+ virtual void setSummary( const TQString& summary );
+ virtual TQString summary() const;
- virtual void setBackgroundColor( const QColor& bgColor );
- virtual QColor backgroundColor() const;
+ virtual void setBackgroundColor( const TQColor& bgColor );
+ virtual TQColor backgroundColor() const;
- virtual void setForegroundColor( const QColor& fgColor );
- virtual QColor foregroundColor() const;
+ virtual void setForegroundColor( const TQColor& fgColor );
+ virtual TQColor foregroundColor() const;
virtual void setRichText( bool richText );
virtual bool richText() const;
// Load the attributes of this class
- virtual bool loadAttribute( QDomElement& );
+ virtual bool loadAttribute( TQDomElement& );
// Save the attributes of this class
- virtual bool saveAttributes( QDomElement& ) const;
+ virtual bool saveAttributes( TQDomElement& ) const;
// Load this note by reading the XML file
- virtual bool loadXML( const QDomDocument& xml );
+ virtual bool loadXML( const TQDomDocument& xml );
// Serialize this note to an XML string
- virtual QString saveXML() const;
+ virtual TQString saveXML() const;
protected:
// Read all known fields from this ical incidence
@@ -98,11 +98,11 @@ protected:
// Save all known fields into this ical incidence
void saveTo( KCal::Incidence* ) const;
- QString productID() const;
+ TQString productID() const;
- QString mSummary;
- QColor mBackgroundColor;
- QColor mForegroundColor;
+ TQString mSummary;
+ TQColor mBackgroundColor;
+ TQColor mForegroundColor;
bool mRichText;
};
diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp
index b5cad153a..1d633b62a 100644
--- a/kresources/kolab/knotes/resourcekolab.cpp
+++ b/kresources/kolab/knotes/resourcekolab.cpp
@@ -51,7 +51,7 @@ static const char* inlineMimeType = "text/calendar";
ResourceKolab::ResourceKolab( const KConfig *config )
: ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ),
- mCalendar( QString::fromLatin1("UTC") )
+ mCalendar( TQString::fromLatin1("UTC") )
{
setType( "imap" );
}
@@ -66,15 +66,15 @@ bool ResourceKolab::doOpen()
config.setGroup( configGroupName );
// Get the list of Notes folders from KMail
- QValueList<KMailICalIface::SubResource> subResources;
+ TQValueList<KMailICalIface::SubResource> subResources;
if ( !kmailSubresources( subResources, kmailContentsType ) )
return false;
// Make the resource map from the folder list
- QValueList<KMailICalIface::SubResource>::ConstIterator it;
+ TQValueList<KMailICalIface::SubResource>::ConstIterator it;
mSubResources.clear();
for ( it = subResources.begin(); it != subResources.end(); ++it ) {
- const QString subResource = (*it).location;
+ const TQString subResource = (*it).location;
const bool active = config.readBoolEntry( subResource, true );
mSubResources[ subResource ] = Kolab::SubResource( active, (*it).writable, (*it).label );
}
@@ -91,8 +91,8 @@ void ResourceKolab::doClose()
config.writeEntry( it.key(), it.data().active() );
}
-bool ResourceKolab::loadSubResource( const QString& subResource,
- const QString &mimetype )
+bool ResourceKolab::loadSubResource( const TQString& subResource,
+ const TQString &mimetype )
{
// Get the list of journals
int count = 0;
@@ -101,7 +101,7 @@ bool ResourceKolab::loadSubResource( const QString& subResource,
return false;
}
- QMap<Q_UINT32, QString> lst;
+ TQMap<Q_UINT32, TQString> lst;
if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) {
kdError(5500) << "Communication problem in "
<< "ResourceKolab::getIncidenceList()\n";
@@ -113,7 +113,7 @@ bool ResourceKolab::loadSubResource( const QString& subResource,
// Populate with the new entries
const bool silent = mSilent;
mSilent = true;
- QMap<Q_UINT32, QString>::Iterator it;
+ TQMap<Q_UINT32, TQString>::Iterator it;
for ( it = lst.begin(); it != lst.end(); ++it ) {
KCal::Journal* journal = addNote( it.data(), subResource, it.key(), mimetype );
if ( !journal )
@@ -139,7 +139,7 @@ bool ResourceKolab::load()
// This subResource is disabled
continue;
- QString mimetype = inlineMimeType;
+ TQString mimetype = inlineMimeType;
rc &= loadSubResource( itR.key(), mimetype );
mimetype = attachmentMimeType;
rc &= loadSubResource( itR.key(), mimetype );
@@ -156,11 +156,11 @@ bool ResourceKolab::save()
bool ResourceKolab::addNote( KCal::Journal* journal )
{
- return addNote( journal, QString::null, 0 );
+ return addNote( journal, TQString::null, 0 );
}
-KCal::Journal* ResourceKolab::addNote( const QString& data, const QString& subresource,
- Q_UINT32 sernum, const QString &mimetype )
+KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& subresource,
+ Q_UINT32 sernum, const TQString &mimetype )
{
KCal::Journal* journal = 0;
// FIXME: This does not take into account the time zone!
@@ -180,7 +180,7 @@ KCal::Journal* ResourceKolab::addNote( const QString& data, const QString& subre
}
bool ResourceKolab::addNote( KCal::Journal* journal,
- const QString& subresource, Q_UINT32 sernum )
+ const TQString& subresource, Q_UINT32 sernum )
{
kdDebug(5500) << "ResourceKolab::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n";
@@ -190,13 +190,13 @@ bool ResourceKolab::addNote( KCal::Journal* journal,
bool newNote = subresource.isEmpty();
mCalendar.addJournal( journal );
- QString resource =
+ TQString resource =
newNote ? findWritableResource( mSubResources ) : subresource;
if ( resource.isEmpty() ) // canceled
return false;
if ( !mSilent ) {
- QString xml = Note::journalToXML( journal );
+ TQString xml = Note::journalToXML( journal );
kdDebug(5500) << k_funcinfo << "XML string:\n" << xml << endl;
if( !kmailUpdate( resource, sernum, xml, attachmentMimeType, journal->uid() ) ) {
@@ -215,7 +215,7 @@ bool ResourceKolab::addNote( KCal::Journal* journal,
bool ResourceKolab::deleteNote( KCal::Journal* journal )
{
- const QString uid = journal->uid();
+ const TQString uid = journal->uid();
if ( !mUidMap.contains( uid ) )
// Odd
return false;
@@ -230,20 +230,20 @@ bool ResourceKolab::deleteNote( KCal::Journal* journal )
return true;
}
-KCal::Alarm::List ResourceKolab::alarms( const QDateTime& from, const QDateTime& to )
+KCal::Alarm::List ResourceKolab::alarms( const TQDateTime& from, const TQDateTime& to )
{
KCal::Alarm::List alarms;
KCal::Journal::List notes = mCalendar.journals();
KCal::Journal::List::ConstIterator note;
for ( note = notes.begin(); note != notes.end(); ++note )
{
- QDateTime preTime = from.addSecs( -1 );
+ TQDateTime preTime = from.addSecs( -1 );
KCal::Alarm::List::ConstIterator it;
for( it = (*note)->alarms().begin(); it != (*note)->alarms().end(); ++it )
{
if ( (*it)->enabled() )
{
- QDateTime dt = (*it)->nextRepetition( preTime );
+ TQDateTime dt = (*it)->nextRepetition( preTime );
if ( dt.isValid() && dt <= to )
alarms.append( *it );
}
@@ -255,7 +255,7 @@ KCal::Alarm::List ResourceKolab::alarms( const QDateTime& from, const QDateTime&
void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i )
{
- QString subResource;
+ TQString subResource;
Q_UINT32 sernum;
if ( mUidMap.contains( i->uid() ) ) {
subResource = mUidMap[ i->uid() ].resource();
@@ -268,7 +268,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i )
}
KCal::Journal* journal = dynamic_cast<KCal::Journal*>( i );
- QString xml = Note::journalToXML( journal );
+ TQString xml = Note::journalToXML( journal );
if( !xml.isEmpty() && kmailUpdate( subResource, sernum, xml, attachmentMimeType, journal->uid() ) )
mUidMap[ i->uid() ] = StorageReference( subResource, sernum );
}
@@ -277,18 +277,18 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i )
* These are the DCOP slots that KMail call to notify when something
* changed.
*/
-bool ResourceKolab::fromKMailAddIncidence( const QString& type,
- const QString& subResource,
+bool ResourceKolab::fromKMailAddIncidence( const TQString& type,
+ const TQString& subResource,
Q_UINT32 sernum,
int format,
- const QString& note )
+ const TQString& note )
{
// Check if this is a note
if( type != kmailContentsType ) return false;
const bool silent = mSilent;
mSilent = true;
- QString mimetype;
+ TQString mimetype;
if ( format == KMailICalIface::StorageXML )
mimetype = attachmentMimeType;
else
@@ -300,9 +300,9 @@ bool ResourceKolab::fromKMailAddIncidence( const QString& type,
return true;
}
-void ResourceKolab::fromKMailDelIncidence( const QString& type,
- const QString& /*subResource*/,
- const QString& uid )
+void ResourceKolab::fromKMailDelIncidence( const TQString& type,
+ const TQString& /*subResource*/,
+ const TQString& uid )
{
// Check if this is a note
if( type != kmailContentsType ) return;
@@ -318,16 +318,16 @@ void ResourceKolab::fromKMailDelIncidence( const QString& type,
mSilent = silent;
}
-void ResourceKolab::fromKMailRefresh( const QString& type,
- const QString& /*subResource*/ )
+void ResourceKolab::fromKMailRefresh( const TQString& type,
+ const TQString& /*subResource*/ )
{
if ( type == kmailContentsType )
load(); // ### should call loadSubResource(subResource) probably
}
-void ResourceKolab::fromKMailAddSubresource( const QString& type,
- const QString& subResource,
- const QString& /*label*/,
+void ResourceKolab::fromKMailAddSubresource( const TQString& type,
+ const TQString& subResource,
+ const TQString& /*label*/,
bool writable,
bool /*alarmRelevant*/ )
{
@@ -348,8 +348,8 @@ void ResourceKolab::fromKMailAddSubresource( const QString& type,
emit signalSubresourceAdded( this, type, subResource );
}
-void ResourceKolab::fromKMailDelSubresource( const QString& type,
- const QString& subResource )
+void ResourceKolab::fromKMailDelSubresource( const TQString& type,
+ const TQString& subResource )
{
if ( type != configGroupName )
// Not ours
@@ -369,7 +369,7 @@ void ResourceKolab::fromKMailDelSubresource( const QString& type,
// Make a list of all uids to remove
Kolab::UidMap::ConstIterator mapIt;
- QStringList uids;
+ TQStringList uids;
for ( mapIt = mUidMap.begin(); mapIt != mUidMap.end(); ++mapIt )
if ( mapIt.data().resource() == subResource )
// We have a match
@@ -379,7 +379,7 @@ void ResourceKolab::fromKMailDelSubresource( const QString& type,
if ( !uids.isEmpty() ) {
const bool silent = mSilent;
mSilent = true;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for ( it = uids.begin(); it != uids.end(); ++it ) {
KCal::Journal* j = mCalendar.journal( *it );
if( j )
@@ -391,21 +391,21 @@ void ResourceKolab::fromKMailDelSubresource( const QString& type,
emit signalSubresourceRemoved( this, type, subResource );
}
-void ResourceKolab::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder )
+void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder )
{
// We are only interested in notes
if ( ( type != attachmentMimeType ) && ( type != inlineMimeType ) ) return;
// Populate with the new entries
const bool silent = mSilent;
mSilent = true;
- QString mimetype;
+ TQString mimetype;
if ( kmailStorageFormat( folder ) == KMailICalIface::StorageXML )
mimetype = attachmentMimeType;
else
mimetype = inlineMimeType;
- for( QMap<Q_UINT32, QString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+ for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
KCal::Journal* journal = addNote( it.data(), folder, it.key(), mimetype );
if ( !journal )
kdDebug(5500) << "loading note " << it.key() << " failed" << endl;
@@ -416,12 +416,12 @@ void ResourceKolab::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map
}
-QStringList ResourceKolab::subresources() const
+TQStringList ResourceKolab::subresources() const
{
return mSubResources.keys();
}
-bool ResourceKolab::subresourceActive( const QString& res ) const
+bool ResourceKolab::subresourceActive( const TQString& res ) const
{
if ( mSubResources.contains( res ) ) {
return mSubResources[ res ].active();
diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h
index 44ce480b7..a738a30a5 100644
--- a/kresources/kolab/knotes/resourcekolab.h
+++ b/kresources/kolab/knotes/resourcekolab.h
@@ -74,47 +74,47 @@ public:
bool deleteNote( KCal::Journal* );
- KCal::Alarm::List alarms( const QDateTime& from, const QDateTime& to );
+ KCal::Alarm::List alarms( const TQDateTime& from, const TQDateTime& to );
/// Reimplemented from IncidenceBase::Observer to know when a note was changed
void incidenceUpdated( KCal::IncidenceBase* );
/// The ResourceKolabBase methods called by KMail
- bool fromKMailAddIncidence( const QString& type, const QString& resource,
- Q_UINT32 sernum, int format, const QString& note );
- void fromKMailDelIncidence( const QString& type, const QString& resource,
- const QString& uid );
- void fromKMailRefresh( const QString& type, const QString& resource );
+ bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
+ Q_UINT32 sernum, int format, const TQString& note );
+ void fromKMailDelIncidence( const TQString& type, const TQString& resource,
+ const TQString& uid );
+ void fromKMailRefresh( const TQString& type, const TQString& resource );
/// Listen to KMail changes in the amount of sub resources
- void fromKMailAddSubresource( const QString& type, const QString& resource,
- const QString& label, bool writable,
+ void fromKMailAddSubresource( const TQString& type, const TQString& resource,
+ const TQString& label, bool writable,
bool alarmRelevant );
- void fromKMailDelSubresource( const QString& type, const QString& resource );
+ void fromKMailDelSubresource( const TQString& type, const TQString& resource );
- void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder );
+ void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder );
/** Return the list of subresources. */
- QStringList subresources() const;
+ TQStringList subresources() const;
/** Is this subresource active? */
- bool subresourceActive( const QString& ) const;
+ bool subresourceActive( const TQString& ) const;
signals:
- void signalSubresourceAdded( Resource*, const QString&, const QString& );
- void signalSubresourceRemoved( Resource*, const QString&, const QString& );
+ void signalSubresourceAdded( Resource*, const TQString&, const TQString& );
+ void signalSubresourceRemoved( Resource*, const TQString&, const TQString& );
private:
- bool addNote( KCal::Journal* journal, const QString& resource,
+ bool addNote( KCal::Journal* journal, const TQString& resource,
Q_UINT32 sernum );
- KCal::Journal* addNote( const QString& data, const QString& subresource,
- Q_UINT32 sernum, const QString &mimetype );
+ KCal::Journal* addNote( const TQString& data, const TQString& subresource,
+ Q_UINT32 sernum, const TQString &mimetype );
- bool loadSubResource( const QString& resource, const QString& mimetype );
+ bool loadSubResource( const TQString& resource, const TQString& mimetype );
- QString configFile() const {
+ TQString configFile() const {
return ResourceKolabBase::configFile( "knotes" );
}
diff --git a/kresources/kolab/knotes/resourcekolab_plugin.cpp b/kresources/kolab/knotes/resourcekolab_plugin.cpp
index cd97ecf6c..772184982 100644
--- a/kresources/kolab/knotes/resourcekolab_plugin.cpp
+++ b/kresources/kolab/knotes/resourcekolab_plugin.cpp
@@ -40,7 +40,7 @@ public:
return new Kolab::ResourceKolab( config );
}
- KRES::ConfigWidget *configWidget( QWidget* )
+ KRES::ConfigWidget *configWidget( TQWidget* )
{
return 0;
}
diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp
index 6db9f3dab..9135e16db 100644
--- a/kresources/kolab/shared/kmailconnection.cpp
+++ b/kresources/kolab/shared/kmailconnection.cpp
@@ -47,7 +47,7 @@ using namespace Kolab;
KMailConnection::KMailConnection( ResourceKolabBase* resource,
- const QCString& objId )
+ const TQCString& objId )
: DCOPObject( objId ), mResource( resource ), mKMailIcalIfaceStub( 0 )
{
// Make the connection to KMail ready
@@ -56,8 +56,8 @@ KMailConnection::KMailConnection( ResourceKolabBase* resource,
mDCOPClient->registerAs( objId, true );
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& ) ),
- this, SLOT( unregisteredFromDCOP( const QCString& ) ) );
+ connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
}
KMailConnection::~KMailConnection()
@@ -69,15 +69,15 @@ KMailConnection::~KMailConnection()
mDCOPClient = 0;
}
-static const QCString dcopObjectId = "KMailICalIface";
+static const TQCString dcopObjectId = "KMailICalIface";
bool KMailConnection::connectToKMail()
{
if ( !mKMailIcalIfaceStub ) {
- QString error;
- QCString dcopService;
+ TQString error;
+ TQCString dcopService;
int result = KDCOPServiceStarter::self()->
- findServiceFor( "DCOP/ResourceBackend/IMAP", QString::null,
- QString::null, &error, &dcopService );
+ findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
+ TQString::null, &error, &dcopService );
if ( result != 0 ) {
kdError(5650) << "Couldn't connect to the IMAP resource backend\n";
// TODO: You might want to show "error" (if not empty) here,
@@ -89,34 +89,34 @@ bool KMailConnection::connectToKMail()
dcopService, dcopObjectId );
// Attach to the KMail signals
- if ( !connectKMailSignal( "incidenceAdded(QString,QString,Q_UINT32,int,QString)",
- "fromKMailAddIncidence(QString,QString,Q_UINT32,int,QString)" ) )
+ if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,Q_UINT32,int,TQString)",
+ "fromKMailAddIncidence(TQString,TQString,Q_UINT32,int,TQString)" ) )
kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
- if ( !connectKMailSignal( "incidenceDeleted(QString,QString,QString)",
- "fromKMailDelIncidence(QString,QString,QString)" ) )
+ if ( !connectKMailSignal( "incidenceDeleted(TQString,TQString,TQString)",
+ "fromKMailDelIncidence(TQString,TQString,TQString)" ) )
kdError(5650) << "DCOP connection to incidenceDeleted failed" << endl;
- if ( !connectKMailSignal( "signalRefresh(QString,QString)",
- "fromKMailRefresh(QString,QString)" ) )
+ if ( !connectKMailSignal( "signalRefresh(TQString,TQString)",
+ "fromKMailRefresh(TQString,TQString)" ) )
kdError(5650) << "DCOP connection to signalRefresh failed" << endl;
- if ( !connectKMailSignal( "subresourceAdded( QString, QString, QString, bool, bool )",
- "fromKMailAddSubresource( QString, QString, QString, bool, bool )" ) )
+ if ( !connectKMailSignal( "subresourceAdded( TQString, TQString, TQString, bool, bool )",
+ "fromKMailAddSubresource( TQString, TQString, TQString, bool, bool )" ) )
kdError(5650) << "DCOP connection to subresourceAdded failed" << endl;
- if ( !connectKMailSignal( "subresourceDeleted(QString,QString)",
- "fromKMailDelSubresource(QString,QString)" ) )
+ if ( !connectKMailSignal( "subresourceDeleted(TQString,TQString)",
+ "fromKMailDelSubresource(TQString,TQString)" ) )
kdError(5650) << "DCOP connection to subresourceDeleted failed" << endl;
- if ( !connectKMailSignal( "asyncLoadResult(QMap<Q_UINT32, QString>, QString, QString)",
- "fromKMailAsyncLoadResult(QMap<Q_UINT32, QString>, QString, QString)" ) )
+ if ( !connectKMailSignal( "asyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)",
+ "fromKMailAsyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)" ) )
kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl;
}
return ( mKMailIcalIfaceStub != 0 );
}
-bool KMailConnection::fromKMailAddIncidence( const QString& type,
- const QString& folder,
+bool KMailConnection::fromKMailAddIncidence( const TQString& type,
+ const TQString& folder,
Q_UINT32 sernum,
int format,
- const QString& data )
+ const TQString& data )
{
if ( format != KMailICalIface::StorageXML
&& format != KMailICalIface::StorageIcalVcard )
@@ -126,25 +126,25 @@ bool KMailConnection::fromKMailAddIncidence( const QString& type,
return mResource->fromKMailAddIncidence( type, folder, sernum, format, data );
}
-void KMailConnection::fromKMailDelIncidence( const QString& type,
- const QString& folder,
- const QString& xml )
+void KMailConnection::fromKMailDelIncidence( const TQString& type,
+ const TQString& folder,
+ const TQString& xml )
{
// kdDebug(5650) << "KMailConnection::fromKMailDelIncidence( " << type << ", "
// << folder << ", " << uid << " )\n";
mResource->fromKMailDelIncidence( type, folder, xml );
}
-void KMailConnection::fromKMailRefresh( const QString& type, const QString& folder )
+void KMailConnection::fromKMailRefresh( const TQString& type, const TQString& folder )
{
// kdDebug(5650) << "KMailConnection::fromKMailRefresh( " << type << ", "
// << folder << " )\n";
mResource->fromKMailRefresh( type, folder );
}
-void KMailConnection::fromKMailAddSubresource( const QString& type,
- const QString& resource,
- const QString& label,
+void KMailConnection::fromKMailAddSubresource( const TQString& type,
+ const TQString& resource,
+ const TQString& label,
bool writable,
bool alarmRelevant )
{
@@ -154,30 +154,30 @@ void KMailConnection::fromKMailAddSubresource( const QString& type,
writable, alarmRelevant );
}
-void KMailConnection::fromKMailDelSubresource( const QString& type,
- const QString& resource )
+void KMailConnection::fromKMailDelSubresource( const TQString& type,
+ const TQString& resource )
{
// kdDebug(5650) << "KMailConnection::fromKMailDelSubresource( " << type << ", "
// << resource << " )\n";
mResource->fromKMailDelSubresource( type, resource );
}
-void KMailConnection::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder )
+void KMailConnection::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder )
{
mResource->fromKMailAsyncLoadResult( map, type, folder );
}
-bool KMailConnection::connectKMailSignal( const QCString& signal,
- const QCString& method )
+bool KMailConnection::connectKMailSignal( const TQCString& signal,
+ const TQCString& method )
{
return connectDCOPSignal( "kmail", dcopObjectId, signal, method, false )
&& connectDCOPSignal( "kontact", dcopObjectId, signal, method, false );
}
-bool KMailConnection::kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
- const QString& contentsType )
+bool KMailConnection::kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+ const TQString& contentsType )
{
if ( !connectToKMail() )
return false;
@@ -187,8 +187,8 @@ bool KMailConnection::kmailSubresources( QValueList<KMailICalIface::SubResource>
}
bool KMailConnection::kmailIncidencesCount( int& count,
- const QString& mimetype,
- const QString& resource )
+ const TQString& mimetype,
+ const TQString& resource )
{
if ( !connectToKMail() )
return false;
@@ -197,9 +197,9 @@ bool KMailConnection::kmailIncidencesCount( int& count,
return mKMailIcalIfaceStub->ok();
}
-bool KMailConnection::kmailIncidences( QMap<Q_UINT32, QString>& lst,
- const QString& mimetype,
- const QString& resource,
+bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+ const TQString& mimetype,
+ const TQString& resource,
int startIndex,
int nbMessages )
{
@@ -212,9 +212,9 @@ bool KMailConnection::kmailIncidences( QMap<Q_UINT32, QString>& lst,
bool KMailConnection::kmailGetAttachment( KURL& url,
- const QString& resource,
+ const TQString& resource,
Q_UINT32 sernum,
- const QString& filename )
+ const TQString& filename )
{
if ( !connectToKMail() )
return false;
@@ -223,10 +223,10 @@ bool KMailConnection::kmailGetAttachment( KURL& url,
return mKMailIcalIfaceStub->ok();
}
-bool KMailConnection::kmailAttachmentMimetype( QString & mimeType,
- const QString & resource,
+bool KMailConnection::kmailAttachmentMimetype( TQString & mimeType,
+ const TQString & resource,
Q_UINT32 sernum,
- const QString & filename )
+ const TQString & filename )
{
if ( !connectToKMail() )
return false;
@@ -234,8 +234,8 @@ bool KMailConnection::kmailAttachmentMimetype( QString & mimeType,
return mKMailIcalIfaceStub->ok();
}
-bool KMailConnection::kmailListAttachments(QStringList &list,
- const QString & resource, Q_UINT32 sernum)
+bool KMailConnection::kmailListAttachments(TQStringList &list,
+ const TQString & resource, Q_UINT32 sernum)
{
if ( !connectToKMail() )
return false;
@@ -244,7 +244,7 @@ bool KMailConnection::kmailListAttachments(QStringList &list,
return mKMailIcalIfaceStub->ok();
}
-bool KMailConnection::kmailDeleteIncidence( const QString& resource,
+bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
Q_UINT32 sernum )
{
return connectToKMail()
@@ -252,15 +252,15 @@ bool KMailConnection::kmailDeleteIncidence( const QString& resource,
&& mKMailIcalIfaceStub->ok();
}
-bool KMailConnection::kmailUpdate( const QString& resource,
+bool KMailConnection::kmailUpdate( const TQString& resource,
Q_UINT32& sernum,
- const QString& subject,
- const QString& plainTextBody,
- const QMap<QCString, QString>& customHeaders,
- const QStringList& attachmentURLs,
- const QStringList& attachmentMimetypes,
- const QStringList& attachmentNames,
- const QStringList& deletedAttachments )
+ const TQString& subject,
+ const TQString& plainTextBody,
+ const TQMap<TQCString, TQString>& customHeaders,
+ const TQStringList& attachmentURLs,
+ const TQStringList& attachmentMimetypes,
+ const TQStringList& attachmentNames,
+ const TQStringList& deletedAttachments )
{
//kdDebug(5006) << kdBacktrace() << endl;
if ( connectToKMail() ) {
@@ -272,16 +272,16 @@ bool KMailConnection::kmailUpdate( const QString& resource,
return false;
}
-bool KMailConnection::kmailAddSubresource( const QString& resource,
- const QString& parent,
- const QString& contentsType )
+bool KMailConnection::kmailAddSubresource( const TQString& resource,
+ const TQString& parent,
+ const TQString& contentsType )
{
return connectToKMail()
&& mKMailIcalIfaceStub->addSubresource( resource, parent, contentsType )
&& mKMailIcalIfaceStub->ok();
}
-bool KMailConnection::kmailRemoveSubresource( const QString& resource )
+bool KMailConnection::kmailRemoveSubresource( const TQString& resource )
{
return connectToKMail()
&& mKMailIcalIfaceStub->removeSubresource( resource )
@@ -290,7 +290,7 @@ bool KMailConnection::kmailRemoveSubresource( const QString& resource )
bool KMailConnection::kmailStorageFormat( KMailICalIface::StorageFormat& type,
- const QString& folder )
+ const TQString& folder )
{
bool ok = connectToKMail();
type = mKMailIcalIfaceStub->storageFormat( folder );
@@ -298,13 +298,13 @@ bool KMailConnection::kmailStorageFormat( KMailICalIface::StorageFormat& type,
}
-bool KMailConnection::kmailTriggerSync( const QString &contentsType )
+bool KMailConnection::kmailTriggerSync( const TQString &contentsType )
{
bool ok = connectToKMail();
return ok && mKMailIcalIfaceStub->triggerSync( contentsType );
}
-void KMailConnection::unregisteredFromDCOP( const QCString& appId )
+void KMailConnection::unregisteredFromDCOP( const TQCString& appId )
{
if ( mKMailIcalIfaceStub && mKMailIcalIfaceStub->app() == appId ) {
// Delete the stub so that the next time we need to talk to kmail,
diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h
index cbb69a155..16b80bfb0 100644
--- a/kresources/kolab/shared/kmailconnection.h
+++ b/kresources/kolab/shared/kmailconnection.h
@@ -48,26 +48,26 @@ class ResourceKolabBase;
/**
This class provides the kmail connectivity for IMAP resources.
*/
-class KMailConnection : public QObject, public DCOPObject {
+class KMailConnection : public TQObject, public DCOPObject {
Q_OBJECT
K_DCOP
// These are the methods called by KMail when the resource changes
k_dcop:
- bool fromKMailAddIncidence( const QString& type, const QString& resource,
- Q_UINT32 sernum, int format, const QString& xml );
- void fromKMailDelIncidence( const QString& type, const QString& resource,
- const QString& xml );
- void fromKMailRefresh( const QString& type, const QString& resource );
- void fromKMailAddSubresource( const QString& type, const QString& resource,
- const QString& label, bool writable,
+ bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
+ Q_UINT32 sernum, int format, const TQString& xml );
+ void fromKMailDelIncidence( const TQString& type, const TQString& resource,
+ const TQString& xml );
+ void fromKMailRefresh( const TQString& type, const TQString& resource );
+ void fromKMailAddSubresource( const TQString& type, const TQString& resource,
+ const TQString& label, bool writable,
bool alarmRelevant );
- void fromKMailDelSubresource( const QString& type, const QString& resource );
- void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map, const QString& type,
- const QString& folder );
+ void fromKMailDelSubresource( const TQString& type, const TQString& resource );
+ void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map, const TQString& type,
+ const TQString& folder );
public:
- KMailConnection( ResourceKolabBase* resource, const QCString& objId );
+ KMailConnection( ResourceKolabBase* resource, const TQCString& objId );
virtual ~KMailConnection();
/**
@@ -76,47 +76,47 @@ public:
bool connectToKMail();
// Call the DCOP methods
- bool kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
- const QString& contentsType );
+ bool kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+ const TQString& contentsType );
bool kmailIncidencesCount( int& count,
- const QString& mimetype,
- const QString& resource );
- bool kmailIncidences( QMap<Q_UINT32, QString>& lst, const QString& mimetype,
- const QString& resource,
+ const TQString& mimetype,
+ const TQString& resource );
+ bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+ const TQString& resource,
int startIndex,
int nbMessages );
- bool kmailGetAttachment( KURL& url, const QString& resource, Q_UINT32 sernum,
- const QString& filename );
- bool kmailAttachmentMimetype( QString &mimeType, const QString &resource,
- Q_UINT32 sernum, const QString &filename );
- bool kmailListAttachments( QStringList &list, const QString &resource,
+ bool kmailGetAttachment( KURL& url, const TQString& resource, Q_UINT32 sernum,
+ const TQString& filename );
+ bool kmailAttachmentMimetype( TQString &mimeType, const TQString &resource,
+ Q_UINT32 sernum, const TQString &filename );
+ bool kmailListAttachments( TQStringList &list, const TQString &resource,
Q_UINT32 sernum );
- bool kmailDeleteIncidence( const QString& resource, Q_UINT32 sernum );
- bool kmailUpdate( const QString& resource,
+ bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+ bool kmailUpdate( const TQString& resource,
Q_UINT32& sernum,
- const QString& subject,
- const QString& plainTextBody,
- const QMap<QCString, QString>& customHeaders,
- const QStringList& attachmentURLs,
- const QStringList& attachmentMimetypes,
- const QStringList& attachmentNames,
- const QStringList& deletedAttachments );
-
- bool kmailStorageFormat( KMailICalIface::StorageFormat& type, const QString& folder);
-
- bool kmailTriggerSync( const QString& contentsType );
- bool kmailAddSubresource( const QString& resource,
- const QString& parent,
- const QString& contentsType );
- bool kmailRemoveSubresource( const QString& resource );
+ const TQString& subject,
+ const TQString& plainTextBody,
+ const TQMap<TQCString, TQString>& customHeaders,
+ const TQStringList& attachmentURLs,
+ const TQStringList& attachmentMimetypes,
+ const TQStringList& attachmentNames,
+ const TQStringList& deletedAttachments );
+
+ bool kmailStorageFormat( KMailICalIface::StorageFormat& type, const TQString& folder);
+
+ bool kmailTriggerSync( const TQString& contentsType );
+ bool kmailAddSubresource( const TQString& resource,
+ const TQString& parent,
+ const TQString& contentsType );
+ bool kmailRemoveSubresource( const TQString& resource );
private slots:
- virtual void unregisteredFromDCOP( const QCString& );
+ virtual void unregisteredFromDCOP( const TQCString& );
private:
/** Connect a signal from KMail to a local slot. */
- bool connectKMailSignal( const QCString&, const QCString& );
+ bool connectKMailSignal( const TQCString&, const TQCString& );
ResourceKolabBase* mResource;
DCOPClient* mDCOPClient;
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index 44c44ead2..9a4a17f7c 100644
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@@ -37,14 +37,14 @@
#include <libkcal/journal.h>
#include <libkdepim/kpimprefs.h>
#include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
using namespace Kolab;
-KolabBase::KolabBase( const QString& tz )
- : mCreationDate( QDateTime::currentDateTime() ),
- mLastModified( QDateTime::currentDateTime() ),
+KolabBase::KolabBase( const TQString& tz )
+ : mCreationDate( TQDateTime::currentDateTime() ),
+ mLastModified( TQDateTime::currentDateTime() ),
mSensitivity( Public ), mTimeZoneId( tz ),
mHasPilotSyncId( false ), mHasPilotSyncStatus( false )
{
@@ -89,20 +89,20 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
setCategories( addressee->categories().join( "," ) );
// Set creation-time and last-modification-time
- const QString creationString = addressee->custom( "KOLAB", "CreationDate" );
+ const TQString creationString = addressee->custom( "KOLAB", "CreationDate" );
kdDebug(5006) << "Creation time string: " << creationString << endl;
- QDateTime creationDate;
+ TQDateTime creationDate;
if ( creationString.isEmpty() ) {
- creationDate = QDateTime::currentDateTime();
+ creationDate = TQDateTime::currentDateTime();
kdDebug(5006) << "Creation date set to current time\n";
}
else {
creationDate = stringToDateTime( creationString );
kdDebug(5006) << "Creation date loaded\n";
}
- QDateTime modified = addressee->revision();
+ TQDateTime modified = addressee->revision();
if ( !modified.isValid() )
- modified = QDateTime::currentDateTime();
+ modified = TQDateTime::currentDateTime();
setLastModified( modified );
if ( modified < creationDate ) {
// It's not possible that the modification date is earlier than creation
@@ -110,7 +110,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
kdDebug(5006) << "Creation date set to modification date\n";
}
setCreationDate( creationDate );
- const QString newCreationDate = dateTimeToString( creationDate );
+ const TQString newCreationDate = dateTimeToString( creationDate );
if ( creationString != newCreationDate ) {
// We modified the creation date, so store it for future reference
const_cast<KABC::Addressee*>( addressee )
@@ -136,7 +136,7 @@ void KolabBase::saveTo( KABC::Addressee* addressee ) const
{
addressee->setUid( uid() );
addressee->setNote( body() );
- addressee->setCategories( QStringList::split( ',', categories() ) );
+ addressee->setCategories( TQStringList::split( ',', categories() ) );
addressee->setRevision( lastModified() );
addressee->insertCustom( "KOLAB", "CreationDate",
dateTimeToString( creationDate() ) );
@@ -156,52 +156,52 @@ void KolabBase::saveTo( KABC::Addressee* addressee ) const
// TODO: Attachments
}
-void KolabBase::setUid( const QString& uid )
+void KolabBase::setUid( const TQString& uid )
{
mUid = uid;
}
-QString KolabBase::uid() const
+TQString KolabBase::uid() const
{
return mUid;
}
-void KolabBase::setBody( const QString& body )
+void KolabBase::setBody( const TQString& body )
{
mBody = body;
}
-QString KolabBase::body() const
+TQString KolabBase::body() const
{
return mBody;
}
-void KolabBase::setCategories( const QString& categories )
+void KolabBase::setCategories( const TQString& categories )
{
mCategories = categories;
}
-QString KolabBase::categories() const
+TQString KolabBase::categories() const
{
return mCategories;
}
-void KolabBase::setCreationDate( const QDateTime& date )
+void KolabBase::setCreationDate( const TQDateTime& date )
{
mCreationDate = date;
}
-QDateTime KolabBase::creationDate() const
+TQDateTime KolabBase::creationDate() const
{
return mCreationDate;
}
-void KolabBase::setLastModified( const QDateTime& date )
+void KolabBase::setLastModified( const TQDateTime& date )
{
mLastModified = date;
}
-QDateTime KolabBase::lastModified() const
+TQDateTime KolabBase::lastModified() const
{
return mLastModified;
}
@@ -248,14 +248,14 @@ int KolabBase::pilotSyncStatus() const
return mPilotSyncStatus;
}
-bool KolabBase::loadEmailAttribute( QDomElement& element, Email& email )
+bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email )
{
- for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
- const QString tagName = e.tagName();
+ TQDomElement e = n.toElement();
+ const TQString tagName = e.tagName();
if ( tagName == "display-name" )
email.displayName = e.text();
@@ -271,18 +271,18 @@ bool KolabBase::loadEmailAttribute( QDomElement& element, Email& email )
return true;
}
-void KolabBase::saveEmailAttribute( QDomElement& element, const Email& email,
- const QString& tagName ) const
+void KolabBase::saveEmailAttribute( TQDomElement& element, const Email& email,
+ const TQString& tagName ) const
{
- QDomElement e = element.ownerDocument().createElement( tagName );
+ TQDomElement e = element.ownerDocument().createElement( tagName );
element.appendChild( e );
writeString( e, "display-name", email.displayName );
writeString( e, "smtp-address", email.smtpAddress );
}
-bool KolabBase::loadAttribute( QDomElement& element )
+bool KolabBase::loadAttribute( TQDomElement& element )
{
- const QString tagName = element.tagName();
+ const TQString tagName = element.tagName();
switch ( tagName[0].latin1() ) {
case 'u':
if ( tagName == "uid" ) {
@@ -336,7 +336,7 @@ bool KolabBase::loadAttribute( QDomElement& element )
return false;
}
-bool KolabBase::saveAttributes( QDomElement& element ) const
+bool KolabBase::saveAttributes( TQDomElement& element ) const
{
writeString( element, "product-id", productID() );
writeString( element, "uid", uid() );
@@ -347,17 +347,17 @@ bool KolabBase::saveAttributes( QDomElement& element ) const
dateTimeToString( lastModified() ) );
writeString( element, "sensitivity", sensitivityToString( sensitivity() ) );
if ( hasPilotSyncId() )
- writeString( element, "pilot-sync-id", QString::number( pilotSyncId() ) );
+ writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) );
if ( hasPilotSyncStatus() )
- writeString( element, "pilot-sync-status", QString::number( pilotSyncStatus() ) );
+ writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) );
return true;
}
-bool KolabBase::load( const QString& xml )
+bool KolabBase::load( const TQString& xml )
{
- QString errorMsg;
+ TQString errorMsg;
int errorLine, errorColumn;
- QDomDocument document;
+ TQDomDocument document;
bool ok = document.setContent( xml, &errorMsg, &errorLine, &errorColumn );
if ( !ok ) {
@@ -370,11 +370,11 @@ bool KolabBase::load( const QString& xml )
return loadXML( document );
}
-bool KolabBase::load( QFile& xml )
+bool KolabBase::load( TQFile& xml )
{
- QString errorMsg;
+ TQString errorMsg;
int errorLine, errorColumn;
- QDomDocument document;
+ TQDomDocument document;
bool ok = document.setContent( &xml, &errorMsg, &errorLine, &errorColumn );
if ( !ok ) {
@@ -387,41 +387,41 @@ bool KolabBase::load( QFile& xml )
return loadXML( document );
}
-QDomDocument KolabBase::domTree()
+TQDomDocument KolabBase::domTree()
{
- QDomDocument document;
+ TQDomDocument document;
- QString p = "version=\"1.0\" encoding=\"UTF-8\"";
+ TQString p = "version=\"1.0\" encoding=\"UTF-8\"";
document.appendChild(document.createProcessingInstruction( "xml", p ) );
return document;
}
-QString KolabBase::dateTimeToString( const QDateTime& time )
+TQString KolabBase::dateTimeToString( const TQDateTime& time )
{
return time.toString( Qt::ISODate ) + 'Z';
}
-QString KolabBase::dateToString( const QDate& date )
+TQString KolabBase::dateToString( const TQDate& date )
{
return date.toString( Qt::ISODate );
}
-QDateTime KolabBase::stringToDateTime( const QString& _date )
+TQDateTime KolabBase::stringToDateTime( const TQString& _date )
{
- QString date( _date );
+ TQString date( _date );
if ( date.endsWith( "Z" ) )
date.truncate( date.length() - 1 );
- return QDateTime::fromString( date, Qt::ISODate );
+ return TQDateTime::fromString( date, Qt::ISODate );
}
-QDate KolabBase::stringToDate( const QString& date )
+TQDate KolabBase::stringToDate( const TQString& date )
{
- return QDate::fromString( date, Qt::ISODate );
+ return TQDate::fromString( date, Qt::ISODate );
}
-QString KolabBase::sensitivityToString( Sensitivity s )
+TQString KolabBase::sensitivityToString( Sensitivity s )
{
switch( s ) {
case Private: return "private";
@@ -432,7 +432,7 @@ QString KolabBase::sensitivityToString( Sensitivity s )
return "What what what???";
}
-KolabBase::Sensitivity KolabBase::stringToSensitivity( const QString& s )
+KolabBase::Sensitivity KolabBase::stringToSensitivity( const TQString& s )
{
if ( s == "private" )
return Private;
@@ -441,34 +441,34 @@ KolabBase::Sensitivity KolabBase::stringToSensitivity( const QString& s )
return Public;
}
-QString KolabBase::colorToString( const QColor& color )
+TQString KolabBase::colorToString( const TQColor& color )
{
// Color is in the format "#RRGGBB"
return color.name();
}
-QColor KolabBase::stringToColor( const QString& s )
+TQColor KolabBase::stringToColor( const TQString& s )
{
- return QColor( s );
+ return TQColor( s );
}
-void KolabBase::writeString( QDomElement& element, const QString& tag,
- const QString& tagString )
+void KolabBase::writeString( TQDomElement& element, const TQString& tag,
+ const TQString& tagString )
{
if ( !tagString.isEmpty() ) {
- QDomElement e = element.ownerDocument().createElement( tag );
- QDomText t = element.ownerDocument().createTextNode( tagString );
+ TQDomElement e = element.ownerDocument().createElement( tag );
+ TQDomText t = element.ownerDocument().createTextNode( tagString );
e.appendChild( t );
element.appendChild( e );
}
}
-QDateTime KolabBase::localToUTC( const QDateTime& time ) const
+TQDateTime KolabBase::localToUTC( const TQDateTime& time ) const
{
return KPimPrefs::localTimeToUtc( time, mTimeZoneId );
}
-QDateTime KolabBase::utcToLocal( const QDateTime& time ) const
+TQDateTime KolabBase::utcToLocal( const TQDateTime& time ) const
{
return KPimPrefs::utcToLocalTime( time, mTimeZoneId );
}
diff --git a/kresources/kolab/shared/kolabbase.h b/kresources/kolab/shared/kolabbase.h
index 053683989..ac34eb884 100644
--- a/kresources/kolab/shared/kolabbase.h
+++ b/kresources/kolab/shared/kolabbase.h
@@ -34,9 +34,9 @@
#ifndef KOLABBASE_H
#define KOLABBASE_H
-#include <qdom.h>
-#include <qdatetime.h>
-#include <qcolor.h>
+#include <tqdom.h>
+#include <tqdatetime.h>
+#include <tqcolor.h>
class QFile;
@@ -54,38 +54,38 @@ class KolabBase {
public:
struct Email {
public:
- Email( const QString& name = QString::null,
- const QString& email = QString::null )
+ Email( const TQString& name = TQString::null,
+ const TQString& email = TQString::null )
: displayName( name ), smtpAddress( email )
{
}
- QString displayName;
- QString smtpAddress;
+ TQString displayName;
+ TQString smtpAddress;
};
enum Sensitivity { Public = 0, Private = 1, Confidential = 2 };
- explicit KolabBase( const QString& timezone = QString::null );
+ explicit KolabBase( const TQString& timezone = TQString::null );
virtual ~KolabBase();
// Return a string identifying this type
- virtual QString type() const = 0;
+ virtual TQString type() const = 0;
- virtual void setUid( const QString& uid );
- virtual QString uid() const;
+ virtual void setUid( const TQString& uid );
+ virtual TQString uid() const;
- virtual void setBody( const QString& body );
- virtual QString body() const;
+ virtual void setBody( const TQString& body );
+ virtual TQString body() const;
- virtual void setCategories( const QString& categories );
- virtual QString categories() const;
+ virtual void setCategories( const TQString& categories );
+ virtual TQString categories() const;
- virtual void setCreationDate( const QDateTime& date );
- virtual QDateTime creationDate() const;
+ virtual void setCreationDate( const TQDateTime& date );
+ virtual TQDateTime creationDate() const;
- virtual void setLastModified( const QDateTime& date );
- virtual QDateTime lastModified() const;
+ virtual void setLastModified( const TQDateTime& date );
+ virtual TQDateTime lastModified() const;
virtual void setSensitivity( Sensitivity sensitivity );
virtual Sensitivity sensitivity() const;
@@ -99,28 +99,28 @@ public:
virtual int pilotSyncStatus() const;
// String - Date conversion methods
- static QString dateTimeToString( const QDateTime& time );
- static QString dateToString( const QDate& date );
- static QDateTime stringToDateTime( const QString& time );
- static QDate stringToDate( const QString& date );
+ static TQString dateTimeToString( const TQDateTime& time );
+ static TQString dateToString( const TQDate& date );
+ static TQDateTime stringToDateTime( const TQString& time );
+ static TQDate stringToDate( const TQString& date );
// String - Sensitivity conversion methods
- static QString sensitivityToString( Sensitivity );
- static Sensitivity stringToSensitivity( const QString& );
+ static TQString sensitivityToString( Sensitivity );
+ static Sensitivity stringToSensitivity( const TQString& );
// String - Color conversion methods
- static QString colorToString( const QColor& );
- static QColor stringToColor( const QString& );
+ static TQString colorToString( const TQColor& );
+ static TQColor stringToColor( const TQString& );
// Load this object by reading the XML file
- bool load( const QString& xml );
- bool load( QFile& xml );
+ bool load( const TQString& xml );
+ bool load( TQFile& xml );
// Load this QDomDocument
- virtual bool loadXML( const QDomDocument& xml ) = 0;
+ virtual bool loadXML( const TQDomDocument& xml ) = 0;
// Serialize this object to an XML string
- virtual QString saveXML() const = 0;
+ virtual TQString saveXML() const = 0;
protected:
/// Read all known fields from this ical incidence
@@ -136,35 +136,35 @@ protected:
void saveTo( KABC::Addressee* ) const;
// This just makes the initial dom tree with version and doctype
- static QDomDocument domTree();
+ static TQDomDocument domTree();
- bool loadEmailAttribute( QDomElement& element, Email& email );
+ bool loadEmailAttribute( TQDomElement& element, Email& email );
- void saveEmailAttribute( QDomElement& element, const Email& email,
- const QString& tagName = "email" ) const;
+ void saveEmailAttribute( TQDomElement& element, const Email& email,
+ const TQString& tagName = "email" ) const;
// Load the attributes of this class
- virtual bool loadAttribute( QDomElement& );
+ virtual bool loadAttribute( TQDomElement& );
// Save the attributes of this class
- virtual bool saveAttributes( QDomElement& ) const;
+ virtual bool saveAttributes( TQDomElement& ) const;
// Return the product ID
- virtual QString productID() const = 0;
+ virtual TQString productID() const = 0;
// Write a string tag
- static void writeString( QDomElement&, const QString&, const QString& );
+ static void writeString( TQDomElement&, const TQString&, const TQString& );
- QDateTime localToUTC( const QDateTime& time ) const;
- QDateTime utcToLocal( const QDateTime& time ) const;
+ TQDateTime localToUTC( const TQDateTime& time ) const;
+ TQDateTime utcToLocal( const TQDateTime& time ) const;
- QString mUid;
- QString mBody;
- QString mCategories;
- QDateTime mCreationDate;
- QDateTime mLastModified;
+ TQString mUid;
+ TQString mBody;
+ TQString mCategories;
+ TQDateTime mCreationDate;
+ TQDateTime mLastModified;
Sensitivity mSensitivity;
- QString mTimeZoneId;
+ TQString mTimeZoneId;
// KPilot synchronization stuff
bool mHasPilotSyncId, mHasPilotSyncStatus;
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index d62a5bb54..291910fb9 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -42,19 +42,19 @@
#include <kurl.h>
#include <ktempfile.h>
#include <kmessagebox.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <kdebug.h>
using namespace Kolab;
static unsigned int uniquifier = 0;
-ResourceKolabBase::ResourceKolabBase( const QCString& objId )
+ResourceKolabBase::ResourceKolabBase( const TQCString& objId )
: mSilent( false )
{
KGlobal::locale()->insertCatalogue( "kres_kolab" );
KGlobal::locale()->insertCatalogue( "libkcal" );
- QString uniqueObjId = QString( objId ) + QString::number( uniquifier++ );
+ TQString uniqueObjId = TQString( objId ) + TQString::number( uniquifier++ );
mConnection = new KMailConnection( this, uniqueObjId.utf8() );
}
@@ -64,61 +64,61 @@ ResourceKolabBase::~ResourceKolabBase()
}
-bool ResourceKolabBase::kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
- const QString& contentsType ) const
+bool ResourceKolabBase::kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+ const TQString& contentsType ) const
{
return mConnection->kmailSubresources( lst, contentsType );
}
-bool ResourceKolabBase::kmailTriggerSync( const QString& contentsType ) const
+bool ResourceKolabBase::kmailTriggerSync( const TQString& contentsType ) const
{
return mConnection->kmailTriggerSync( contentsType );
}
bool ResourceKolabBase::kmailIncidencesCount( int &count,
- const QString& mimetype,
- const QString& resource ) const
+ const TQString& mimetype,
+ const TQString& resource ) const
{
return mConnection->kmailIncidencesCount( count, mimetype, resource );
}
-bool ResourceKolabBase::kmailIncidences( QMap<Q_UINT32, QString>& lst,
- const QString& mimetype,
- const QString& resource,
+bool ResourceKolabBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+ const TQString& mimetype,
+ const TQString& resource,
int startIndex,
int nbMessages ) const
{
return mConnection->kmailIncidences( lst, mimetype, resource, startIndex, nbMessages );
}
-bool ResourceKolabBase::kmailGetAttachment( KURL& url, const QString& resource,
+bool ResourceKolabBase::kmailGetAttachment( KURL& url, const TQString& resource,
Q_UINT32 sernum,
- const QString& filename ) const
+ const TQString& filename ) const
{
return mConnection->kmailGetAttachment( url, resource, sernum, filename );
}
-bool ResourceKolabBase::kmailAttachmentMimetype( QString & mimeType, QString & resource,
- Q_UINT32 sernum, const QString & filename ) const
+bool ResourceKolabBase::kmailAttachmentMimetype( TQString & mimeType, TQString & resource,
+ Q_UINT32 sernum, const TQString & filename ) const
{
return mConnection->kmailAttachmentMimetype( mimeType, resource, sernum, filename );
}
-bool ResourceKolabBase::kmailListAttachments( QStringList &list,
- const QString & resource,
+bool ResourceKolabBase::kmailListAttachments( TQStringList &list,
+ const TQString & resource,
Q_UINT32 sernum ) const
{
return mConnection->kmailListAttachments( list, resource, sernum );
}
-bool ResourceKolabBase::kmailDeleteIncidence( const QString& resource,
+bool ResourceKolabBase::kmailDeleteIncidence( const TQString& resource,
Q_UINT32 sernum )
{
return mSilent || mConnection->kmailDeleteIncidence( resource, sernum );
}
-static QString plainTextBody()
+static TQString plainTextBody()
{
const char * firstPartTextToTranslate = I18N_NOOP(
"This is a Kolab Groupware object.\nTo view this object you"
@@ -126,8 +126,8 @@ static QString plainTextBody()
" Groupware format.\nFor a list of such email clients please"
" visit\n%1" );
const char * url = "http://www.kolab.org/kolab2-clients.html";
- QString firstPartTextUntranslated = QString::fromLatin1( firstPartTextToTranslate ).arg( url );
- QString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
+ TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url );
+ TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
if ( firstPartText != firstPartTextUntranslated ) {
firstPartText.append("\n\n-----------------------------------------------------\n\n");
firstPartText.append( firstPartTextUntranslated );
@@ -135,21 +135,21 @@ static QString plainTextBody()
return firstPartText;
}
-bool ResourceKolabBase::kmailUpdate( const QString& resource,
+bool ResourceKolabBase::kmailUpdate( const TQString& resource,
Q_UINT32& sernum,
- const QString& xml,
- const QString& mimetype,
- const QString& subject,
+ const TQString& xml,
+ const TQString& mimetype,
+ const TQString& subject,
const CustomHeaderMap& _customHeaders,
- const QStringList& _attachmentURLs,
- const QStringList& _attachmentMimetypes,
- const QStringList& _attachmentNames,
- const QStringList& deletedAttachments )
+ const TQStringList& _attachmentURLs,
+ const TQStringList& _attachmentMimetypes,
+ const TQStringList& _attachmentNames,
+ const TQStringList& deletedAttachments )
{
if ( mSilent )
return true;
- QString subj = subject;
+ TQString subj = subject;
if ( subj.isEmpty() )
subj = i18n("Internal kolab data: Do not delete this mail.");
@@ -158,15 +158,15 @@ bool ResourceKolabBase::kmailUpdate( const QString& resource,
// Save the xml file. Will be deleted at the end of this method
KTempFile file;
file.setAutoDelete( true );
- QTextStream* stream = file.textStream();
- stream->setEncoding( QTextStream::UnicodeUTF8 );
+ TQTextStream* stream = file.textStream();
+ stream->setEncoding( TQTextStream::UnicodeUTF8 );
*stream << xml;
file.close();
// Add the xml file as an attachment
- QStringList attachmentURLs = _attachmentURLs;
- QStringList attachmentMimeTypes = _attachmentMimetypes;
- QStringList attachmentNames = _attachmentNames;
+ TQStringList attachmentURLs = _attachmentURLs;
+ TQStringList attachmentMimeTypes = _attachmentMimetypes;
+ TQStringList attachmentNames = _attachmentNames;
KURL url;
url.setPath( file.name() );
url.setFileEncoding( "UTF-8" );
@@ -187,10 +187,10 @@ bool ResourceKolabBase::kmailUpdate( const QString& resource,
}
}
-QString ResourceKolabBase::configFile( const QString& type ) const
+TQString ResourceKolabBase::configFile( const TQString& type ) const
{
return locateLocal( "config",
- QString( "kresources/kolab/%1rc" ).arg( type ) );
+ TQString( "kresources/kolab/%1rc" ).arg( type ) );
}
bool ResourceKolabBase::connectToKMail() const
@@ -198,25 +198,25 @@ bool ResourceKolabBase::connectToKMail() const
return mConnection->connectToKMail();
}
-bool ResourceKolabBase::kmailAddSubresource( const QString& resource,
- const QString& parent,
- const QString& contentsType )
+bool ResourceKolabBase::kmailAddSubresource( const TQString& resource,
+ const TQString& parent,
+ const TQString& contentsType )
{
return mConnection->kmailAddSubresource( resource, parent, contentsType );
}
-bool ResourceKolabBase::kmailRemoveSubresource( const QString& resource )
+bool ResourceKolabBase::kmailRemoveSubresource( const TQString& resource )
{
return mConnection->kmailRemoveSubresource( resource );
}
-QString ResourceKolabBase::findWritableResource( const ResourceMap& resources,
- const QString& text )
+TQString ResourceKolabBase::findWritableResource( const ResourceMap& resources,
+ const TQString& text )
{
// I have to use the label (shown in the dialog) as key here. But given how the
// label is made up, it should be unique. If it's not, well the dialog would suck anyway...
- QMap<QString, QString> possible;
- QStringList labels;
+ TQMap<TQString, TQString> possible;
+ TQStringList labels;
ResourceMap::ConstIterator it;
for ( it = resources.begin(); it != resources.end(); ++it ) {
if ( it.data().writable() && it.data().active() ) {
@@ -228,26 +228,26 @@ QString ResourceKolabBase::findWritableResource( const ResourceMap& resources,
if ( possible.isEmpty() ) { // None found!!
kdWarning(5650) << "No writable resource found!" << endl;
KMessageBox::error( 0, i18n( "No writable resource was found, saving will not be possible. Reconfigure KMail first." ) );
- return QString::null;
+ return TQString::null;
}
if ( possible.count() == 1 )
// Just one found
return possible.begin().data(); // yes this is the subresource key, i.e. location
- QString t = text;
+ TQString t = text;
if ( t.isEmpty() )
i18n( "You have more than one writable resource folder. "
"Please select the one you want to write to." );
// Several found, ask the user
- QString chosenLabel = KPIM::FolderSelectDialog::getItem( i18n( "Select Resource Folder" ),
+ TQString chosenLabel = KPIM::FolderSelectDialog::getItem( i18n( "Select Resource Folder" ),
t, possible.keys() );
if ( chosenLabel.isEmpty() ) // cancelled
- return QString::null;
+ return TQString::null;
return possible[chosenLabel];
}
-KMailICalIface::StorageFormat ResourceKolabBase::kmailStorageFormat( const QString &folder ) const
+KMailICalIface::StorageFormat ResourceKolabBase::kmailStorageFormat( const TQString &folder ) const
{
KMailICalIface::StorageFormat format = (KMailICalIface::StorageFormat) 3;
mConnection->kmailStorageFormat( format, folder );
diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h
index 806220189..eca5cc80b 100644
--- a/kresources/kolab/shared/resourcekolabbase.h
+++ b/kresources/kolab/shared/resourcekolabbase.h
@@ -34,9 +34,9 @@
#ifndef RESOURCEKOLABBASE_H
#define RESOURCEKOLABBASE_H
-#include <qstring.h>
-#include <qmap.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqmap.h>
+#include <tqstringlist.h>
#include "subresource.h"
#include <kmail/kmailicalIface.h>
@@ -73,31 +73,31 @@ class KMailConnection;
*/
class ResourceKolabBase {
public:
- ResourceKolabBase( const QCString& objId );
+ ResourceKolabBase( const TQCString& objId );
virtual ~ResourceKolabBase();
// These are the methods called by KMail when the resource changes
- virtual bool fromKMailAddIncidence( const QString& type,
- const QString& resource,
+ virtual bool fromKMailAddIncidence( const TQString& type,
+ const TQString& resource,
Q_UINT32 sernum,
int format,
- const QString& data ) = 0;
- virtual void fromKMailDelIncidence( const QString& type,
- const QString& resource,
- const QString& xml ) = 0;
- virtual void fromKMailRefresh( const QString& type,
- const QString& resource ) = 0;
- virtual void fromKMailAddSubresource( const QString& type,
- const QString& resource,
- const QString& label,
+ const TQString& data ) = 0;
+ virtual void fromKMailDelIncidence( const TQString& type,
+ const TQString& resource,
+ const TQString& xml ) = 0;
+ virtual void fromKMailRefresh( const TQString& type,
+ const TQString& resource ) = 0;
+ virtual void fromKMailAddSubresource( const TQString& type,
+ const TQString& resource,
+ const TQString& label,
bool writable,
bool alarmRelevant ) = 0;
- virtual void fromKMailDelSubresource( const QString& type,
- const QString& resource ) = 0;
+ virtual void fromKMailDelSubresource( const TQString& type,
+ const TQString& resource ) = 0;
- virtual void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder ) = 0;
+ virtual void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder ) = 0;
protected:
/// Do the connection to KMail.
bool connectToKMail() const;
@@ -105,71 +105,71 @@ protected:
// These are the KMail dcop function connections. The docs here say
// "Get", which here means that the first argument is the return arg
- /// List all folders with a certain contentsType. Returns a QMap with
+ /// List all folders with a certain contentsType. Returns a TQMap with
/// resourcename/writable pairs
- bool kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
- const QString& contentsType ) const;
+ bool kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+ const TQString& contentsType ) const;
/// Get the number of messages in this folder.
/// Used to iterate over kmailIncidences by chunks
- bool kmailIncidencesCount( int& count, const QString& mimetype,
- const QString& resource ) const;
+ bool kmailIncidencesCount( int& count, const TQString& mimetype,
+ const TQString& resource ) const;
/// Get the mimetype attachments from a chunk of messages from this folder.
- /// Returns a QMap with serialNumber/attachment pairs.
- bool kmailIncidences( QMap<Q_UINT32, QString>& lst, const QString& mimetype,
- const QString& resource,
+ /// Returns a TQMap with serialNumber/attachment pairs.
+ bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+ const TQString& resource,
int startIndex,
int nbMessages ) const;
- bool kmailTriggerSync( const QString& contentType ) const;
+ bool kmailTriggerSync( const TQString& contentType ) const;
public: // for Contact
/// Get an attachment from a mail. Returns a URL to it. This can
/// be called by the resource after obtaining the incidence.
/// The resource must delete the temp file.
- bool kmailGetAttachment( KURL& url, const QString& resource,
+ bool kmailGetAttachment( KURL& url, const TQString& resource,
Q_UINT32 sernum,
- const QString& filename ) const;
+ const TQString& filename ) const;
/** Get the mimetype of the specified attachment. */
- bool kmailAttachmentMimetype( QString &mimeType, QString &resource,
- Q_UINT32 sernum, const QString &filename ) const;
+ bool kmailAttachmentMimetype( TQString &mimeType, TQString &resource,
+ Q_UINT32 sernum, const TQString &filename ) const;
/// List all attachments of a mail.
- bool kmailListAttachments( QStringList &list, const QString &resource,
+ bool kmailListAttachments( TQStringList &list, const TQString &resource,
Q_UINT32 sernum ) const;
protected:
/// Delete an incidence.
- bool kmailDeleteIncidence( const QString& resource, Q_UINT32 sernum );
+ bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
- KMailICalIface::StorageFormat kmailStorageFormat( const QString& folder ) const;
+ KMailICalIface::StorageFormat kmailStorageFormat( const TQString& folder ) const;
- typedef QMap<QCString, QString> CustomHeaderMap;
+ typedef TQMap<TQCString, TQString> CustomHeaderMap;
/// Update an incidence. The list of attachments are URLs.
/// The parameter sernum is updated with the right KMail serial number
- bool kmailUpdate( const QString& resource, Q_UINT32& sernum,
- const QString& xml,
- const QString& mimetype,
- const QString& subject,
+ bool kmailUpdate( const TQString& resource, Q_UINT32& sernum,
+ const TQString& xml,
+ const TQString& mimetype,
+ const TQString& subject,
const CustomHeaderMap& customHeaders = CustomHeaderMap(),
- const QStringList& attachmentURLs = QStringList(),
- const QStringList& attachmentMimetypes = QStringList(),
- const QStringList& attachmentNames = QStringList(),
- const QStringList& deletedAttachments = QStringList() );
+ const TQStringList& attachmentURLs = TQStringList(),
+ const TQStringList& attachmentMimetypes = TQStringList(),
+ const TQStringList& attachmentNames = TQStringList(),
+ const TQStringList& deletedAttachments = TQStringList() );
- bool kmailAddSubresource( const QString& resource, const QString& parent,
- const QString& contentsType );
- bool kmailRemoveSubresource( const QString& resource );
+ bool kmailAddSubresource( const TQString& resource, const TQString& parent,
+ const TQString& contentsType );
+ bool kmailRemoveSubresource( const TQString& resource );
/// Get the full path of the config file.
- QString configFile( const QString& type ) const;
+ TQString configFile( const TQString& type ) const;
/// If only one of these is writable, return that. Otherwise return null.
- QString findWritableResource( const ResourceMap& resources,
- const QString& text = QString::null );
+ TQString findWritableResource( const ResourceMap& resources,
+ const TQString& text = TQString::null );
bool mSilent;
@@ -182,9 +182,9 @@ protected:
/// This is used to distinguish operations triggered by the user,
/// from operations triggered by KMail
- QStringList mUidsPendingAdding;
- QStringList mUidsPendingDeletion;
- QStringList mUidsPendingUpdate;
+ TQStringList mUidsPendingAdding;
+ TQStringList mUidsPendingDeletion;
+ TQStringList mUidsPendingUpdate;
private:
mutable KMailConnection* mConnection;
diff --git a/kresources/kolab/shared/subresource.cpp b/kresources/kolab/shared/subresource.cpp
index 67216913a..de4048fc7 100644
--- a/kresources/kolab/shared/subresource.cpp
+++ b/kresources/kolab/shared/subresource.cpp
@@ -35,7 +35,7 @@
using namespace Kolab;
SubResource::SubResource( bool active, bool writable,
- bool alarmRelevant, const QString& label,
+ bool alarmRelevant, const TQString& label,
int completionWeight )
: mActive( active ), mWritable( writable ), mAlarmRelevant( alarmRelevant ),
mLabel( label ), mCompletionWeight( completionWeight )
@@ -43,7 +43,7 @@ SubResource::SubResource( bool active, bool writable,
}
SubResource::SubResource( bool active, bool writable,
- const QString& label, int completionWeight )
+ const TQString& label, int completionWeight )
: mActive( active ), mWritable( writable ), mAlarmRelevant( false ),
mLabel( label ), mCompletionWeight( completionWeight )
{
@@ -83,12 +83,12 @@ bool SubResource::writable() const
return mWritable;
}
-void SubResource::setLabel( const QString& label )
+void SubResource::setLabel( const TQString& label )
{
mLabel = label;
}
-QString SubResource::label() const
+TQString SubResource::label() const
{
return mLabel;
}
@@ -103,7 +103,7 @@ int SubResource::completionWeight() const
return mCompletionWeight;
}
-StorageReference::StorageReference( const QString& resource, Q_UINT32 sernum )
+StorageReference::StorageReference( const TQString& resource, Q_UINT32 sernum )
: mResource( resource ), mSerialNumber( sernum )
{
}
@@ -112,12 +112,12 @@ StorageReference::~StorageReference()
{
}
-void StorageReference::setResource( const QString& resource )
+void StorageReference::setResource( const TQString& resource )
{
mResource = resource;
}
-QString StorageReference::resource() const
+TQString StorageReference::resource() const
{
return mResource;
}
diff --git a/kresources/kolab/shared/subresource.h b/kresources/kolab/shared/subresource.h
index 1bdd98cd5..87f98e6dd 100644
--- a/kresources/kolab/shared/subresource.h
+++ b/kresources/kolab/shared/subresource.h
@@ -33,8 +33,8 @@
#ifndef SUBRESOURCE_H
#define SUBRESOURCE_H
-#include <qstring.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqmap.h>
namespace Kolab {
@@ -48,11 +48,11 @@ public:
// This is just for QMap
SubResource() {}
- SubResource( bool active, bool writable, const QString& label,
+ SubResource( bool active, bool writable, const TQString& label,
int completionWeight = 100 );
SubResource( bool active, bool writable, bool alarmRelevant,
- const QString& label, int completionWeight = 100 );
+ const TQString& label, int completionWeight = 100 );
virtual ~SubResource();
virtual void setActive( bool active );
@@ -64,8 +64,8 @@ public:
virtual void setAlarmRelevant( bool active );
virtual bool alarmRelevant() const;
- virtual void setLabel( const QString& label );
- virtual QString label() const;
+ virtual void setLabel( const TQString& label );
+ virtual TQString label() const;
virtual void setCompletionWeight( int completionWeight );
virtual int completionWeight() const;
@@ -75,7 +75,7 @@ private:
bool mWritable; // Set if the KMail folder is writable
bool mAlarmRelevant; // Set if the alarms from this resource are of
// interest to the user, as per folder acls
- QString mLabel; // The GUI name of this resource
+ TQString mLabel; // The GUI name of this resource
// This is just for the abc plugin. But as long as only this is here,
// it's just as cheap to have it in here as making a d-pointer that
@@ -84,7 +84,7 @@ private:
int mCompletionWeight;
};
-typedef QMap<QString, SubResource> ResourceMap;
+typedef TQMap<TQString, SubResource> ResourceMap;
/**
* This class is used to store a mapping from the XML UID to the KMail
@@ -96,21 +96,21 @@ public:
// Just for QMap
StorageReference() {}
- StorageReference( const QString& resource, Q_UINT32 sernum );
+ StorageReference( const TQString& resource, Q_UINT32 sernum );
virtual ~StorageReference();
- virtual void setResource( const QString& resource );
- virtual QString resource() const;
+ virtual void setResource( const TQString& resource );
+ virtual TQString resource() const;
virtual void setSerialNumber( Q_UINT32 serialNumber );
virtual Q_UINT32 serialNumber() const;
private:
- QString mResource;
+ TQString mResource;
Q_UINT32 mSerialNumber;
};
-typedef QMap<QString, StorageReference> UidMap;
+typedef TQMap<TQString, StorageReference> UidMap;
}
diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp
index f698e5430..900772e56 100644
--- a/kresources/lib/addressbookadaptor.cpp
+++ b/kresources/lib/addressbookadaptor.cpp
@@ -51,18 +51,18 @@ AddressBookAdaptor::AddressBookAdaptor()
{
}
-QString AddressBookAdaptor::mimeType() const
+TQString AddressBookAdaptor::mimeType() const
{
return "text/x-vcard";
}
-bool AddressBookAdaptor::localItemExists( const QString &localId )
+bool AddressBookAdaptor::localItemExists( const TQString &localId )
{
KABC::Addressee a = mResource->findByUid( localId );
return !a.isEmpty();
}
-bool AddressBookAdaptor::localItemHasChanged( const QString &localId )
+bool AddressBookAdaptor::localItemHasChanged( const TQString &localId )
{
KABC::Addressee::List addressees = mResource->deletedAddressees();
KABC::Addressee::List::ConstIterator it;
@@ -79,7 +79,7 @@ bool AddressBookAdaptor::localItemHasChanged( const QString &localId )
}
-void AddressBookAdaptor::deleteItem( const QString &localId )
+void AddressBookAdaptor::deleteItem( const TQString &localId )
{
KABC::Addressee a = mResource->findByUid( localId );
if ( !a.isEmpty() ) {
@@ -98,12 +98,12 @@ void AddressBookAdaptor::addItem( KABC::Addressee addr )
}
void AddressBookAdaptor::addressbookItemDownloaded( KABC::Addressee addr,
- const QString &newLocalId, const KURL &remoteId, const QString &fingerprint,
- const QString &storagelocation )
+ const TQString &newLocalId, const KURL &remoteId, const TQString &fingerprint,
+ const TQString &storagelocation )
{
// remove the currently existing item from the cache
deleteItem( newLocalId );
- QString localId = idMapper()->localId( remoteId.path() );
+ TQString localId = idMapper()->localId( remoteId.path() );
if ( !localId.isEmpty() ) deleteItem( localId );
// add the new item
@@ -118,7 +118,7 @@ void AddressBookAdaptor::addressbookItemDownloaded( KABC::Addressee addr,
}
-void AddressBookAdaptor::clearChange( const QString &uid )
+void AddressBookAdaptor::clearChange( const TQString &uid )
{
mResource->clearChange( uid );
}
diff --git a/kresources/lib/addressbookadaptor.h b/kresources/lib/addressbookadaptor.h
index fb9f2971d..fb4408eca 100644
--- a/kresources/lib/addressbookadaptor.h
+++ b/kresources/lib/addressbookadaptor.h
@@ -48,9 +48,9 @@ class KDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor
public:
AddressBookAdaptor();
- QValueList<KPIM::FolderLister::ContentType> supportedTypes()
+ TQValueList<KPIM::FolderLister::ContentType> supportedTypes()
{
- QValueList<KPIM::FolderLister::ContentType> types;
+ TQValueList<KPIM::FolderLister::ContentType> types;
types << KPIM::FolderLister::Contact;
return types;
}
@@ -70,18 +70,18 @@ class KDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor
return mResource;
}
- QString mimeType() const;
- bool localItemExists( const QString &localId );
- bool localItemHasChanged( const QString &localId );
- void deleteItem( const QString &localId );
+ TQString mimeType() const;
+ bool localItemExists( const TQString &localId );
+ bool localItemHasChanged( const TQString &localId );
+ void deleteItem( const TQString &localId );
void addItem( KABC::Addressee addr );
- void clearChange( const QString &uid );
+ void clearChange( const TQString &uid );
virtual KPIM::GroupwareUploadItem *newUploadItem( KABC::Addressee addr,
KPIM::GroupwareUploadItem::UploadType type );
virtual void addressbookItemDownloaded( KABC::Addressee addr,
- const QString &newLocalId, const KURL &remoteId,
- const QString &fingerprint, const QString &storagelocation );
+ const TQString &newLocalId, const KURL &remoteId,
+ const TQString &fingerprint, const TQString &storagelocation );
private:
KABC::ResourceCached *mResource;
diff --git a/kresources/lib/calendaradaptor.cpp b/kresources/lib/calendaradaptor.cpp
index ddba9961c..88685bdfe 100644
--- a/kresources/lib/calendaradaptor.cpp
+++ b/kresources/lib/calendaradaptor.cpp
@@ -58,18 +58,18 @@ CalendarAdaptor::CalendarAdaptor()
{
}
-QString CalendarAdaptor::mimeType() const
+TQString CalendarAdaptor::mimeType() const
{
return "text/calendar";
}
-bool CalendarAdaptor::localItemExists( const QString &localId )
+bool CalendarAdaptor::localItemExists( const TQString &localId )
{
KCal::Incidence *i = mResource->incidence( localId );
return i;
}
-bool CalendarAdaptor::localItemHasChanged( const QString &localId )
+bool CalendarAdaptor::localItemHasChanged( const TQString &localId )
{
KCal::Incidence *i = mResource->incidence( localId );
if ( !i ) return false;
@@ -86,7 +86,7 @@ bool CalendarAdaptor::localItemHasChanged( const QString &localId )
return false;
}
-void CalendarAdaptor::deleteItem( const QString &localId )
+void CalendarAdaptor::deleteItem( const TQString &localId )
{
mResource->disableChangeNotification();
KCal::Incidence *i = mResource->incidence( localId );
@@ -113,13 +113,13 @@ void CalendarAdaptor::addItem( KCal::Incidence *i)
void CalendarAdaptor::calendarItemDownloaded( KCal::Incidence *inc,
- const QString &newLocalId, const KURL &remoteId, const QString &fingerprint,
- const QString &storagelocation )
+ const TQString &newLocalId, const KURL &remoteId, const TQString &fingerprint,
+ const TQString &storagelocation )
{
kdDebug() << "CalendarAdaptor::calendarItemDownloaded, inc=" << inc->summary() << ", local=" << newLocalId << ", remote=" << remoteId.url() << ", fpr=" << fingerprint << ", storagelocation="<< storagelocation << endl;
// remove the currently existing item from the cache
deleteItem( newLocalId );
- QString localId = idMapper()->localId( remoteId.path() );
+ TQString localId = idMapper()->localId( remoteId.path() );
if ( !localId.isEmpty() ) deleteItem( localId );
// add the new item
@@ -135,7 +135,7 @@ kdDebug() << "CalendarAdaptor::calendarItemDownloaded, inc=" << inc->summary() <
}
-void CalendarAdaptor::clearChange( const QString &uid )
+void CalendarAdaptor::clearChange( const TQString &uid )
{
KCal::Incidence *i = mResource->incidence( uid );
mResource->clearChange( i );
diff --git a/kresources/lib/calendaradaptor.h b/kresources/lib/calendaradaptor.h
index 6ef338d18..fddcfd7aa 100644
--- a/kresources/lib/calendaradaptor.h
+++ b/kresources/lib/calendaradaptor.h
@@ -55,9 +55,9 @@ class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor
public:
CalendarAdaptor();
- QValueList<KPIM::FolderLister::ContentType> supportedTypes()
+ TQValueList<KPIM::FolderLister::ContentType> supportedTypes()
{
- QValueList<KPIM::FolderLister::ContentType> types;
+ TQValueList<KPIM::FolderLister::ContentType> types;
types << KPIM::FolderLister::Event;
types << KPIM::FolderLister::Todo;
types << KPIM::FolderLister::Journal;
@@ -79,11 +79,11 @@ class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor
return mResource;
}
- virtual QString mimeType() const;
- bool localItemExists( const QString &localId );
- bool localItemHasChanged( const QString &localId );
- void deleteItem( const QString &localId );
- void clearChange( const QString &uid );
+ virtual TQString mimeType() const;
+ bool localItemExists( const TQString &localId );
+ bool localItemHasChanged( const TQString &localId );
+ void deleteItem( const TQString &localId );
+ void clearChange( const TQString &uid );
virtual KPIM::GroupwareUploadItem *newUploadItem( KCal::Incidence*it,
KPIM::GroupwareUploadItem::UploadType type );
@@ -91,17 +91,17 @@ class KDE_EXPORT CalendarAdaptor : public KPIM::GroupwareDataAdaptor
public slots:
/** newLocalId is the new id that was (randomly) assigned to the item */
virtual void calendarItemDownloaded( KCal::Incidence *inc,
- const QString &newLocalId, const KURL &remoteId,
- const QString &fingerprint, const QString &storagelocation );
+ const TQString &newLocalId, const KURL &remoteId,
+ const TQString &fingerprint, const TQString &storagelocation );
protected:
void addItem( KCal::Incidence *i );
private:
KCal::ResourceCached *mResource;
- QStringList mAddedItems;
- QStringList mChangedItems;
- QStringList mDeletedItems;
+ TQStringList mAddedItems;
+ TQStringList mChangedItems;
+ TQStringList mDeletedItems;
};
}
diff --git a/kresources/lib/davaddressbookadaptor.cpp b/kresources/lib/davaddressbookadaptor.cpp
index 1ce009654..b6f54c1e1 100644
--- a/kresources/lib/davaddressbookadaptor.cpp
+++ b/kresources/lib/davaddressbookadaptor.cpp
@@ -42,17 +42,17 @@ void DavAddressBookAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::Folder
Q_ASSERT( davjob );
if ( !davjob ) return;
- QDomDocument doc = davjob->response();
+ TQDomDocument doc = davjob->response();
kdDebug(7000) << " Doc: " << doc.toString() << endl;
- QDomElement docElement = doc.documentElement();
- QDomNode n;
+ TQDomElement docElement = doc.documentElement();
+ TQDomNode n;
for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomNode n2 = n.namedItem( "propstat" );
- QDomNode n3 = n2.namedItem( "prop" );
+ TQDomNode n2 = n.namedItem( "propstat" );
+ TQDomNode n3 = n2.namedItem( "prop" );
KURL href( n.namedItem( "href" ).toElement().text() );
- QString displayName = n3.namedItem( "displayname" ).toElement().text();
+ TQString displayName = n3.namedItem( "displayname" ).toElement().text();
KPIM::FolderLister::ContentType type = getContentType( n3 );
emit folderInfoRetrieved( href, displayName, type );
diff --git a/kresources/lib/davaddressbookadaptor.h b/kresources/lib/davaddressbookadaptor.h
index ef5c04077..bdf9e35b8 100644
--- a/kresources/lib/davaddressbookadaptor.h
+++ b/kresources/lib/davaddressbookadaptor.h
@@ -23,7 +23,7 @@
#include "addressbookadaptor.h"
#include "folderlister.h"
-#include <qdom.h>
+#include <tqdom.h>
#include <kdepimmacros.h>
namespace KABC {
@@ -41,10 +41,10 @@ class KDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor
virtual void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister *folderLister );
/** Returns the type of folder retrieved in the dom node. Typically, you'll
compare the DAV:resourcetype property with some values. */
- virtual KPIM::FolderLister::ContentType getContentType( const QDomNode &folderNode ) = 0;
+ virtual KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ) = 0;
/** Extract from the dav response whether the folder has subitems that need
to be examined */
- virtual bool getFolderHasSubs( const QDomNode &folderNode ) = 0;
+ virtual bool getFolderHasSubs( const TQDomNode &folderNode ) = 0;
};
}
diff --git a/kresources/lib/davcalendaradaptor.cpp b/kresources/lib/davcalendaradaptor.cpp
index 541b12bb8..a950e405c 100644
--- a/kresources/lib/davcalendaradaptor.cpp
+++ b/kresources/lib/davcalendaradaptor.cpp
@@ -25,7 +25,7 @@
#include <kio/davjob.h>
// #include <folderlister.h>
-// #include <qdom.h>
+// #include <tqdom.h>
using namespace KCal;
@@ -37,17 +37,17 @@ void DavCalendarAdaptor::interpretListFoldersJob( KIO::Job *job, KPIM::FolderLis
Q_ASSERT( davjob );
if ( !davjob ) return;
- QDomDocument doc = davjob->response();
+ TQDomDocument doc = davjob->response();
kdDebug(7000) << " Doc: " << doc.toString() << endl;
- QDomElement docElement = doc.documentElement();
- QDomNode n;
+ TQDomElement docElement = doc.documentElement();
+ TQDomNode n;
for( n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomNode n2 = n.namedItem( "propstat" );
- QDomNode n3 = n2.namedItem( "prop" );
+ TQDomNode n2 = n.namedItem( "propstat" );
+ TQDomNode n3 = n2.namedItem( "prop" );
KURL href( n.namedItem( "href" ).toElement().text() );
- QString displayName = n3.namedItem( "displayname" ).toElement().text();
+ TQString displayName = n3.namedItem( "displayname" ).toElement().text();
KPIM::FolderLister::ContentType type = getContentType( n3 );
emit folderInfoRetrieved( href, displayName, type );
diff --git a/kresources/lib/davcalendaradaptor.h b/kresources/lib/davcalendaradaptor.h
index 3c4a7bc4f..b7aba04ea 100644
--- a/kresources/lib/davcalendaradaptor.h
+++ b/kresources/lib/davcalendaradaptor.h
@@ -23,7 +23,7 @@
#include "calendaradaptor.h"
#include "folderlister.h"
-#include <qdom.h>
+#include <tqdom.h>
#include <kdepimmacros.h>
namespace KCal {
@@ -41,10 +41,10 @@ class KDE_EXPORT DavCalendarAdaptor : public CalendarAdaptor
virtual void interpretListFoldersJob( KIO::Job *job, KPIM::FolderLister *folderLister );
/** Returns the type of folder retrieved in the dom node. Typically, you'll
compare the DAV:resourcetype property with some values. */
- virtual KPIM::FolderLister::ContentType getContentType( const QDomNode &folderNode ) = 0;
+ virtual KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode ) = 0;
/** Extract from the dav response whether the folder has subitems that need
to be examined */
- virtual bool getFolderHasSubs( const QDomNode &folderNode ) = 0;
+ virtual bool getFolderHasSubs( const TQDomNode &folderNode ) = 0;
};
}
diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp
index b02654945..25fd7d826 100644
--- a/kresources/lib/folderconfig.cpp
+++ b/kresources/lib/folderconfig.cpp
@@ -32,35 +32,35 @@
#include <kdebug.h>
#include <kdialog.h>
-#include <qlayout.h>
-#include <qgroupbox.h>
-#include <qpushbutton.h>
-#include <qcombobox.h>
-#include <qhbox.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqpushbutton.h>
+#include <tqcombobox.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
using namespace KPIM;
-FolderConfig::FolderConfig( QWidget *parent )
- : QWidget( parent ), mFolderLister( 0 )
+FolderConfig::FolderConfig( TQWidget *parent )
+ : TQWidget( parent ), mFolderLister( 0 )
{
- QBoxLayout *topLayout = new QVBoxLayout( this );
+ TQBoxLayout *topLayout = new TQVBoxLayout( this );
topLayout->addSpacing( KDialog::spacingHint() );
- QGroupBox *topBox = new QGroupBox( 1, Horizontal, i18n("Folder Selection"),
+ TQGroupBox *topBox = new TQGroupBox( 1, Horizontal, i18n("Folder Selection"),
this );
topLayout->addWidget( topBox );
- QPushButton *button = new QPushButton( i18n("Update Folder List"), topBox );
- connect( button, SIGNAL( clicked() ), SIGNAL( updateFoldersClicked() ) );
+ TQPushButton *button = new TQPushButton( i18n("Update Folder List"), topBox );
+ connect( button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( updateFoldersClicked() ) );
mFolderList = new FolderListView( topBox );
-/* QHBox *writeBox = new QHBox( topBox );
+/* TQHBox *writeBox = new TQHBox( topBox );
- new QLabel( i18n("Write to:"), writeBox );
+ new TQLabel( i18n("Write to:"), writeBox );
- mWriteCombo = new QComboBox( writeBox );*/
+ mWriteCombo = new TQComboBox( writeBox );*/
}
FolderConfig::~FolderConfig()
@@ -71,8 +71,8 @@ void FolderConfig::setFolderLister( FolderLister *f )
{
mFolderLister = f;
- QValueList<FolderListView::Property> types;
- QValueList<FolderLister::ContentType> suptypes( mFolderLister->supportedTypes() );
+ TQValueList<FolderListView::Property> types;
+ TQValueList<FolderLister::ContentType> suptypes( mFolderLister->supportedTypes() );
if ( suptypes.contains( FolderLister::Event ) ) types << FolderListView::Event;
if ( suptypes.contains( FolderLister::Todo ) ) types << FolderListView::Todo;
if ( suptypes.contains( FolderLister::Journal ) ) types << FolderListView::Journal;
@@ -81,7 +81,7 @@ void FolderConfig::setFolderLister( FolderLister *f )
if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown;
mFolderList->setEnabledTypes( types );
- connect( mFolderLister, SIGNAL( foldersRead() ), SLOT( updateFolderList() ) );
+ connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) );
}
void FolderConfig::retrieveFolderList( const KURL &url )
@@ -100,7 +100,7 @@ void FolderConfig::updateFolderList()
{
mFolderList->clear();
- QStringList write;
+ TQStringList write;
if ( !mOldFolderListerURL.isEmpty() && mFolderLister->adaptor() ) {
mFolderLister->adaptor()->setBaseURL( mOldFolderListerURL );
@@ -134,11 +134,11 @@ void FolderConfig::updateFolderList()
void FolderConfig::saveSettings()
{
- QPtrList<QListViewItem> lst;
+ TQPtrList<TQListViewItem> lst;
FolderLister::Entry::List folders;
- QListViewItemIterator it( mFolderList );
+ TQListViewItemIterator it( mFolderList );
while ( it.current() ) {
FolderListItem *item = dynamic_cast<FolderListItem *>( it.current() );
if ( item ) {
diff --git a/kresources/lib/folderconfig.h b/kresources/lib/folderconfig.h
index 5926392cc..c27d8fdf6 100644
--- a/kresources/lib/folderconfig.h
+++ b/kresources/lib/folderconfig.h
@@ -25,7 +25,7 @@
#include <kurl.h>
#include <kdepimmacros.h>
-#include <qwidget.h>
+#include <tqwidget.h>
// class KListView;
class QComboBox;
@@ -39,7 +39,7 @@ class KDE_EXPORT FolderConfig : public QWidget
{
Q_OBJECT
public:
- FolderConfig( QWidget *parent );
+ FolderConfig( TQWidget *parent );
~FolderConfig();
void setFolderLister( FolderLister * );
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index faf2204f7..cd203463c 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <kconfig.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
using namespace KPIM;
@@ -43,12 +43,12 @@ void FolderLister::setFolders( const FolderLister::Entry::List &folders )
mFolders = folders;
}
-void FolderLister::setWriteDestinationId( KPIM::FolderLister::ContentType type, const QString &id )
+void FolderLister::setWriteDestinationId( KPIM::FolderLister::ContentType type, const TQString &id )
{
mWriteDestinationId[ type ] = id;
}
-QString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type ) const
+TQString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type ) const
{
if ( mWriteDestinationId.contains( type ) ) {
return mWriteDestinationId[type];
@@ -56,7 +56,7 @@ QString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type )
return mWriteDestinationId[ KPIM::FolderLister::All ];
} else if ( mWriteDestinationId.contains( KPIM::FolderLister::Unknown ) ) {
return mWriteDestinationId[ KPIM::FolderLister::Unknown ];
- } else return QString::null;
+ } else return TQString::null;
}
@@ -74,7 +74,7 @@ KURL::List FolderLister::activeFolderIds() const
return ids;
}
-bool FolderLister::isActive( const QString &id ) const
+bool FolderLister::isActive( const TQString &id ) const
{
FolderLister::Entry::List::ConstIterator it;
for( it = mFolders.begin(); it != mFolders.end(); ++it ) {
@@ -83,10 +83,10 @@ bool FolderLister::isActive( const QString &id ) const
return false;
}
-QStringList FolderLister::contentTypeToStrings( ContentType type )
+TQStringList FolderLister::contentTypeToStrings( ContentType type )
{
kdDebug() << "FolderLister::contentTypeToStrings( type=" << type << ")" << endl;
- QStringList cont;
+ TQStringList cont;
if ( type == All ) {
cont << "All";
} else if ( type == Unknown ) {
@@ -103,7 +103,7 @@ kdDebug() << "FolderLister::contentTypeToStrings( type=" << type << ")" << endl;
return cont;
}
-FolderLister::ContentType FolderLister::contentTypeFromString( const QString &type )
+FolderLister::ContentType FolderLister::contentTypeFromString( const TQString &type )
{
if ( type == "All" ) return All;
if ( type == "Contact" ) return Contact;
@@ -116,12 +116,12 @@ FolderLister::ContentType FolderLister::contentTypeFromString( const QString &ty
return Unknown;
}
-QValueList<FolderLister::ContentType> FolderLister::supportedTypes()
+TQValueList<FolderLister::ContentType> FolderLister::supportedTypes()
{
if ( adaptor() ) {
return adaptor()->supportedTypes();
} else {
- return QValueList<ContentType>();
+ return TQValueList<ContentType>();
}
}
@@ -132,12 +132,12 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs )
kdDebug(7000) << "FolderLister::readConfig()" << endl;
mFolders.clear();
- QStringList active = newprefs->activeFolders();
+ TQStringList active = newprefs->activeFolders();
int nr = newprefs->folderNumber();
for ( int i=0; i<nr; ++i ) {
- QStringList l( newprefs->folder( i ) );
-// QStringList l( cfgg.readListEntry( QString("Folder%1").arg( i ) ) );
+ TQStringList l( newprefs->folder( i ) );
+// TQStringList l( cfgg.readListEntry( TQString("Folder%1").arg( i ) ) );
Entry e;
if ( l.count()>0 ) {
e.id = l.first();
@@ -148,14 +148,14 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs )
l.pop_front();
}
e.type = Unknown;
- for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
+ for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
e.type = (FolderLister::ContentType)( e.type | contentTypeFromString( *it ) );
}
if ( active.find( e.id ) != active.end() ) e.active = true;
mFolders.append( e );
}
- QStringList destinations( newprefs->defaultDestinations() );
+ TQStringList destinations( newprefs->defaultDestinations() );
#define readDestination(type) \
if ( destinations.count()>0 ) { \
@@ -173,20 +173,20 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs )
void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
{
- QStringList ids;
- QStringList names;
- QStringList active;
+ TQStringList ids;
+ TQStringList names;
+ TQStringList active;
// KConfigGroup cfgg( newprefs->config(), "Folders" );
int nr = 0;
Entry::List::ConstIterator it;
for( it = mFolders.begin(); it != mFolders.end(); ++it ) {
- QStringList lst;
+ TQStringList lst;
lst << (*it).id;
lst << (*it).name;
lst += contentTypeToStrings( (*it).type );
newprefs->setFolder( nr, lst );
-// cfgg.writeEntry( QString("Folder%1").arg( nr ), lst );
+// cfgg.writeEntry( TQString("Folder%1").arg( nr ), lst );
if ( (*it).active ) active.append( (*it).id );
nr++;
}
@@ -194,11 +194,11 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
newprefs->setActiveFolders( active );
- QStringList defaultFolders;
+ TQStringList defaultFolders;
#define writeDestination(type) \
if ( mWriteDestinationId.contains( type ) ) \
defaultFolders << mWriteDestinationId[type]; \
- else defaultFolders << QString::null;
+ else defaultFolders << TQString::null;
writeDestination( KPIM::FolderLister::Event );
writeDestination( KPIM::FolderLister::Todo );
writeDestination( KPIM::FolderLister::Journal );
@@ -216,12 +216,12 @@ void FolderLister::setAdaptor( KPIM::GroupwareDataAdaptor *adaptor )
disconnect( mAdaptor, 0, this, 0 );
}
mAdaptor = adaptor;
- connect( mAdaptor, SIGNAL( folderInfoRetrieved( const KURL &,
- const QString &, KPIM::FolderLister::ContentType ) ),
- this, SLOT( processFolderResult( const KURL &, const QString &,
+ connect( mAdaptor, TQT_SIGNAL( folderInfoRetrieved( const KURL &,
+ const TQString &, KPIM::FolderLister::ContentType ) ),
+ this, TQT_SLOT( processFolderResult( const KURL &, const TQString &,
KPIM::FolderLister::ContentType ) ) );
- connect( mAdaptor, SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ),
- this, SLOT( folderSubitemRetrieved( const KURL &, bool ) ) );
+ connect( mAdaptor, TQT_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ),
+ this, TQT_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) );
}
void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder )
@@ -230,8 +230,8 @@ void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder )
doRetrieveFolder( url );
else {
KURL u( url ) ;
- u.setUser( QString::null );
- u.setPass( QString::null );
+ u.setUser( TQString::null );
+ u.setPass( TQString::null );
mProcessedPathes.append( url.path(-1) );
}
}
@@ -272,8 +272,8 @@ void FolderLister::doRetrieveFolder( const KURL &u )
kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL="
<< url.prettyURL() << endl;
- connect( listjob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotListJobResult( KIO::Job * ) ) );
+ connect( listjob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotListJobResult( KIO::Job * ) ) );
} else {
// TODO: Indicate a problem to the user!
kdWarning() << "Unable to create the folder list job for the url "
@@ -296,7 +296,7 @@ FolderLister::Entry::List FolderLister::defaultFolders()
}
void FolderLister::processFolderResult( const KURL &href,
- const QString &displayName,
+ const TQString &displayName,
ContentType type )
{
kdDebug() << "FolderLister::processFolderResult( href=" << href.url() << ", displayName=" << displayName << ", type=" << int(type) << endl;
diff --git a/kresources/lib/folderlister.h b/kresources/lib/folderlister.h
index c8a70ef10..f2f19d10e 100644
--- a/kresources/lib/folderlister.h
+++ b/kresources/lib/folderlister.h
@@ -28,10 +28,10 @@
#include <kurl.h>
#include <kdepimmacros.h>
-#include <qvaluelist.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qobject.h>
+#include <tqvaluelist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqobject.h>
namespace KIO {
class Job;
@@ -62,17 +62,17 @@ class KDE_EXPORT FolderLister : public QObject
public:
Entry() : active( false ) {}
- typedef QValueList<Entry> List;
+ typedef TQValueList<Entry> List;
- QString id;
- QString name;
+ TQString id;
+ TQString name;
ContentType type;
bool active;
};
- static QStringList contentTypeToStrings( ContentType );
- ContentType contentTypeFromString( const QString &type );
+ static TQStringList contentTypeToStrings( ContentType );
+ ContentType contentTypeFromString( const TQString &type );
- QValueList<ContentType> supportedTypes();
+ TQValueList<ContentType> supportedTypes();
FolderLister( Type );
@@ -86,10 +86,10 @@ class KDE_EXPORT FolderLister : public QObject
GroupwareDataAdaptor* adaptor() const { return mAdaptor; }
KURL::List activeFolderIds() const;
- bool isActive( const QString &id ) const;
+ bool isActive( const TQString &id ) const;
- void setWriteDestinationId( KPIM::FolderLister::ContentType type, const QString &dest );
- QString writeDestinationId( KPIM::FolderLister::ContentType type ) const;
+ void setWriteDestinationId( KPIM::FolderLister::ContentType type, const TQString &dest );
+ TQString writeDestinationId( KPIM::FolderLister::ContentType type ) const;
void readConfig( KPIM::GroupwarePrefsBase *newprefs );
void writeConfig( KPIM::GroupwarePrefsBase *newprefs );
@@ -103,7 +103,7 @@ class KDE_EXPORT FolderLister : public QObject
/** Adds the folder with the given url and display name to the folder
* tree (if is has an appropriate type) */
virtual void processFolderResult( const KURL &href,
- const QString &displayName,
+ const TQString &displayName,
KPIM::FolderLister::ContentType type );
/** Retrieve information about the folder u. If it has sub-folders, it
descends into the hierarchy */
@@ -136,12 +136,12 @@ class KDE_EXPORT FolderLister : public QObject
protected:
Type mType;
KURL::List mUrls;
- QStringList mProcessedPathes;
+ TQStringList mProcessedPathes;
Entry::List mFolders;
GroupwareDataAdaptor *mAdaptor;
private:
// TODO: We need multiple destinations for Events, Tasks and Journals
- QMap<KPIM::FolderLister::ContentType, QString> mWriteDestinationId;
+ TQMap<KPIM::FolderLister::ContentType, TQString> mWriteDestinationId;
KURL mOldURL;
};
diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp
index 1ab593553..b29e61c9d 100644
--- a/kresources/lib/folderlistview.cpp
+++ b/kresources/lib/folderlistview.cpp
@@ -30,26 +30,26 @@
#include <kpopupmenu.h>
#include <kdebug.h>
-#include <qlistview.h>
-#include <qheader.h>
-#include <qpainter.h>
+#include <tqlistview.h>
+#include <tqheader.h>
+#include <tqpainter.h>
static const int BoxSize = 16;
//BEGIN FolderListView
-FolderListView::FolderListView( QWidget *parent, const QValueList<Property> &types )
+FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &types )
: KListView( parent )
{
setEnabledTypes( types );
- connect( this, SIGNAL(mouseButtonPressed(int, QListViewItem*, const QPoint&, int)),
- this, SLOT(slotMousePressed(int, QListViewItem*, const QPoint&, int)) );
- connect( this, SIGNAL(spacePressed(QListViewItem*)),
- this, SLOT(showPopupMenu(QListViewItem*)) );
+ 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*)) );
}
-void FolderListView::setEnabledTypes( const QValueList<Property> &types )
+void FolderListView::setEnabledTypes( const TQValueList<Property> &types )
{
kdDebug() << "FolderListView::setEnabledTypes" << endl;
for ( int i = 0; i< columns(); ++i ) removeColumn( i );
@@ -90,7 +90,7 @@ kdDebug() << "FolderListView::setEnabledTypes" << endl;
} else mColumnMap[Unknown] = -1;
}
-void FolderListView::showPopupMenu( FolderListItem *i, const QPoint &globalPos )
+void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos )
{
if ( !i ) return;
KPIM::FolderLister::Entry folder( i->folder() );
@@ -99,39 +99,39 @@ void FolderListView::showPopupMenu( FolderListItem *i, const QPoint &globalPos )
int id;
m.insertTitle( folder.name, 9999 );
- id = m.insertItem( i18n("&Enabled"), this, SLOT(slotPopupHandler(int)), 0, FolderName );
+ id = m.insertItem( i18n("&Enabled"), this, TQT_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, SLOT(slotPopupHandler(int)), 0, Event );
+ id = m.insertItem( i18n("Default for New &Events"), this, TQT_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, SLOT(slotPopupHandler(int)), 0, Todo );
+ id = m.insertItem( i18n("Default for New &Todos"), this, TQT_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, SLOT(slotPopupHandler(int)), 0, Journal );
+ id = m.insertItem( i18n("Default for New &Journals"), this, TQT_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, SLOT(slotPopupHandler(int)), 0, Contact );
+ id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_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, SLOT(slotPopupHandler(int)), 0, All );
+ id = m.insertItem( i18n("Default for All New &Items"), this, TQT_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, SLOT(slotPopupHandler(int)), 0, Unknown );
+ id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown );
m.setItemChecked( id, i->isDefault( Unknown ) );
}
m.exec( globalPos );
}
-void FolderListView::showPopupMenu( QListViewItem *i )
+void FolderListView::showPopupMenu( TQListViewItem *i )
{
if ( dynamic_cast<FolderListItem*>(i) )
showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(itemRect(i).topLeft()) );
@@ -142,9 +142,9 @@ void FolderListView::slotPopupHandler( int z )
((FolderListItem*)currentItem())->changeProperty( (Property)z );
}
-// Because QListViewItem::activatePos() is going to become deprecated,
+// Because TQListViewItem::activatePos() is going to become deprecated,
// and also because this attempt offers more control, I connect mousePressed to this.
-void FolderListView::slotMousePressed(int btn, QListViewItem* i, const QPoint& pos, int c)
+void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c)
{
if ( dynamic_cast<FolderListItem*>(i) ) {
if ( btn == Qt::RightButton ) {
@@ -152,7 +152,7 @@ void FolderListView::slotMousePressed(int btn, QListViewItem* i, const QPoint& p
}
else if ( btn == Qt::LeftButton && c > 0 ) {
// map pos to item/column and call FolderListItem::activate(col, pos)
- ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - QPoint( 0, itemRect(i).top() ) );
+ ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
// } else {
// KListView::slotMousePressed( btn, i, pos, c );
}
@@ -163,10 +163,10 @@ void FolderListView::slotMousePressed(int btn, QListViewItem* i, const QPoint& p
//BEGIN FolderListItem
-void FolderListItem::activate( int column, const QPoint &localPos )
+void FolderListItem::activate( int column, const TQPoint &localPos )
{
if ( !mFolderListView ) return;
- QListView *lv = listView();
+ TQListView *lv = listView();
int x = 0;
for( int c = 0; c < column-1; c++ )
x += lv->columnWidth( c );
@@ -184,7 +184,7 @@ void FolderListItem::activate( int column, const QPoint &localPos )
default:
return;
}
- if ( !QRect( x, 0, w, BoxSize ).contains( localPos ) )
+ if ( !TQRect( x, 0, w, BoxSize ).contains( localPos ) )
changeProperty( prop );
}
@@ -195,7 +195,7 @@ kdDebug() << "FolderListItem::changeProperty( " << p << ")" << endl;
kdDebug() << "it's folderName" << endl;
setOn( !isOn() );
} else if ( typeSupported( p ) ) {
- QListViewItemIterator it( listView() );
+ TQListViewItemIterator it( listView() );
while ( it.current() ) {
FolderListItem *item = dynamic_cast<FolderListItem*>( it.current() );
if ( item ) {
@@ -233,16 +233,16 @@ void FolderListItem::setDefault( FolderListView::Property prop, bool def )
}
-void FolderListItem::paintCell( QPainter *p, const QColorGroup &cg, int col, int width, int align )
+void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, int width, int align )
{
if ( !p ) return;
- QListView *lv = listView();
+ TQListView *lv = listView();
Q_ASSERT( lv ); //###
if ( !lv ) return;
// use a private color group and set the text/highlighted text colors
-// QColorGroup mcg = lv->viewport()->colorGroup();
+// TQColorGroup mcg = lv->viewport()->colorGroup();
FolderListView::Property prop( mFolderListView->typeForColumn(col) );
if ( prop == FolderListView::FolderName ) {
@@ -250,11 +250,11 @@ void FolderListItem::paintCell( QPainter *p, const QColorGroup &cg, int col, int
super::paintCell( p, cg, col, width, align );
return;
} else {
- p->fillRect( 0, 0, width, height(), QBrush( cg.base() ) );
+ p->fillRect( 0, 0, width, height(), TQBrush( cg.base() ) );
}
int marg = lv->itemMargin();
- QColor c;
+ TQColor c;
switch ( prop )
{
@@ -271,9 +271,9 @@ void FolderListItem::paintCell( QPainter *p, const QColorGroup &cg, int col, int
int y = (height() - BoxSize) / 2;
if ( isEnabled() )
- p->setPen( QPen( cg.text(), 1 ) );
+ p->setPen( TQPen( cg.text(), 1 ) );
else
- p->setPen( QPen( lv->palette().color( QPalette::Disabled, QColorGroup::Text ), 1 ) );
+ p->setPen( TQPen( lv->palette().color( TQPalette::Disabled, TQColorGroup::Text ), 1 ) );
p->drawEllipse( x+marg, y+2, BoxSize-4, BoxSize-4 );
@@ -281,7 +281,7 @@ void FolderListItem::paintCell( QPainter *p, const QColorGroup &cg, int col, int
if ( isEnabled() )
p->setBrush( cg.text() );
else
- p->setBrush( lv->palette().color( QPalette::Disabled, QColorGroup::Text ) );
+ p->setBrush( lv->palette().color( TQPalette::Disabled, TQColorGroup::Text ) );
p->drawEllipse( x + marg + 3, y + 5, BoxSize-10, BoxSize-10 );
}
break;
diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h
index d933402a3..e7b634ef6 100644
--- a/kresources/lib/folderlistview.h
+++ b/kresources/lib/folderlistview.h
@@ -32,7 +32,7 @@ class FolderListCaption;
/*
- QListView that automatically adds columns for FolderListItems for selecting
+ TQListView that automatically adds columns for FolderListItems for selecting
the default destination and a slot to edit the destinations using the keyboard.
*/
class FolderListView : public KListView
@@ -45,51 +45,51 @@ class FolderListView : public KListView
/* mainly for readability */
enum Property { FolderName, Event, Todo, Journal, Contact, All, Unknown, PROP_MAX };
- FolderListView( QWidget *parent, const QValueList<Property> &types = QValueList<Property>() );
+ FolderListView( TQWidget *parent, const TQValueList<Property> &types = TQValueList<Property>() );
~FolderListView() {};
/* Display a popupmenu for item i at the specified global position, eventually with a title,
promoting the context name of that item */
- void showPopupMenu( FolderListItem *i, const QPoint &globalPos );
+ void showPopupMenu( FolderListItem *i, const TQPoint &globalPos );
void emitChanged() { emit changed(); };
- void setEnabledTypes( const QValueList<Property> &types );
+ void setEnabledTypes( const TQValueList<Property> &types );
int columnForType( Property prop ) const { if ( mColumnMap.contains(prop) ) return mColumnMap[prop]; else return -1;}
Property typeForColumn( int col ) const { if ( mTypeMap.contains( col ) ) return mTypeMap[col]; else return Unknown; }
private slots:
/* Display a popupmenu for item i at item position */
- void showPopupMenu( QListViewItem *i );
+ void showPopupMenu( TQListViewItem *i );
/* call item to change a property, or display a menu */
- void slotMousePressed( int, QListViewItem*, const QPoint&, int );
+ void slotMousePressed( int, TQListViewItem*, const TQPoint&, int );
/* asks item to change the property in q */
void slotPopupHandler( int z );
signals:
void changed();
private:
- QValueList<Property> mTypes;
- QMap<Property,int> mColumnMap;
- QMap<int,Property> mTypeMap;
+ TQValueList<Property> mTypes;
+ TQMap<Property,int> mColumnMap;
+ TQMap<int,Property> mTypeMap;
};
/*
- QListViewItem subclass to display/edit a folder on a groupware server.
+ TQListViewItem subclass to display/edit a folder on a groupware server.
Selection of default destinations will be done via radio items.
*/
class FolderListItem : public QCheckListItem
{
- typedef QCheckListItem super;
+ typedef TQCheckListItem super;
public:
FolderListItem( FolderListItem *parent, const KPIM::FolderLister::Entry &folder )
- : QCheckListItem( parent, folder.name, QCheckListItem::CheckBoxController ),
+ : TQCheckListItem( parent, folder.name, TQCheckListItem::CheckBoxController ),
mFolder( folder ), mFolderListView( parent?(parent->folderListView()):0 )
{
setOn( mFolder.active );
}
FolderListItem( FolderListView *listView, const KPIM::FolderLister::Entry &folder )
- : QCheckListItem( listView, folder.name,
- QCheckListItem::CheckBoxController ), mFolder( folder ), mFolderListView( listView )
+ : TQCheckListItem( listView, folder.name,
+ TQCheckListItem::CheckBoxController ), mFolder( folder ), mFolderListView( listView )
{
setOn( mFolder.active );
}
@@ -100,14 +100,14 @@ class FolderListItem : public QCheckListItem
}
/* reimp */
-// int width ( const QFontMetrics & fm, const QListView * lv, int c ) const;
+// int width ( const TQFontMetrics & fm, const TQListView * lv, int c ) const;
bool typeSupported( FolderListView::Property prop );
bool isDefault( FolderListView::Property prop );
void setDefault( FolderListView::Property prop, bool def = true );
/* calls changeProperty() if it makes sense considering pos. */
- void activate( int column, const QPoint &localPos );
+ void activate( int column, const TQPoint &localPos );
/* Sets this item as default for property p a */
void changeProperty( FolderListView::Property p );
@@ -115,7 +115,7 @@ class FolderListItem : public QCheckListItem
protected:
/* reimp */
- void paintCell(QPainter *p, const QColorGroup& cg, int col, int width, int align);
+ void paintCell(TQPainter *p, const TQColorGroup& cg, int col, int width, int align);
private:
KPIM::FolderLister::Entry mFolder;
diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp
index 07b8bc8fe..0942f8223 100644
--- a/kresources/lib/folderselectdialog.cpp
+++ b/kresources/lib/folderselectdialog.cpp
@@ -32,19 +32,19 @@
#include "folderselectdialog.h"
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
using namespace KPIM;
-FolderSelectDialog::FolderSelectDialog( const QString& caption, const QString& label,
- const QStringList& list )
+FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& label,
+ const TQStringList& list )
: KDialogBase(0, 0, true, caption, Ok, Ok, true)
{
- QFrame* frame = makeMainWidget();
- QVBoxLayout* layout = new QVBoxLayout( frame, 0, spacingHint() );
+ TQFrame* frame = makeMainWidget();
+ TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() );
- QLabel* labelWidget = new QLabel( label, frame );
+ TQLabel* labelWidget = new TQLabel( label, frame );
layout->addWidget( labelWidget );
mListBox = new KListBox( frame );
@@ -53,10 +53,10 @@ FolderSelectDialog::FolderSelectDialog( const QString& caption, const QString& l
mListBox->ensureCurrentVisible();
layout->addWidget( mListBox, 10 );
- connect( mListBox, SIGNAL( doubleClicked( QListBoxItem * ) ),
- SLOT( slotOk() ) );
- connect( mListBox, SIGNAL( returnPressed( QListBoxItem * ) ),
- SLOT( slotOk() ) );
+ connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ),
+ TQT_SLOT( slotOk() ) );
+ connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ),
+ TQT_SLOT( slotOk() ) );
mListBox->setFocus();
@@ -65,19 +65,19 @@ FolderSelectDialog::FolderSelectDialog( const QString& caption, const QString& l
setMinimumWidth( 320 );
}
-QString FolderSelectDialog::getItem( const QString &caption, const QString &label,
- const QStringList& list )
+TQString FolderSelectDialog::getItem( const TQString &caption, const TQString &label,
+ const TQStringList& list )
{
FolderSelectDialog dlg( caption, label, list );
- QString result;
+ TQString result;
if ( dlg.exec() == Accepted )
result = dlg.mListBox->currentText();
return result;
}
-void FolderSelectDialog::closeEvent(QCloseEvent *event)
+void FolderSelectDialog::closeEvent(TQCloseEvent *event)
{
event->ignore();
}
diff --git a/kresources/lib/folderselectdialog.h b/kresources/lib/folderselectdialog.h
index 2211b6f8f..a7879f9a0 100644
--- a/kresources/lib/folderselectdialog.h
+++ b/kresources/lib/folderselectdialog.h
@@ -40,15 +40,15 @@ namespace KPIM {
class FolderSelectDialog : public KDialogBase
{
private:
- FolderSelectDialog( const QString& caption, const QString& label,
- const QStringList& list );
+ FolderSelectDialog( const TQString& caption, const TQString& label,
+ const TQStringList& list );
public:
- static QString getItem( const QString& caption, const QString& label,
- const QStringList& list );
+ static TQString getItem( const TQString& caption, const TQString& label,
+ const TQStringList& list );
protected:
- virtual void closeEvent(QCloseEvent *event);
+ virtual void closeEvent(TQCloseEvent *event);
private:
KListBox* mListBox;
};
diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp
index aa83f4674..033ea81de 100644
--- a/kresources/lib/groupwaredataadaptor.cpp
+++ b/kresources/lib/groupwaredataadaptor.cpp
@@ -37,7 +37,7 @@ KURL GroupwareUploadItem::adaptNewItemUrl( GroupwareDataAdaptor *adaptor,
{
kdDebug()<<"GroupwareUploadItem::adaptNewItemUrl, baseurl=" << baseurl.url() << endl;
if ( adaptor ) {
- QString path( adaptor->defaultNewItemName( this ) );
+ TQString path( adaptor->defaultNewItemName( this ) );
kdDebug() << "path=" << path << endl;
KURL u( baseurl );
if ( path.isEmpty() ) return u;
@@ -54,7 +54,7 @@ KIO::TransferJob *GroupwareUploadItem::createRawUploadJob(
{
Q_ASSERT( adaptor );
if ( !adaptor ) return 0;
- const QString dta = data();
+ const TQString dta = data();
//kdDebug(7000) << "Uploading: " << data << endl;
KURL upUrl( url() );
if ( adaptor )
@@ -77,7 +77,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url()
KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
if ( job ) {
kdDebug() << "Adding If-None-Match " << endl;
- QString header;
+ TQString header;
if ( job->outgoingMetaData().contains("customHTTPHeader") ) {
header = job->outgoingMetaData()["customHTTPHeader"];
header += "\r\n";
@@ -95,7 +95,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadJob" << endl;
KIO::TransferJob *job = createRawUploadJob( adaptor, baseurl );
if ( job && adaptor ) {
kdDebug()<<"Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl;
- QString header;
+ TQString header;
if ( job->outgoingMetaData().contains("customHTTPHeader") ) {
header = job->outgoingMetaData()["customHTTPHeader"];
header += "\r\n";
@@ -110,7 +110,7 @@ kdDebug()<<"new HEADER: " << header << endl;
GroupwareDataAdaptor::GroupwareDataAdaptor()
- : QObject(), mFolderLister( 0 ), mIdMapper( 0 )
+ : TQObject(), mFolderLister( 0 ), mIdMapper( 0 )
{
}
@@ -153,14 +153,14 @@ kdDebug()<<"GroupwareDataAdaptor::createUploadNewJob, url=" << url.url() << endl
}
void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry,
- const QString &newFingerprint, KPIM::FolderLister::ContentType type )
+ const TQString &newFingerprint, KPIM::FolderLister::ContentType type )
{
bool download = false;
- const QString &location = entry.path();
+ const TQString &location = entry.path();
emit itemOnServer( entry );
// if not locally present, download
- const QString &localId = idMapper()->localId( location );
+ const TQString &localId = idMapper()->localId( location );
kdDebug(5800) << "Looking up remote: " << location
<< " found: " << localId << endl;
if ( localId.isEmpty() || !localItemExists( localId ) ) {
@@ -169,7 +169,7 @@ void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry,
} else {
kdDebug(5800) << "Locally present " << endl;
// locally present, let's check if it's newer than what we have
- const QString &oldFingerprint = idMapper()->fingerprint( localId );
+ const TQString &oldFingerprint = idMapper()->fingerprint( localId );
if ( oldFingerprint != newFingerprint ) {
kdDebug(5800) << "Fingerprint changed old: " << oldFingerprint <<
" new: " << newFingerprint << endl;
@@ -190,12 +190,12 @@ void GroupwareDataAdaptor::processDownloadListItem( const KURL &entry,
}
}
-bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const QString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const TQString &/*jobData*/ )
{
if ( !job ) return false;
KIO::DeleteJob *deljob = dynamic_cast<KIO::DeleteJob*>(job);
bool error = job->error();
- const QString err = job->errorString();
+ const TQString err = job->errorString();
if ( deljob ) {
KURL::List urls( deljob->urls() );
@@ -203,8 +203,8 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const QString &/*j
if ( error ) {
emit itemDeletionError( *it, err );
} else {
- // FIXME: Don't use QString::null here
- emit itemDeleted( QString::null, *it );
+ // FIXME: Don't use TQString::null here
+ emit itemDeleted( TQString::null, *it );
}
}
return true;
@@ -214,12 +214,12 @@ bool GroupwareDataAdaptor::interpretRemoveJob( KIO::Job *job, const QString &/*j
}
-bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const QString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ )
{
kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadJob " << endl;
KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job);
bool error = job->error();
- const QString err = job->errorString();
+ const TQString err = job->errorString();
if ( trfjob ) {
KURL url( trfjob->url() );
@@ -236,13 +236,13 @@ bool GroupwareDataAdaptor::interpretUploadJob( KIO::Job *job, const QString &/*j
}
}
-bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const QString &/*jobData*/ )
+bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ )
{
// TODO: How does the incidence mapper know the old/new ids???
kdDebug(7000) << "GroupwareDataAdaptor::interpretUploadNewJob " << endl;
KIO::TransferJob *trfjob = dynamic_cast<KIO::TransferJob*>(job);
bool error = job->error();
- const QString err = job->errorString();
+ const TQString err = job->errorString();
if ( trfjob ) {
KURL url( trfjob->url() );
@@ -259,18 +259,18 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const QString &
}
}
-QString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const
+TQString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const
{
kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
if ( mJobUIDMap.contains( job ) ) {
kdDebug()<<" Contained: "<< mJobUIDMap[job] << endl;
return mJobUIDMap[ job ];
} else {
- return QString::null;
+ return TQString::null;
}
}
-void GroupwareDataAdaptor::setUidForJob( KIO::Job *job, const QString &uid )
+void GroupwareDataAdaptor::setUidForJob( KIO::Job *job, const TQString &uid )
{
if ( uid.isEmpty() ) {
mJobUIDMap.remove( job );
diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h
index 5e7aec49e..52021a07b 100644
--- a/kresources/lib/groupwaredataadaptor.h
+++ b/kresources/lib/groupwaredataadaptor.h
@@ -26,9 +26,9 @@
#include <groupwareresourcejob.h>
#include <folderlister.h>
#include <kurl.h>
-#include <qstring.h>
+#include <tqstring.h>
#include <libkcal/listbase.h>
-#include <qobject.h>
+#include <tqobject.h>
#include <kdepimmacros.h>
@@ -59,14 +59,14 @@ class KDE_EXPORT GroupwareUploadItem
KURL url() const { return mUrl; }
void setUrl( const KURL &url ) { mUrl = url; }
- QString uid() const { return mUid; }
- void setUid( const QString &uid ) { mUid = uid; }
+ TQString uid() const { return mUid; }
+ void setUid( const TQString &uid ) { mUid = uid; }
- QString fingerprint() const { return mFingerprint; }
- void setFingerprint( const QString &fpr ) { mFingerprint = fpr; }
+ TQString fingerprint() const { return mFingerprint; }
+ void setFingerprint( const TQString &fpr ) { mFingerprint = fpr; }
- virtual QString data() const { return mData; }
- virtual void setData( const QString &data ) { mData = data; }
+ virtual TQString data() const { return mData; }
+ virtual void setData( const TQString &data ) { mData = data; }
virtual KURL adaptNewItemUrl( GroupwareDataAdaptor *adaptor,
const KURL &url );
@@ -81,9 +81,9 @@ class KDE_EXPORT GroupwareUploadItem
KPIM::FolderLister::ContentType mItemType;
private:
KURL mUrl;
- QString mUid;
- QString mData;
- QString mFingerprint;
+ TQString mUid;
+ TQString mData;
+ TQString mFingerprint;
UploadType mType;
};
@@ -108,14 +108,14 @@ Q_OBJECT
Set progress message shown by progress manager during download. It will
be interpreted as rich text, so it might have to be escaped.
*/
- void setDownloadProgressMessage( const QString &v )
+ void setDownloadProgressMessage( const TQString &v )
{
mDownloadProgressMessage = v;
}
/**
Get download progress message. See setDownloadProgressMessage().
*/
- QString downloadProgressMessage() const
+ TQString downloadProgressMessage() const
{
return mDownloadProgressMessage;
}
@@ -124,14 +124,14 @@ Q_OBJECT
Set progress message shown by progress manager during upload. It will
be interpreted as rich text, so it might have to be escaped.
*/
- void setUploadProgressMessage( const QString &v )
+ void setUploadProgressMessage( const TQString &v )
{
mUploadProgressMessage = v;
}
/**
Get upload progress message. See setUploadProgressMessage().
*/
- QString uploadProgressMessage() const
+ TQString uploadProgressMessage() const
{
return mUploadProgressMessage;
}
@@ -154,14 +154,14 @@ Q_OBJECT
/**
Set user name.
*/
- void setUser( const QString &v )
+ void setUser( const TQString &v )
{
mUser = v;
}
/**
Get user. See setUser().
*/
- QString user() const
+ TQString user() const
{
return mUser;
}
@@ -169,14 +169,14 @@ Q_OBJECT
/**
Set password of user.
*/
- void setPassword( const QString &v )
+ void setPassword( const TQString &v )
{
mPassword = v;
}
/**
Get password. See setPassword().
*/
- QString password() const
+ TQString password() const
{
return mPassword;
}
@@ -221,24 +221,24 @@ Q_OBJECT
virtual void customAdaptUploadUrl( KURL &/*url*/ ) {}
/** Return the mime-type expected by the resource. */
- virtual QString mimeType() const = 0;
+ virtual TQString mimeType() const = 0;
/** Identifier of the Resource. Used for the custom fields where
resource-specific information is stored. */
- virtual QCString identifier() const = 0;
+ virtual TQCString identifier() const = 0;
/** Returns whether the item with the given localId exists locally. */
- virtual bool localItemExists( const QString &localId ) = 0;
+ virtual bool localItemExists( const TQString &localId ) = 0;
/** Returns whether the item was changed locally since the last download
from the server. */
- virtual bool localItemHasChanged( const QString &localId ) = 0;
+ virtual bool localItemHasChanged( const TQString &localId ) = 0;
/** Remove the item from the local cache. */
- virtual void deleteItem( const QString &localId ) = 0;
+ virtual void deleteItem( const TQString &localId ) = 0;
/** Removed the changed flag for the item with the given uid. */
- virtual void clearChange( const QString &uid ) = 0;
+ virtual void clearChange( const TQString &uid ) = 0;
virtual FolderLister::Entry::List defaultFolders();
- virtual QValueList<FolderLister::ContentType> supportedTypes() = 0;
+ virtual TQValueList<FolderLister::ContentType> supportedTypes() = 0;
virtual bool supports( FolderLister::ContentType type ) {
return supportedTypes().contains( type );
}
@@ -248,13 +248,13 @@ Q_OBJECT
/** Creates the KIO::Job for logging in to the server. This is only
* called if the GroupwareDataAdaptor::GWResNeedsLogin flag is set
* for the resource. */
- virtual KIO::Job *createLoginJob( const KURL &, const QString &/*user*/,
- const QString &/*password*/ ) { return 0; }
+ virtual KIO::Job *createLoginJob( const KURL &, const TQString &/*user*/,
+ const TQString &/*password*/ ) { return 0; }
/** Creates the KIO::Job for logging off the server. This is only
* called if the GroupwareDataAdaptor::GWResNeedsLogoff flag is set
* for the resource. */
- virtual KIO::Job *createLogoffJob( const KURL &, const QString &/*user*/,
- const QString &/*password*/ ) { return 0; }
+ virtual KIO::Job *createLogoffJob( const KURL &, const TQString &/*user*/,
+ const TQString &/*password*/ ) { return 0; }
/** Creates the KIO::Job for listing all subfolders of the given url. */
virtual KIO::Job *createListFoldersJob ( const KURL & ) = 0;
/** Creates the KIO::TransferJob for listing all items in the given url. */
@@ -263,7 +263,7 @@ Q_OBJECT
virtual KIO::TransferJob *createDownloadJob( const KURL &,
FolderLister::ContentType ) = 0;
/** Creates the KIO::TransferJob for downloading a list of items items. */
- virtual KIO::TransferJob *createDownloadJob( const QMap<KURL,FolderLister::ContentType> & ) { return 0; }
+ virtual KIO::TransferJob *createDownloadJob( const TQMap<KURL,FolderLister::ContentType> & ) { return 0; }
/** Create the job to remove the deletedItems from the server. The base
URL of the server is passed as uploadurl. */
virtual KIO::Job *createRemoveJob( const KURL &,
@@ -298,21 +298,21 @@ Q_OBJECT
/** Extract the list of items on the server and the list of items to be
downloaded from the results of the job (the job was created by
createListitemsJob). */
- virtual bool interpretListItemsJob( KIO::Job *, const QString &jobData ) = 0;
- virtual bool interpretDownloadItemsJob( KIO::Job *job, const QString &jobData ) = 0;
- virtual bool interpretRemoveJob( KIO::Job *job, const QString &jobData );
- virtual bool interpretUploadJob( KIO::Job *job, const QString &/*jobData*/ );
- virtual bool interpretUploadNewJob( KIO::Job *job, const QString &/*jobData*/ );
+ virtual bool interpretListItemsJob( KIO::Job *, const TQString &jobData ) = 0;
+ virtual bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData ) = 0;
+ virtual bool interpretRemoveJob( KIO::Job *job, const TQString &jobData );
+ virtual bool interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ );
+ virtual bool interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ );
virtual void processDownloadListItem( const KURL &entry,
- const QString &newFingerprint, KPIM::FolderLister::ContentType type );
+ const TQString &newFingerprint, KPIM::FolderLister::ContentType type );
/** Return the default file name for a new item. */
- virtual QString defaultNewItemName( GroupwareUploadItem * )
+ virtual TQString defaultNewItemName( GroupwareUploadItem * )
{
- return QString::null;
+ return TQString::null;
}
- virtual QString uidFromJob( KIO::Job *job ) const;
- virtual void setUidForJob( KIO::Job *job, const QString &uid );
+ virtual TQString uidFromJob( KIO::Job *job ) const;
+ virtual void setUidForJob( KIO::Job *job, const TQString &uid );
enum {
@@ -328,7 +328,7 @@ Q_OBJECT
signals:
- void folderInfoRetrieved( const KURL &href, const QString &name,
+ void folderInfoRetrieved( const KURL &href, const TQString &name,
KPIM::FolderLister::ContentType );
void folderSubitemRetrieved( const KURL &, bool isFolder );
@@ -336,26 +336,26 @@ Q_OBJECT
/** passed the whole remote url (including hostname) to the receiver */
void itemOnServer( const KURL &remoteURL );
- void itemDownloaded( const QString &localID, const KURL &remoteURL,
- const QString &fingerprint );
- void itemDeleted( const QString &localID, const KURL &remoteURL );
- void itemUploaded( const QString &localID, const KURL &remoteURL );
- void itemUploadedNew( const QString &localID, const KURL &remoteURL );
+ void itemDownloaded( const TQString &localID, const KURL &remoteURL,
+ const TQString &fingerprint );
+ void itemDeleted( const TQString &localID, const KURL &remoteURL );
+ void itemUploaded( const TQString &localID, const KURL &remoteURL );
+ void itemUploadedNew( const TQString &localID, const KURL &remoteURL );
- void itemDownloadError( const KURL &remoteURL, const QString &error );
- void itemDeletionError( const KURL &remoteURL, const QString &error );
- void itemUploadError( const KURL &remoteURL, const QString &error );
- void itemUploadNewError( const QString &localID, const QString &error );
+ void itemDownloadError( const KURL &remoteURL, const TQString &error );
+ void itemDeletionError( const KURL &remoteURL, const TQString &error );
+ void itemUploadError( const KURL &remoteURL, const TQString &error );
+ void itemUploadNewError( const TQString &localID, const TQString &error );
private:
FolderLister *mFolderLister;
- QString mDownloadProgressMessage;
- QString mUploadProgressMessage;
+ TQString mDownloadProgressMessage;
+ TQString mUploadProgressMessage;
KURL mBaseURL;
- QString mUser;
- QString mPassword;
+ TQString mUser;
+ TQString mPassword;
KPIM::IdMapper *mIdMapper;
- QMap<KIO::Job*,QString> mJobUIDMap;
+ TQMap<KIO::Job*,TQString> mJobUIDMap;
};
}
diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp
index 7acc1cd03..7bfa804a7 100644
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@@ -59,21 +59,21 @@ void GroupwareDownloadJob::run()
mItemsForDownload.clear();
mCurrentlyOnServer.clear();
- connect( adaptor(), SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ),
- SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) );
- connect( adaptor(), SIGNAL( itemOnServer( const KURL & ) ),
- SLOT( slotItemOnServer( const KURL & ) ) );
- connect( adaptor(), SIGNAL( itemDownloaded( const QString &, const KURL &, const QString & ) ),
- SLOT( slotItemDownloaded( const QString &, const KURL &, const QString & ) ) );
- connect( adaptor(), SIGNAL( itemDownloadError( const KURL &, const QString & ) ),
- SLOT( slotItemDownloadError( const KURL &, const QString & ) ) );
+ 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 & ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(),
adaptor()->downloadProgressMessage() );
connect( mProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelLoad() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelLoad() ) );
listItems();
}
@@ -102,18 +102,18 @@ void GroupwareDownloadJob::listItems()
kdDebug(5800) << "OpenGroupware::listIncidences(): " << url << endl;
- mListItemsData = QString::null;
+ mListItemsData = TQString::null;
mListEventsJob = adaptor()->createListItemsJob( url );
- connect( mListEventsJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotListItemsResult( KIO::Job * ) ) );
- connect( mListEventsJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- SLOT( slotListItemsData( KIO::Job *, const QByteArray & ) ) );
+ connect( mListEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotListItemsResult( KIO::Job * ) ) );
+ connect( mListEventsJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotListItemsData( KIO::Job *, const TQByteArray & ) ) );
}
}
-void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const QByteArray &data )
+void GroupwareDownloadJob::slotListItemsData( KIO::Job *, const TQByteArray &data )
{
kdDebug(5800) << "OpenGroupware::slotListItemsData()" << endl;
@@ -135,7 +135,7 @@ void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job )
adaptor()->interpretListItemsJob( job, mListItemsData );
}
- mListItemsData = QString::null;
+ mListItemsData = TQString::null;
mListEventsJob = 0;
listItems();
@@ -143,13 +143,13 @@ void GroupwareDownloadJob::slotListItemsResult( KIO::Job *job )
void GroupwareDownloadJob::deleteIncidencesGoneFromServer()
{
- QMap<QString, QString> remoteIds( adaptor()->idMapper()->remoteIdMap() );
+ TQMap<TQString, TQString> remoteIds( adaptor()->idMapper()->remoteIdMap() );
KURL::List::ConstIterator it = mCurrentlyOnServer.begin();
while ( it != mCurrentlyOnServer.end() ) {
remoteIds.remove( (*it).path() );
++it;
}
- QMap<QString, QString>::ConstIterator it2;
+ TQMap<TQString, TQString>::ConstIterator it2;
for (it2 = remoteIds.begin(); it2 != remoteIds.end(); ++it2) {
adaptor()->deleteItem( remoteIds[ it2.key() ] );
}
@@ -170,27 +170,27 @@ void GroupwareDownloadJob::downloadItem()
success();
} else {
if ( adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResBatchRequest ) {
- mDownloadItemsData = QString::null;
+ mDownloadItemsData = TQString::null;
mDownloadJob = adaptor()->createDownloadJob( mItemsForDownload );
mItemsDownloading = mItemsForDownload;
mItemsForDownload.clear();
} else {
// Download the first item of the list
- QMap<KURL,KPIM::FolderLister::ContentType>::Iterator it = mItemsForDownload.begin();
+ TQMap<KURL,KPIM::FolderLister::ContentType>::Iterator it = mItemsForDownload.begin();
KURL href( it.key() );
KPIM::FolderLister::ContentType ctype = it.data();
mItemsDownloading.insert( it.key(), it.data() );
mItemsForDownload.remove( it.key() );
adaptor()->adaptDownloadUrl( href );
- mDownloadItemsData = QString::null;
+ mDownloadItemsData = TQString::null;
mDownloadJob = adaptor()->createDownloadJob( href, ctype );
}
- connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotDownloadItemResult( KIO::Job * ) ) );
- connect( mDownloadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- SLOT( slotDownloadItemData( KIO::Job *, const QByteArray & ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotDownloadItemResult( KIO::Job * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotDownloadItemData( KIO::Job *, const TQByteArray & ) ) );
}
}
@@ -211,17 +211,17 @@ void GroupwareDownloadJob::slotDownloadItemResult( KIO::Job *job )
mProgress->incCompletedItems();
mProgress->updateProgress();
}
- mDownloadItemsData = QString::null;
+ mDownloadItemsData = TQString::null;
mDownloadJob = 0;
downloadItem();
}
-void GroupwareDownloadJob::slotDownloadItemData( KIO::Job *, const QByteArray &data )
+void GroupwareDownloadJob::slotDownloadItemData( KIO::Job *, const TQByteArray &data )
{
kdDebug(5800) << "OpenGroupware::slotDownloadItemData()" << endl;
- mDownloadItemsData.append( QString::fromUtf8( data.data(), data.size() ) );
+ mDownloadItemsData.append( TQString::fromUtf8( data.data(), data.size() ) );
}
void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL,
@@ -246,7 +246,7 @@ kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")"
}
-void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const QString &/*error*/ )
+void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const TQString &/*error*/ )
{
// TODO: Error handling!
if ( mItemsDownloading.contains( remoteURL ) ) {
@@ -257,8 +257,8 @@ void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const Q
}
-void GroupwareDownloadJob::slotItemDownloaded( const QString &localID,
- const KURL &remoteURL, const QString &fingerprint )
+void GroupwareDownloadJob::slotItemDownloaded( const TQString &localID,
+ const KURL &remoteURL, const TQString &fingerprint )
{
kdDebug()<<"GroupwareDownloadJob::slotItemDownloaded( " << localID << ", " << remoteURL.url() << ", " << fingerprint << ")" << endl;
if ( mItemsForDownload.contains( remoteURL ) ) {
diff --git a/kresources/lib/groupwaredownloadjob.h b/kresources/lib/groupwaredownloadjob.h
index 236ed3d56..a52413bd2 100644
--- a/kresources/lib/groupwaredownloadjob.h
+++ b/kresources/lib/groupwaredownloadjob.h
@@ -24,7 +24,7 @@
#define KPIM_GROUPWAREDOWNLOADJOB_H
#include "groupwareresourcejob.h"
-#include <qstringlist.h>
+#include <tqstringlist.h>
namespace KIO {
class Job;
@@ -58,16 +58,16 @@ class GroupwareDownloadJob : public GroupwareJob
void cancelLoad();
void slotListItemsResult( KIO::Job * );
- void slotListItemsData( KIO::Job *, const QByteArray & );
+ void slotListItemsData( KIO::Job *, const TQByteArray & );
void slotDownloadItemResult( KIO::Job * );
- void slotDownloadItemData( KIO::Job *, const QByteArray & );
+ void slotDownloadItemData( KIO::Job *, const TQByteArray & );
void slotItemToDownload( const KURL &remoteURL,
KPIM::FolderLister::ContentType type );
void slotItemOnServer( const KURL &remoteURL );
- void slotItemDownloaded( const QString &localID, const KURL &remoteURL,
- const QString &fingerprint );
- void slotItemDownloadError( const KURL &remoteURL, const QString &error );
+ void slotItemDownloaded( const TQString &localID, const KURL &remoteURL,
+ const TQString &fingerprint );
+ void slotItemDownloadError( const KURL &remoteURL, const TQString &error );
private:
KURL::List mFoldersForDownload;
@@ -75,18 +75,18 @@ class GroupwareDownloadJob : public GroupwareJob
These pathes don't contain the server name! */
KURL::List mCurrentlyOnServer;
- QMap<KURL,KPIM::FolderLister::ContentType> mItemsForDownload;
- QMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloading;
- QMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloaded;
- QMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloadError;
+ TQMap<KURL,KPIM::FolderLister::ContentType> mItemsForDownload;
+ TQMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloading;
+ TQMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloaded;
+ TQMap<KURL,KPIM::FolderLister::ContentType> mItemsDownloadError;
KPIM::ProgressItem *mProgress;
KIO::TransferJob *mDownloadJob;
KIO::TransferJob *mListEventsJob;
- QString mListItemsData;
- QString mDownloadItemsData;
+ TQString mListItemsData;
+ TQString mDownloadItemsData;
};
}
diff --git a/kresources/lib/groupwareresourcejob.cpp b/kresources/lib/groupwareresourcejob.cpp
index 73c102c88..a0094f6a1 100644
--- a/kresources/lib/groupwareresourcejob.cpp
+++ b/kresources/lib/groupwareresourcejob.cpp
@@ -23,14 +23,14 @@
#include "groupwareresourcejob.h"
-#include <qtimer.h>
+#include <tqtimer.h>
using namespace KPIM;
GroupwareJob::GroupwareJob( GroupwareDataAdaptor *adaptor )
: mAdaptor( adaptor )
{
- QTimer::singleShot( 0, this, SLOT( run() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( run() ) );
}
bool GroupwareJob::error() const
@@ -38,18 +38,18 @@ bool GroupwareJob::error() const
return !mErrorString.isNull();
}
-QString GroupwareJob::errorString() const
+TQString GroupwareJob::errorString() const
{
return mErrorString;
}
void GroupwareJob::success()
{
- mErrorString = QString::null;
+ mErrorString = TQString::null;
emit( result( this ) );
}
-void GroupwareJob::error( const QString &errorString )
+void GroupwareJob::error( const TQString &errorString )
{
mErrorString = errorString;
emit( result( this ) );
diff --git a/kresources/lib/groupwareresourcejob.h b/kresources/lib/groupwareresourcejob.h
index 2520466ea..76cd2bbcd 100644
--- a/kresources/lib/groupwareresourcejob.h
+++ b/kresources/lib/groupwareresourcejob.h
@@ -23,8 +23,8 @@
#ifndef KPIM_GROUPWAREJOB_H
#define KPIM_GROUPWAREJOB_H
-#include <qobject.h>
-#include <qstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
#include "folderlister.h"
namespace KPIM {
@@ -42,7 +42,7 @@ class GroupwareJob : public QObject
GroupwareJob( GroupwareDataAdaptor *adaptor );
bool error() const;
- QString errorString() const;
+ TQString errorString() const;
virtual void kill() = 0;
@@ -51,7 +51,7 @@ class GroupwareJob : public QObject
protected:
void success();
- void error( const QString & );
+ void error( const TQString & );
GroupwareDataAdaptor *adaptor() { return mAdaptor; }
const GroupwareDataAdaptor *adaptor() const { return mAdaptor; }
@@ -59,7 +59,7 @@ class GroupwareJob : public QObject
virtual void run() = 0;
private:
- QString mErrorString;
+ TQString mErrorString;
GroupwareDataAdaptor *mAdaptor;
};
diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp
index bb3098fc2..e4d6cb131 100644
--- a/kresources/lib/groupwareuploadjob.cpp
+++ b/kresources/lib/groupwareuploadjob.cpp
@@ -33,8 +33,8 @@
#include <kurl.h>
#include <kio/job.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
#include <klocale.h>
using namespace KPIM;
@@ -52,22 +52,22 @@ void GroupwareUploadJob::run()
KPIM::ProgressManager::getUniqueID(),
adaptor()->uploadProgressMessage() );
connect( mUploadProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelSave() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelSave() ) );
- connect( adaptor(), SIGNAL( itemDeletionError( const KURL &, const QString & ) ),
- SLOT( slotItemDeleteError( const KURL &, const QString & ) ) );
- connect( adaptor(), SIGNAL( itemUploadError( const KURL &, const QString & ) ),
- SLOT( slotItemUploadError( const KURL &, const QString & ) ) );
- connect( adaptor(), SIGNAL( itemUploadNewError( const QString &, const QString & ) ),
- SLOT( slotItemUploadNewError( const QString &, const QString & ) ) );
+ 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(), SIGNAL( itemDeleted( const QString &, const KURL & ) ),
- SLOT( slotItemDeleted( const QString &, const KURL & ) ) );
- connect( adaptor(), SIGNAL( itemUploaded( const QString &, const KURL & ) ),
- SLOT( slotItemUploaded( const QString &, const KURL & ) ) );
- connect( adaptor(), SIGNAL( itemUploadedNew( const QString &, const KURL& ) ),
- SLOT( slotItemUploadedNew( const QString &, const KURL & ) ) );
+ 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 & ) ) );
mUploadProgress->setTotalItems( mAddedItems.size() + mChangedItems.size() +
@@ -81,7 +81,7 @@ void GroupwareUploadJob::deleteItem()
{
kdDebug(5800)<<"GroupwareUploadJob::deleteItem()"<<endl;
if ( mDeletedItems.isEmpty() ) {
- QTimer::singleShot( 0, this, SLOT( uploadItem() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) );
} else {
kdDebug(7000) << " Deleting " << mDeletedItems.size() << " items from the server " << endl;
@@ -101,11 +101,11 @@ kdDebug() << "Not using batch delete " << endl;
}
if ( mDeletionJob ) {
- mDeletionJobData = QString::null;
- connect( mDeletionJob, SIGNAL( result( KIO::Job* ) ),
- SLOT( slotDeletionJobResult( KIO::Job* ) ) );
-// connect( mDeletionJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
-// SLOT( slotDeletionJobData( KIO::Job *, const QByteArray & ) ) );
+ mDeletionJobData = TQString::null;
+ connect( mDeletionJob, TQT_SIGNAL( result( KIO::Job* ) ),
+ TQT_SLOT( slotDeletionJobResult( KIO::Job* ) ) );
+// connect( mDeletionJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+// TQT_SLOT( slotDeletionJobData( KIO::Job *, const TQByteArray & ) ) );
} else {
deleteItem();
}
@@ -114,7 +114,7 @@ kdDebug() << "Not using batch delete " << endl;
-void GroupwareUploadJob::slotDeletionJobData( KIO::Job *, const QByteArray &data )
+void GroupwareUploadJob::slotDeletionJobData( KIO::Job *, const TQByteArray &data )
{
kdDebug(5800) << "OpenGroupware::slotDeletionData()" << endl;
@@ -129,7 +129,7 @@ void GroupwareUploadJob::slotDeletionJobResult( KIO::Job *job )
adaptor()->interpretRemoveJob( job, mDeletionJobData );
}
mDeletionJob = 0;
- QTimer::singleShot( 0, this, SLOT( deleteItem() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( deleteItem() ) );
}
@@ -138,7 +138,7 @@ void GroupwareUploadJob::uploadItem()
{
kdDebug(5800)<<"GroupwareUploadJob::uploadItem()"<<endl;
if ( mChangedItems.isEmpty() ) {
- QTimer::singleShot( 0, this, SLOT( uploadNewItem() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) );
} else {
kdDebug(5800)<<"We still have "<<mChangedItems.count()<<" changed items to upload"<<endl;
@@ -158,11 +158,11 @@ kdDebug() << "Not using batch upload " << endl;
}
if ( mUploadJob ) {
- mUploadJobData = QString::null;
- connect( mUploadJob, SIGNAL( result( KIO::Job* ) ),
- SLOT( slotUploadJobResult( KIO::Job* ) ) );
- connect( mUploadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- SLOT( slotUploadJobData( KIO::Job *, const QByteArray & ) ) );
+ mUploadJobData = TQString::null;
+ connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
+ TQT_SLOT( slotUploadJobResult( KIO::Job* ) ) );
+ connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotUploadJobData( KIO::Job *, const TQByteArray & ) ) );
} else {
uploadItem();
}
@@ -170,7 +170,7 @@ kdDebug() << "Not using batch upload " << endl;
}
-void GroupwareUploadJob::slotUploadJobData( KIO::Job *, const QByteArray &data )
+void GroupwareUploadJob::slotUploadJobData( KIO::Job *, const TQByteArray &data )
{
kdDebug(5800) << "OpenGroupware::slotUploadData()" << endl;
@@ -185,7 +185,7 @@ void GroupwareUploadJob::slotUploadJobResult( KIO::Job *job )
adaptor()->interpretUploadJob( job, mUploadJobData );
}
mUploadJob = 0;
- QTimer::singleShot( 0, this, SLOT( uploadItem() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) );
}
@@ -216,11 +216,11 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
}
if ( mUploadJob ) {
- mUploadNewJobData = QString::null;
- connect( mUploadJob, SIGNAL( result( KIO::Job* ) ),
- SLOT( slotUploadNewJobResult( KIO::Job* ) ) );
- connect( mUploadJob, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
- SLOT( slotUploadNewJobData( KIO::Job *, const QByteArray & ) ) );
+ mUploadNewJobData = TQString::null;
+ connect( mUploadJob, TQT_SIGNAL( result( KIO::Job* ) ),
+ TQT_SLOT( slotUploadNewJobResult( KIO::Job* ) ) );
+ connect( mUploadJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
+ TQT_SLOT( slotUploadNewJobData( KIO::Job *, const TQByteArray & ) ) );
} else {
uploadNewItem();
}
@@ -231,7 +231,7 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
}
}
-void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const QByteArray &data )
+void GroupwareUploadJob::slotUploadNewJobData( KIO::Job *, const TQByteArray &data )
{
kdDebug(5800) << "OpenGroupware::slotUploadNewJobData()" << endl;
@@ -246,7 +246,7 @@ void GroupwareUploadJob::slotUploadNewJobResult( KIO::Job *job )
adaptor()->interpretUploadNewJob( job, mUploadNewJobData );
}
mUploadJob = 0;
- QTimer::singleShot( 0, this, SLOT( uploadNewItem() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) );
}
@@ -255,12 +255,12 @@ void GroupwareUploadJob::kill()
cancelSave();
}
-void GroupwareUploadJob::slotItemDeleted( const QString &/*localId*/, const KURL &remoteURL )
+void GroupwareUploadJob::slotItemDeleted( const TQString &/*localId*/, const KURL &remoteURL )
{
kdDebug() << "GroupwareUploadJob::slotItemDeleted, removal successful: "<< remoteURL.url() << endl;
- const QString &remote = remoteURL.path();
- const QString &local = adaptor()->idMapper()->localId( remote );
+ const TQString &remote = remoteURL.path();
+ const TQString &local = adaptor()->idMapper()->localId( remote );
if ( !local.isEmpty() ) {
// TODO: Is the deleted status reset in the resource?
adaptor()->deleteItem( local );
@@ -290,12 +290,12 @@ kdDebug()<<"Found it in the list!"<<endl;
-void GroupwareUploadJob::slotItemUploaded( const QString &/*localId*/, const KURL &remoteURL )
+void GroupwareUploadJob::slotItemUploaded( const TQString &/*localId*/, const KURL &remoteURL )
{
kdDebug() << "GroupwareUploadJob::slotItemUploaded, upload successful: "<< remoteURL.url() << endl;
- const QString &remote = remoteURL.path();
- const QString &local = adaptor()->idMapper()->localId( remote );
+ const TQString &remote = remoteURL.path();
+ const TQString &local = adaptor()->idMapper()->localId( remote );
if ( !local.isEmpty() ) {
// TODO: Is the deleted status reset in the resource?
// adaptor()->itemUploaded( local, remoteURL );
@@ -327,14 +327,14 @@ kdDebug()<<"Found it in the list!"<<endl;
}
-void GroupwareUploadJob::slotItemUploadedNew( const QString &localId, const KURL &remoteURL )
+void GroupwareUploadJob::slotItemUploadedNew( const TQString &localId, const KURL &remoteURL )
{
kdDebug() << "GroupwareUploadJob::slotItemUploadedNew, upload successful: "<< remoteURL.url() << endl;
- const QString &remote = remoteURL.path();
+ const TQString &remote = remoteURL.path();
// TODO: For a new item this won't return anything, so we need to insert the
// local<=>remote id map when creating the upload job... And maybe
- const QString &local = adaptor()->idMapper()->localId( remote );
+ const TQString &local = adaptor()->idMapper()->localId( remote );
if ( !localId.isEmpty() ) {
adaptor()->deleteItem( localId );
}
@@ -367,7 +367,7 @@ kdDebug()<<"Found it in the list!"<<endl;
}
}
-void GroupwareUploadJob::slotItemDeleteError( const KURL &remoteURL, const QString &/*error*/ )
+void GroupwareUploadJob::slotItemDeleteError( const KURL &remoteURL, const TQString &/*error*/ )
{
// TODO: Add to error list, remove from uploading and toUpload list
kdDebug() << "GroupwareUploadJob::slotItemDeleteError, removal not successful: "<< remoteURL.url() << endl;
@@ -393,7 +393,7 @@ kdDebug()<<"Found it in the list!"<<endl;
}
}
-void GroupwareUploadJob::slotItemUploadError( const KURL &remoteURL, const QString &/*error*/ )
+void GroupwareUploadJob::slotItemUploadError( const KURL &remoteURL, const TQString &/*error*/ )
{
// TODO: Add to error list, remove from uploading and toUpload list
kdDebug() << "GroupwareUploadJob::slotItemUploadError, removal not successful: "<< remoteURL.url() << endl;
@@ -419,7 +419,7 @@ kdDebug()<<"Found it in the list!"<<endl;
}
}
-void GroupwareUploadJob::slotItemUploadNewError( const QString &/*localID*/, const QString &remoteURL )
+void GroupwareUploadJob::slotItemUploadNewError( const TQString &/*localID*/, const TQString &remoteURL )
{
kdDebug(5006) << "GroupwareUploadJob::slotItemUploadNewError, removal not successful: "<< remoteURL << endl;
KPIM::GroupwareUploadItem::List allit( mAddedItems );
diff --git a/kresources/lib/groupwareuploadjob.h b/kresources/lib/groupwareuploadjob.h
index de87680f4..5edbca9b4 100644
--- a/kresources/lib/groupwareuploadjob.h
+++ b/kresources/lib/groupwareuploadjob.h
@@ -26,7 +26,7 @@
#include "groupwareresourcejob.h"
#include <kurl.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <groupwaredataadaptor.h>
namespace KIO {
@@ -88,19 +88,19 @@ class GroupwareUploadJob : public GroupwareJob
void cancelSave();
void slotDeletionJobResult( KIO::Job *job );
- void slotDeletionJobData( KIO::Job *, const QByteArray & );
+ void slotDeletionJobData( KIO::Job *, const TQByteArray & );
void slotUploadJobResult( KIO::Job *job );
- void slotUploadJobData( KIO::Job *, const QByteArray & );
+ void slotUploadJobData( KIO::Job *, const TQByteArray & );
void slotUploadNewJobResult( KIO::Job *job );
- void slotUploadNewJobData( KIO::Job *, const QByteArray & );
+ void slotUploadNewJobData( KIO::Job *, const TQByteArray & );
- void slotItemDeleted( const QString &localID, const KURL &remoteURL );
- void slotItemUploaded( const QString &localID, const KURL &remoteURL );
- void slotItemUploadedNew( const QString &localID, const KURL &remoteURL );
+ void slotItemDeleted( const TQString &localID, const KURL &remoteURL );
+ void slotItemUploaded( const TQString &localID, const KURL &remoteURL );
+ void slotItemUploadedNew( const TQString &localID, const KURL &remoteURL );
- void slotItemDeleteError( const KURL &remoteURL, const QString &error );
- void slotItemUploadError( const KURL &remoteURL, const QString &error );
- void slotItemUploadNewError( const QString &localID, const QString &error );
+ void slotItemDeleteError( const KURL &remoteURL, const TQString &error );
+ void slotItemUploadError( const KURL &remoteURL, const TQString &error );
+ void slotItemUploadNewError( const TQString &localID, const TQString &error );
void uploadCompleted();
@@ -113,9 +113,9 @@ class GroupwareUploadJob : public GroupwareJob
KPIM::GroupwareUploadItem::List mItemsUploaded;
KPIM::GroupwareUploadItem::List mItemsUploadError;
- QString mDeletionJobData;
- QString mUploadJobData;
- QString mUploadNewJobData;
+ TQString mDeletionJobData;
+ TQString mUploadJobData;
+ TQString mUploadNewJobData;
KIO::TransferJob *mUploadJob;
KIO::Job *mDeletionJob;
diff --git a/kresources/lib/kabc_resourcegroupwarebase.cpp b/kresources/lib/kabc_resourcegroupwarebase.cpp
index f087f4849..8af4cf837 100644
--- a/kresources/lib/kabc_resourcegroupwarebase.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebase.cpp
@@ -177,8 +177,8 @@ bool ResourceGroupwareBase::asyncLoad()
loadCache();
mDownloadJob = createDownloadJob( mAdaptor );
- connect( mDownloadJob, SIGNAL( result( KPIM::GroupwareJob * ) ),
- SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
return true;
}
@@ -212,8 +212,8 @@ bool ResourceGroupwareBase::asyncSave( Ticket* )
}
mUploadJob = createUploadJob( mAdaptor );
- connect( mUploadJob, SIGNAL( result( KPIM::GroupwareJob * ) ),
- SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
KABC::Addressee::List addr;
KABC::Addressee::List::Iterator it;
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
index 47b17ced5..803037342 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
@@ -32,43 +32,43 @@
#include <klineedit.h>
#include <kurlrequester.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
using namespace KABC;
-ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( QWidget* parent, const char* name )
+ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
- QGridLayout *mainLayout = new QGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "URL:" ), this );
+ TQLabel *label = new TQLabel( i18n( "URL:" ), this );
mURL = new KURLRequester( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mURL, 0, 1 );
- label = new QLabel( i18n( "User:" ), this );
+ label = new TQLabel( i18n( "User:" ), this );
mUser = new KLineEdit( this );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mUser, 1, 1 );
- label = new QLabel( i18n( "Password:" ), this );
+ label = new TQLabel( i18n( "Password:" ), this );
mPassword = new KLineEdit( this );
- mPassword->setEchoMode( QLineEdit::Password );
+ mPassword->setEchoMode( TQLineEdit::Password );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mPassword, 2, 1 );
- QFrame *hline = new QFrame( this );
- hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
+ TQFrame *hline = new TQFrame( this );
+ hline->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 );
mFolderConfig = new KPIM::FolderConfig( this );
- connect( mFolderConfig, SIGNAL( updateFoldersClicked() ),
- SLOT( updateFolders() ) );
+ connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ),
+ TQT_SLOT( updateFolders() ) );
mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 );
}
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.h b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
index ba2ae1715..68e8fc0af 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
@@ -41,7 +41,7 @@ class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceGroupwareBaseConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceGroupwareBaseConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KRES::Resource* );
diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp
index ea89dfa5d..808a16734 100644
--- a/kresources/lib/kcal_cachesettingsdlg.cpp
+++ b/kresources/lib/kcal_cachesettingsdlg.cpp
@@ -32,19 +32,19 @@
#include <klineedit.h>
#include <kdialog.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
using namespace KCal;
-CacheSettingsDialog::CacheSettingsDialog( QWidget* parent, const char* name )
+CacheSettingsDialog::CacheSettingsDialog( TQWidget* parent, const char* name )
: KDialogBase( parent, name, true, i18n("Resource Cache Settings"), KDialogBase::Close )
{
- QWidget *mainWidget = new QWidget( this );
+ TQWidget *mainWidget = new TQWidget( this );
setMainWidget( mainWidget );
- QGridLayout *mainLayout = new QGridLayout( mainWidget, 2, 2 );
+ TQGridLayout *mainLayout = new TQGridLayout( mainWidget, 2, 2 );
mainLayout->setSpacing( KDialog::spacingHint() );
mReloadConfig = new KCal::ResourceCachedReloadConfig( mainWidget );
diff --git a/kresources/lib/kcal_cachesettingsdlg.h b/kresources/lib/kcal_cachesettingsdlg.h
index 71ec6de28..e50b2cad4 100644
--- a/kresources/lib/kcal_cachesettingsdlg.h
+++ b/kresources/lib/kcal_cachesettingsdlg.h
@@ -43,7 +43,7 @@ class KDE_EXPORT CacheSettingsDialog : public KDialogBase
{
Q_OBJECT
public:
- CacheSettingsDialog( QWidget *parent = 0, const char *name = 0 );
+ CacheSettingsDialog( TQWidget *parent = 0, const char *name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp
index aaf471218..7499b224d 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebase.cpp
@@ -34,7 +34,7 @@
#include <kio/job.h>
#include <klocale.h>
-#include <qapplication.h>
+#include <tqapplication.h>
using namespace KCal;
@@ -195,8 +195,8 @@ bool ResourceGroupwareBase::doOpen()
return false;
} else {
mLoginFinished = false;
- connect( loginJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotLoginJobResult( KIO::Job* ) ) );
+ connect( loginJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotLoginJobResult( KIO::Job* ) ) );
enter_loop();
return mLoginFinished;
}
@@ -211,13 +211,13 @@ bool ResourceGroupwareBase::doOpen()
// Copyright (C) 1998 Matthias Ettrich (ettrich@kde.org)
// Copyright (C) 1999 David Faure (faure@kde.org)
// If a troll sees this, he kills me
-void qt_enter_modal( QWidget *widget );
-void qt_leave_modal( QWidget *widget );
+void qt_enter_modal( TQWidget *widget );
+void qt_leave_modal( TQWidget *widget );
void ResourceGroupwareBase::enter_loop()
{
- QWidget dummy(0,0,WType_Dialog | WShowModal);
- dummy.setFocusPolicy( QWidget::NoFocus );
+ TQWidget dummy(0,0,WType_Dialog | WShowModal);
+ dummy.setFocusPolicy( TQWidget::NoFocus );
qt_enter_modal(&dummy);
qApp->enter_loop();
qt_leave_modal(&dummy);
@@ -239,8 +239,8 @@ void ResourceGroupwareBase::doClose()
if ( adaptor() &&
adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) {
KIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() );
- connect( logoffJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotLogoffJobResult( KIO::Job* ) ) );
+ connect( logoffJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotLogoffJobResult( KIO::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, SIGNAL( result( KPIM::GroupwareJob * ) ),
- SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
return true;
}
@@ -322,8 +322,8 @@ bool ResourceGroupwareBase::doSave()
if ( !confirmSave() ) return false;
mUploadJob = createUploadJob( adaptor() );
- connect( mUploadJob, SIGNAL( result( KPIM::GroupwareJob * ) ),
- SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQT_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, SIGNAL( result( KPIM::GroupwareJob * ) ),
- SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
} else {
kdWarning() << k_funcinfo << "Download still in progress. "
"Can't happen. (TM)" << endl;
@@ -399,7 +399,7 @@ bool ResourceGroupwareBase::confirmSave()
dlg.addIncidences( deletedIncidences(), i18n("Deleted") );
int result = dlg.exec();
- return result == QDialog::Accepted;
+ return result == TQDialog::Accepted;
}
KABC::Lock *ResourceGroupwareBase::lock()
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
index 2b4bc81be..9ae91a0d8 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -35,48 +35,48 @@
#include <kdialog.h>
#include <kpushbutton.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qhbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqhbox.h>
using namespace KCal;
-ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( QWidget* parent,
+ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,
const char* name )
: KRES::ConfigWidget( parent, name )
{
resize( 245, 115 );
- QGridLayout *mainLayout = new QGridLayout( this, 2, 2 );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
mainLayout->setSpacing( KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n("URL:"), this );
+ TQLabel *label = new TQLabel( i18n("URL:"), this );
mainLayout->addWidget( label, 1, 0 );
mUrl = new KLineEdit( this );
mainLayout->addWidget( mUrl, 1, 1 );
- label = new QLabel( i18n("User:"), this );
+ label = new TQLabel( i18n("User:"), this );
mainLayout->addWidget( label, 2, 0 );
mUserEdit = new KLineEdit( this );
mainLayout->addWidget( mUserEdit, 2, 1 );
- label = new QLabel( i18n("Password:"), this );
+ label = new TQLabel( i18n("Password:"), this );
mainLayout->addWidget( label, 3, 0 );
mPasswordEdit = new KLineEdit( this );
mainLayout->addWidget( mPasswordEdit, 3, 1 );
mPasswordEdit->setEchoMode( KLineEdit::Password );
mFolderConfig = new KPIM::FolderConfig( this );
- connect( mFolderConfig, SIGNAL( updateFoldersClicked() ),
- SLOT( updateFolders() ) );
+ connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ),
+ TQT_SLOT( updateFolders() ) );
mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 );
- QHBox *hBox = new QHBox( this );
+ TQHBox *hBox = new TQHBox( this );
mCacheSettingsButton = new KPushButton( i18n("Configure Cache Settings..."), hBox );
mainLayout->addMultiCellWidget( hBox, 5, 5, 0, 1 );
- connect( mCacheSettingsButton, SIGNAL( clicked() ),
- SLOT( showCacheSettings() ) );
+ connect( mCacheSettingsButton, TQT_SIGNAL( clicked() ),
+ TQT_SLOT( showCacheSettings() ) );
mCacheDialog = new CacheSettingsDialog( this );
}
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.h b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
index a88afbc56..61e71b370 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -48,7 +48,7 @@ class KDE_EXPORT ResourceGroupwareBaseConfig : public KRES::ConfigWidget
{
Q_OBJECT
public:
- ResourceGroupwareBaseConfig( QWidget *parent = 0, const char *name = 0 );
+ ResourceGroupwareBaseConfig( TQWidget *parent = 0, const char *name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/lib/webdavhandler.cpp b/kresources/lib/webdavhandler.cpp
index e6c0a4937..fcf99a145 100644
--- a/kresources/lib/webdavhandler.cpp
+++ b/kresources/lib/webdavhandler.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
-#include <qdatetime.h>
+#include <tqdatetime.h>
extern "C" {
#include <ical.h>
@@ -56,39 +56,39 @@ KURL WebdavHandler::toDAV( const KURL& url )
-QDomElement WebdavHandler::addElement( QDomDocument &doc, QDomNode &node,
- const QString &tag, const QString &value )
+TQDomElement WebdavHandler::addElement( TQDomDocument &doc, TQDomNode &node,
+ const TQString &tag, const TQString &value )
{
- QDomElement el = doc.createElement( tag );
+ TQDomElement el = doc.createElement( tag );
node.appendChild( el );
if ( !value.isNull() ) {
- QDomText txt = doc.createTextNode( value );
+ TQDomText txt = doc.createTextNode( value );
el.appendChild( txt );
}
return el;
}
-QDomElement WebdavHandler::addElementNS( QDomDocument &doc, QDomNode &node,
- const QString &ns, const QString &tag, const QString &value )
+TQDomElement WebdavHandler::addElementNS( TQDomDocument &doc, TQDomNode &node,
+ const TQString &ns, const TQString &tag, const TQString &value )
{
- QDomElement el = doc.createElementNS( ns, tag );
+ TQDomElement el = doc.createElementNS( ns, tag );
node.appendChild( el );
if ( !value.isNull() ) {
- QDomText txt = doc.createTextNode( value );
+ TQDomText txt = doc.createTextNode( value );
el.appendChild( txt );
}
return el;
}
-QDomElement WebdavHandler::addDavElement( QDomDocument &doc, QDomNode &node,
- const QString &tag, const QString &value )
+TQDomElement WebdavHandler::addDavElement( TQDomDocument &doc, TQDomNode &node,
+ const TQString &tag, const TQString &value )
{
return addElementNS( doc, node, "DAV:", tag, value );
}
-bool WebdavHandler::extractBool( const QDomElement &node, const QString &entry, bool &value )
+bool WebdavHandler::extractBool( const TQDomElement &node, const TQString &entry, bool &value )
{
- QDomElement element = node.namedItem( entry ).toElement();
+ TQDomElement element = node.namedItem( entry ).toElement();
if ( !element.isNull() ) {
value = (element.text() != "0");
return true;
@@ -96,9 +96,9 @@ bool WebdavHandler::extractBool( const QDomElement &node, const QString &entry,
return false;
}
-bool WebdavHandler::extractLong( const QDomElement &node, const QString &entry, long &value )
+bool WebdavHandler::extractLong( const TQDomElement &node, const TQString &entry, long &value )
{
- QDomElement element = node.namedItem( entry ).toElement();
+ TQDomElement element = node.namedItem( entry ).toElement();
if ( !element.isNull() ) {
value = element.text().toLong();
return true;
@@ -106,9 +106,9 @@ bool WebdavHandler::extractLong( const QDomElement &node, const QString &entry,
return false;
}
-bool WebdavHandler::extractFloat( const QDomElement &node, const QString &entry, float &value )
+bool WebdavHandler::extractFloat( const TQDomElement &node, const TQString &entry, float &value )
{
- QDomElement element = node.namedItem( entry ).toElement();
+ TQDomElement element = node.namedItem( entry ).toElement();
if ( !element.isNull() ) {
value = element.text().toFloat();
return true;
@@ -116,19 +116,19 @@ bool WebdavHandler::extractFloat( const QDomElement &node, const QString &entry,
return false;
}
-bool WebdavHandler::extractDateTime( const QDomElement &node, const QString &entry, QDateTime &value )
+bool WebdavHandler::extractDateTime( const TQDomElement &node, const TQString &entry, TQDateTime &value )
{
- QDomElement element = node.namedItem( entry ).toElement();
+ TQDomElement element = node.namedItem( entry ).toElement();
if ( !element.isNull() && !element.text().isEmpty() ) {
- value = QDateTime::fromString( element.text(), Qt::ISODate );
+ value = TQDateTime::fromString( element.text(), Qt::ISODate );
return true;
}
return false;
}
-bool WebdavHandler::extractString( const QDomElement &node, const QString &entry, QString &value )
+bool WebdavHandler::extractString( const TQDomElement &node, const TQString &entry, TQString &value )
{
- QDomElement element = node.namedItem( entry ).toElement();
+ TQDomElement element = node.namedItem( entry ).toElement();
if ( !element.isNull() ) {
value = element.text();
return true;
@@ -136,14 +136,14 @@ bool WebdavHandler::extractString( const QDomElement &node, const QString &entry
return false;
}
-bool WebdavHandler::extractStringList( const QDomElement &node, const QString &entry, QStringList &value )
+bool WebdavHandler::extractStringList( const TQDomElement &node, const TQString &entry, TQStringList &value )
{
- QDomElement element = node.namedItem( entry ).toElement();
+ TQDomElement element = node.namedItem( entry ).toElement();
if ( !element.isNull() ) {
value.clear();
- QDomNodeList list = element.elementsByTagNameNS( "xml:", "v" );
+ TQDomNodeList list = element.elementsByTagNameNS( "xml:", "v" );
for( uint i=0; i < list.count(); i++ ) {
- QDomElement item = list.item(i).toElement();
+ TQDomElement item = list.item(i).toElement();
value.append( item.text() );
}
return true;
@@ -152,20 +152,20 @@ bool WebdavHandler::extractStringList( const QDomElement &node, const QString &e
}
-const QString WebdavHandler::getEtagFromHeaders( const QString& headers )
+const TQString WebdavHandler::getEtagFromHeaders( const TQString& headers )
{
int start = headers.find( "etag:", 0, false );
- if ( start < 0 ) return QString();
+ if ( start < 0 ) return TQString();
start += 6;
return headers.mid( start, headers.find( "\n", start ) - start );
}
//TODO: should not call libical functions directly -- better to make
// a new libkcal abstraction method.
-QDateTime WebdavHandler::utcAsZone( const QDateTime& utc, const QString& timeZoneId )
+TQDateTime WebdavHandler::utcAsZone( const TQDateTime& utc, const TQString& timeZoneId )
{
int daylight;
- QDateTime epoch;
+ TQDateTime epoch;
epoch.setTime_t( 0 );
time_t v = epoch.secsTo( utc );
struct icaltimetype tt =
@@ -180,10 +180,10 @@ kdDebug() << "Calculated offset of: " << offset << " of timezone: " << timeZoneI
//TODO: should not call libical functions directly -- better to make
// a new libkcal abstraction method.
-QDateTime WebdavHandler::zoneAsUtc( const QDateTime& zone, const QString& timeZoneId )
+TQDateTime WebdavHandler::zoneAsUtc( const TQDateTime& zone, const TQString& timeZoneId )
{
int daylight;
- QDateTime epoch;
+ TQDateTime epoch;
epoch.setTime_t( 0 );
time_t v = epoch.secsTo( zone );
struct icaltimetype tt = icaltime_from_timet( v, 0 ); // 0: is_date=false
diff --git a/kresources/lib/webdavhandler.h b/kresources/lib/webdavhandler.h
index cdf616e9c..668f99fdd 100644
--- a/kresources/lib/webdavhandler.h
+++ b/kresources/lib/webdavhandler.h
@@ -22,10 +22,10 @@
#ifndef WEBDAVHANDLER_H
#define WEBDAVHANDLER_H
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdom.h>
-#include <qdatetime.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdom.h>
+#include <tqdatetime.h>
#include <kurl.h>
#include <kdepimmacros.h>
@@ -37,42 +37,42 @@ class KDE_EXPORT WebdavHandler
static KURL toDAV( const KURL& url );
- static QDomElement addElementNS( QDomDocument &doc, QDomNode &node,
- const QString &ns, const QString &tag,
- const QString &value = QString::null );
- static QDomElement addElement( QDomDocument &, QDomNode &,
- const QString &tag, const QString &value = QString::null );
- static QDomElement addDavElement( QDomDocument &, QDomNode &,
- const QString &tag, const QString &value = QString::null );
+ static TQDomElement addElementNS( TQDomDocument &doc, TQDomNode &node,
+ const TQString &ns, const TQString &tag,
+ const TQString &value = TQString::null );
+ static TQDomElement addElement( TQDomDocument &, TQDomNode &,
+ const TQString &tag, const TQString &value = TQString::null );
+ static TQDomElement addDavElement( TQDomDocument &, TQDomNode &,
+ const TQString &tag, const TQString &value = TQString::null );
- static bool extractBool( const QDomElement &node,
- const QString &entry, bool &value );
- static bool extractLong( const QDomElement &node,
- const QString &entry, long &value );
- static bool extractFloat( const QDomElement &node,
- const QString &entry, float &value );
- static bool extractDateTime( const QDomElement &node,
- const QString &entry, QDateTime &value );
- static bool extractString( const QDomElement &node,
- const QString &entry, QString &value );
- static bool extractStringList( const QDomElement &node,
- const QString &entry, QStringList &value );
+ static bool extractBool( const TQDomElement &node,
+ const TQString &entry, bool &value );
+ static bool extractLong( const TQDomElement &node,
+ const TQString &entry, long &value );
+ static bool extractFloat( const TQDomElement &node,
+ const TQString &entry, float &value );
+ static bool extractDateTime( const TQDomElement &node,
+ const TQString &entry, TQDateTime &value );
+ static bool extractString( const TQDomElement &node,
+ const TQString &entry, TQString &value );
+ static bool extractStringList( const TQDomElement &node,
+ const TQString &entry, TQStringList &value );
/**
* Returns the value of the "etag" header if it can be found in the headers.
*/
- static const QString getEtagFromHeaders( const QString& );
+ static const TQString getEtagFromHeaders( const TQString& );
/**
* Return the representation of utc time in the time zone indicated by timeZoneId
*/
- static QDateTime utcAsZone( const QDateTime& utc, const QString& timeZoneId );
+ static TQDateTime utcAsZone( const TQDateTime& utc, const TQString& timeZoneId );
/**
* Return the UTC representation of local time in the time zone indicated by timeZoneId
*/
- static QDateTime zoneAsUtc( const QDateTime& zone, const QString& timeZoneId );
+ static TQDateTime zoneAsUtc( const TQDateTime& zone, const TQString& timeZoneId );
};
#endif
diff --git a/kresources/newexchange/exchangeaddressbookadaptor.cpp b/kresources/newexchange/exchangeaddressbookadaptor.cpp
index 469d15c36..423ac75a7 100644
--- a/kresources/newexchange/exchangeaddressbookadaptor.cpp
+++ b/kresources/newexchange/exchangeaddressbookadaptor.cpp
@@ -82,9 +82,9 @@ void ExchangeAddressBookAdaptor::customAdaptUploadUrl( KURL &url )
// url.setPath( url.path() + "/NewItem.EML" );
}
-QString ExchangeAddressBookAdaptor::defaultNewItemName( KPIM::GroupwareUploadItem *item ) {
+TQString ExchangeAddressBookAdaptor::defaultNewItemName( KPIM::GroupwareUploadItem *item ) {
if ( item ) return item->uid()+".EML";
- else return QString::null;
+ else return TQString::null;
}
diff --git a/kresources/newexchange/exchangeaddressbookadaptor.h b/kresources/newexchange/exchangeaddressbookadaptor.h
index 7d340bfb9..2d3df7420 100644
--- a/kresources/newexchange/exchangeaddressbookadaptor.h
+++ b/kresources/newexchange/exchangeaddressbookadaptor.h
@@ -31,7 +31,7 @@
#include <kabc/addressee.h>
#include <kurl.h>
-#include <qdom.h>
+#include <tqdom.h>
namespace KABC {
@@ -47,7 +47,7 @@ class ExchangeAddressBookUploadItem : public KPIM::GroupwareUploadItem
protected:
ExchangeAddressBookUploadItem( UploadType type ) : KPIM::GroupwareUploadItem( type ) {}
- QDomDocument mDavData;
+ TQDomDocument mDavData;
};
class ExchangeAddressBookAdaptor : public DavAddressBookAdaptor
@@ -57,9 +57,9 @@ class ExchangeAddressBookAdaptor : public DavAddressBookAdaptor
void customAdaptDownloadUrl( KURL &url );
void customAdaptUploadUrl( KURL &url );
- QString mimeType() const { return "message/rfc822"; }
- QCString identifier() const { return "KABCResourceExchange"; }
- QString defaultNewItemName( KPIM::GroupwareUploadItem *item );
+ TQString mimeType() const { return "message/rfc822"; }
+ TQCString identifier() const { return "KABCResourceExchange"; }
+ TQString defaultNewItemName( KPIM::GroupwareUploadItem *item );
long flags() const { return GWResBatchDelete; }
@@ -77,9 +77,9 @@ class ExchangeAddressBookAdaptor : public DavAddressBookAdaptor
// Interpreting Jobs
- bool interpretListItemsJob( KIO::Job *job, const QString &jobData )
+ bool interpretListItemsJob( KIO::Job *job, const TQString &jobData )
{ return ExchangeGlobals::interpretListItemsJob( this, job, jobData ); }
- bool interpretDownloadItemsJob( KIO::Job *job, const QString &jobData )
+ bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
{ return ExchangeGlobals::interpretAddressBookDownloadItemsJob( this, job, jobData ); }
@@ -91,9 +91,9 @@ class ExchangeAddressBookAdaptor : public DavAddressBookAdaptor
- bool getFolderHasSubs( const QDomNode &folderNode )
+ bool getFolderHasSubs( const TQDomNode &folderNode )
{ return ExchangeGlobals::getFolderHasSubs( folderNode ); }
- KPIM::FolderLister::ContentType getContentType( const QDomNode &folderNode )
+ KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode )
{ return ExchangeGlobals::getContentType( folderNode ); }
};
diff --git a/kresources/newexchange/exchangecalendaradaptor.cpp b/kresources/newexchange/exchangecalendaradaptor.cpp
index 254eb4da1..ceec4412b 100644
--- a/kresources/newexchange/exchangecalendaradaptor.cpp
+++ b/kresources/newexchange/exchangecalendaradaptor.cpp
@@ -98,9 +98,9 @@ void ExchangeCalendarAdaptor::customAdaptUploadUrl( KURL &url )
/* Removing items: old version of the exchange resource: If the event is part
of a sequence of recurring event, we need to delete the master!
-void ExchangeDelete::findUidSingleMaster( QString const& uid )
+void ExchangeDelete::findUidSingleMaster( TQString const& uid )
{
- QString query =
+ TQString query =
"SELECT \"DAV:href\", \"urn:schemas:calendar:uid\"\r\n"
"FROM Scope('shallow traversal of \"\"')\r\n"
"WHERE \"urn:schemas:calendar:uid\" = '" + uid + "'\r\n"
@@ -109,15 +109,15 @@ void ExchangeDelete::findUidSingleMaster( QString const& uid )
KIO::DavJob* job = KIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
job->setWindow( mWindow );
- connect(job, SIGNAL(result( KIO::Job * )), this, SLOT(slotFindUidResult(KIO::Job *)));
+ connect(job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFindUidResult(KIO::Job *)));
}
*/
-QString ExchangeCalendarAdaptor::defaultNewItemName( KPIM::GroupwareUploadItem *item ) {
+TQString ExchangeCalendarAdaptor::defaultNewItemName( KPIM::GroupwareUploadItem *item ) {
if ( item ) return item->uid()+".EML";
- else return QString::null;
+ else return TQString::null;
}
KPIM::GroupwareUploadItem *ExchangeCalendarAdaptor::newUploadItem( KCal::Incidence*it,
@@ -126,19 +126,19 @@ KPIM::GroupwareUploadItem *ExchangeCalendarAdaptor::newUploadItem( KCal::Inciden
return new ExchangeCalendarUploadItem( this, it, type );
}
-bool ExchangeCalendarAdaptor::interpretUploadJob( KIO::Job *job, const QString &/*jobData*/ )
+bool ExchangeCalendarAdaptor::interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ )
{
kdDebug(7000) << "ExchangeCalendarAdaptor::interpretUploadJob " << endl;
KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
bool error = job->error();
- const QString err = job->errorString();
+ const TQString err = job->errorString();
if ( davjob ) {
if ( error ) {
emit itemUploadError( davjob->url(), err );
return false;
} else {
- QDomDocument doc( davjob->response() );
+ TQDomDocument doc( davjob->response() );
// TODO: extract the href and the items that got a 404. If there's
// something important among them, issue the "usual" not-all-settings-uploaded
// warning to the user.
@@ -153,20 +153,20 @@ bool ExchangeCalendarAdaptor::interpretUploadJob( KIO::Job *job, const QString &
}
}
-bool ExchangeCalendarAdaptor::interpretUploadNewJob( KIO::Job *job, const QString &/*jobData*/ )
+bool ExchangeCalendarAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ )
{
// TODO: How does the incidence mapper know the old/new ids???
kdDebug(7000) << "ExchangeCalendarAdaptor::interpretUploadNewJob " << endl;
KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
bool error = job->error();
- const QString err = job->errorString();
+ const TQString err = job->errorString();
if ( davjob ) {
if ( error ) {
emit itemUploadNewError( idMapper()->localId( davjob->url().path() ), err );
return false;
} else {
- QDomDocument doc( davjob->response() );
+ TQDomDocument doc( davjob->response() );
// TODO: extract the href and the items that got a 404. If there's
// something important among them, issue the "usual" not-all-settings-uploaded
// warning to the user.
diff --git a/kresources/newexchange/exchangecalendaradaptor.h b/kresources/newexchange/exchangecalendaradaptor.h
index 7e772302d..08bad45f0 100644
--- a/kresources/newexchange/exchangecalendaradaptor.h
+++ b/kresources/newexchange/exchangecalendaradaptor.h
@@ -27,7 +27,7 @@
#include <groupwareresourcejob.h>
#include <davcalendaradaptor.h>
#include <kurl.h>
-#include <qdom.h>
+#include <tqdom.h>
namespace KCal {
@@ -45,7 +45,7 @@ class ExchangeCalendarUploadItem : public KPIM::GroupwareUploadItem
protected:
ExchangeCalendarUploadItem( UploadType type ) : KPIM::GroupwareUploadItem( type ) {}
- QDomDocument mDavData;
+ TQDomDocument mDavData;
};
class ExchangeCalendarAdaptor : public DavCalendarAdaptor
@@ -55,9 +55,9 @@ class ExchangeCalendarAdaptor : public DavCalendarAdaptor
void customAdaptDownloadUrl( KURL &url );
void customAdaptUploadUrl( KURL &url );
- QString mimeType() const { return "message/rfc822"; }
- QCString identifier() const { return "KCalResourceExchange"; }
- QString defaultNewItemName( KPIM::GroupwareUploadItem *item );
+ TQString mimeType() const { return "message/rfc822"; }
+ TQCString identifier() const { return "KCalResourceExchange"; }
+ TQString defaultNewItemName( KPIM::GroupwareUploadItem *item );
long flags() const { return GWResBatchDelete; }
@@ -74,12 +74,12 @@ class ExchangeCalendarAdaptor : public DavCalendarAdaptor
// Interpreting Jobs
- bool interpretListItemsJob( KIO::Job *job, const QString &jobData )
+ bool interpretListItemsJob( KIO::Job *job, const TQString &jobData )
{ return ExchangeGlobals::interpretListItemsJob( this, job, jobData ); }
- bool interpretDownloadItemsJob( KIO::Job *job, const QString &jobData )
+ bool interpretDownloadItemsJob( KIO::Job *job, const TQString &jobData )
{ return ExchangeGlobals::interpretCalendarDownloadItemsJob( this, job, jobData ); }
- bool interpretUploadJob( KIO::Job *job, const QString &/*jobData*/ );
- bool interpretUploadNewJob( KIO::Job *job, const QString &/*jobData*/ );
+ bool interpretUploadJob( KIO::Job *job, const TQString &/*jobData*/ );
+ bool interpretUploadNewJob( KIO::Job *job, const TQString &/*jobData*/ );
@@ -88,9 +88,9 @@ class ExchangeCalendarAdaptor : public DavCalendarAdaptor
- bool getFolderHasSubs( const QDomNode &folderNode )
+ bool getFolderHasSubs( const TQDomNode &folderNode )
{ return ExchangeGlobals::getFolderHasSubs( folderNode ); }
- KPIM::FolderLister::ContentType getContentType( const QDomNode &folderNode )
+ KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode )
{ return ExchangeGlobals::getContentType( folderNode ); }
};
diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp
index bc0481daf..be32291be 100644
--- a/kresources/newexchange/exchangeconvertercalendar.cpp
+++ b/kresources/newexchange/exchangeconvertercalendar.cpp
@@ -56,7 +56,7 @@ ExchangeConverterCalendar::ExchangeConverterCalendar()
{
}
-void ExchangeConverterCalendar::setTimeZone( const QString &id )
+void ExchangeConverterCalendar::setTimeZone( const TQString &id )
{
// kdDebug() << "Setting timezone to: " << id << endl;
mFormat.setTimeZone( id, true );
@@ -75,7 +75,7 @@ void ExchangeConverterCalendar::setTimeZone( const QString &id )
#define property( prop ) \
WebdavHandler::addElement( doc, root, prop )
-void ExchangeConverterCalendar::createRequestIncidence( QDomDocument &doc, QDomElement &root )
+void ExchangeConverterCalendar::createRequestIncidence( TQDomDocument &doc, TQDomElement &root )
{
propertyDAV( "contentclass" );
propertyDAV( "getcontenttype" );
@@ -98,10 +98,10 @@ void ExchangeConverterCalendar::createRequestIncidence( QDomDocument &doc, QDomE
propertyHTTPMail( "hasattachment" );
}
-void ExchangeConverterCalendar::createRequestAppointment( QDomDocument &doc, QDomElement &root )
+void ExchangeConverterCalendar::createRequestAppointment( TQDomDocument &doc, TQDomElement &root )
{
createRequestIncidence( doc, root );
- QDomAttr att_c = doc.createAttribute( "xmlns:c" );
+ TQDomAttr att_c = doc.createAttribute( "xmlns:c" );
att_c.setValue( "urn:schemas:calendar:" );
doc.documentElement().setAttributeNode( att_c );
propertyCalendar( "uid" );
@@ -132,17 +132,17 @@ void ExchangeConverterCalendar::createRequestAppointment( QDomDocument &doc, QDo
#define propertyTask2( prop ) \
WebdavHandler::addElement( doc, props, "t2:"prop )
-void ExchangeConverterCalendar::createRequestTask( QDomDocument &doc, QDomElement &props )
+void ExchangeConverterCalendar::createRequestTask( TQDomDocument &doc, TQDomElement &props )
{
createRequestIncidence( doc, props );
- QDomElement root = doc.documentElement();
+ TQDomElement root = doc.documentElement();
- QDomAttr att_t1 = doc.createAttribute( "xmlns:t1" );
+ TQDomAttr att_t1 = doc.createAttribute( "xmlns:t1" );
att_t1.setValue( TaskNamespace1 );
root.setAttributeNode( att_t1 );
- QDomAttr att_t2 = doc.createAttribute( "xmlns:t2" );
+ TQDomAttr att_t2 = doc.createAttribute( "xmlns:t2" );
att_t2.setValue( TaskNamespace2 );
root.setAttributeNode( att_t2 );
@@ -169,7 +169,7 @@ void ExchangeConverterCalendar::createRequestTask( QDomDocument &doc, QDomElemen
#undef propertyTask1
#undef propertyTask2
-void ExchangeConverterCalendar::createRequestJournal( QDomDocument &doc, QDomElement &root )
+void ExchangeConverterCalendar::createRequestJournal( TQDomDocument &doc, TQDomElement &root )
{
createRequestIncidence( doc, root );
propertyDAV( "uid" );
@@ -183,21 +183,21 @@ void ExchangeConverterCalendar::createRequestJournal( QDomDocument &doc, QDomEle
#undef propertyMailHeader
#undef property
-bool ExchangeConverterCalendar::readTZ( const QDomElement &node, Incidence */*incidence*/ )
+bool ExchangeConverterCalendar::readTZ( const TQDomElement &node, Incidence */*incidence*/ )
{
- QString timezoneid;
+ TQString timezoneid;
if ( WebdavHandler::extractString( node, "timezoneid", timezoneid ) ) {
// kdDebug() << "DEBUG: timezoneid = " << timezoneid << endl;
}
- QString timezone;
+ TQString timezone;
if ( WebdavHandler::extractString( node, "timezone", timezone ) ) {
// kdDebug() << "DEBUG: timezone = " << timezone << endl;
}
// TODO:
/* // mFormat is used for parsing recurrence rules.
- QString localTimeZoneId;
+ TQString localTimeZoneId;
if ( mCalendar ) {
mFormat.setTimeZone( mCalendar->timeZoneId(), !mCalendar->isLocalTime() );
localTimeZoneId = mCalendar->timeZoneId();
@@ -209,14 +209,14 @@ bool ExchangeConverterCalendar::readTZ( const QDomElement &node, Incidence */*in
return true;
}
-bool ExchangeConverterCalendar::readIncidence( const QDomElement &node, Incidence *incidence )
+bool ExchangeConverterCalendar::readIncidence( const TQDomElement &node, Incidence *incidence )
{
kdDebug()<<"ExchangeConverterCalendar::readIncidencd"<<endl;
- QDateTime tmpdt;
+ TQDateTime tmpdt;
bool tmpbool;
- QString tmpstr;
+ TQString tmpstr;
long tmplng;
- QStringList tmplst;
+ TQStringList tmplst;
readTZ( node, incidence );
@@ -264,9 +264,9 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidencd"<<endl;
if ( WebdavHandler::extractString( node, "from", tmpstr ) )
incidence->setOrganizer( tmpstr );
if ( WebdavHandler::extractString( node, "to", tmpstr ) ) {
- QStringList atts( KPIM::splitEmailAddrList( tmpstr ) );
- for ( QStringList::Iterator it = atts.begin(); it != atts.end(); ++it ) {
- QString name, email;
+ TQStringList atts( KPIM::splitEmailAddrList( tmpstr ) );
+ for ( TQStringList::Iterator it = atts.begin(); it != atts.end(); ++it ) {
+ TQString name, email;
KPIM::getNameAndMail( *it, name, email );
Attendee *att = new Attendee( name, email );
att->setRole( KCal::Attendee::ReqParticipant );
@@ -279,9 +279,9 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidencd"<<endl;
}
}
if ( WebdavHandler::extractString( node, "cc", tmpstr ) ) {
- QStringList atts( KPIM::splitEmailAddrList( tmpstr ) );
- for ( QStringList::Iterator it = atts.begin(); it != atts.end(); ++it ) {
- QString name, email;
+ TQStringList atts( KPIM::splitEmailAddrList( tmpstr ) );
+ for ( TQStringList::Iterator it = atts.begin(); it != atts.end(); ++it ) {
+ TQString name, email;
KPIM::getNameAndMail( *it, name, email );
Attendee *att = new Attendee( name, email );
att->setRole( KCal::Attendee::OptParticipant );
@@ -298,10 +298,10 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidencd"<<endl;
}
/* FIXME: Handle recurrences
-void ExchangeDownload::handleRecurrence( QString uid )
+void ExchangeDownload::handleRecurrence( TQString uid )
{
// kdDebug() << "Handling recurrence info for uid=" << uid << endl;
- QString query =
+ TQString query =
"SELECT \"DAV:href\", \"urn:schemas:calendar:instancetype\"\r\n"
"FROM Scope('shallow traversal of \"\"')\r\n"
"WHERE \"urn:schemas:calendar:uid\" = '" + uid + "'\r\n"
@@ -314,18 +314,18 @@ void ExchangeDownload::handleRecurrence( QString uid )
query, false );
KIO::Scheduler::scheduleJob( job );
job->setWindow( mWindow );
- connect( job, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotMasterResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotMasterResult( KIO::Job * ) ) );
}
*/
-bool ExchangeConverterCalendar::readEvent( const QDomElement &node, Event *event )
+bool ExchangeConverterCalendar::readEvent( const TQDomElement &node, Event *event )
{
if ( !readIncidence( node, event ) ) return false;
kdDebug()<<"ExchangeConverterCalendar::readEvent"<<endl;
- QDateTime tmpdt;
- QString tmpstr;
+ TQDateTime tmpdt;
+ TQString tmpstr;
long tmplng;
bool tmpbool;
@@ -405,19 +405,19 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
}
}
- QStringList tmplst;
+ TQStringList tmplst;
if ( WebdavHandler::extractStringList( node, "exdate", tmplst ) ) {
- QStringList::Iterator it = tmplst.begin();
+ TQStringList::Iterator it = tmplst.begin();
KCal::DateList exdates;
for ( ; it != tmplst.end(); ++it ) {
- exdates.append( /*utcAsZone(*/ QDateTime::fromString( *it, Qt::ISODate )/*,
+ exdates.append( /*utcAsZone(*/ TQDateTime::fromString( *it, Qt::ISODate )/*,
localTimeZoneId )*/.date() );
}
event->recurrence()->setExDates( exdates );
}
// FIXME: use rdate and exrule!
/* FIXME: Recurring events, they are split up
- QDomElement instancetypeElement = prop.namedItem( "instancetype" ).toElement();
+ TQDomElement instancetypeElement = prop.namedItem( "instancetype" ).toElement();
if ( instancetypeElement.isNull() ) {
kdError() << "Error: no instance type in Exchange server reply" << endl;
continue;
@@ -426,12 +426,12 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
//kdDebug() << "Instance type: " << instanceType << endl;
if ( recurrence && instanceType > 0 ) {
- QDomElement uidElement = prop.namedItem( "uid" ).toElement();
+ TQDomElement uidElement = prop.namedItem( "uid" ).toElement();
if ( uidElement.isNull() ) {
kdError() << "Error: no uid in Exchange server reply" << endl;
continue;
}
- QString uid = uidElement.text();
+ TQString uid = uidElement.text();
if ( ! m_uids.contains( uid ) ) {
m_uids[uid] = 1;
handleRecurrence(uid);
@@ -448,7 +448,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
return true;
}
-bool ExchangeConverterCalendar::readTodo( const QDomElement &node, Todo *todo )
+bool ExchangeConverterCalendar::readTodo( const TQDomElement &node, Todo *todo )
{
if ( !readIncidence( node, todo ) ) return false;
kdDebug()<<"ExchangeConverterCalendar::readTodo"<<endl;
@@ -456,11 +456,11 @@ kdDebug()<<"ExchangeConverterCalendar::readTodo"<<endl;
// FIXME: Retrieve time zone: "timezone"
// FIXME: What to with TaskProp_Owner and TaskProp_ContactNames?
- QDateTime tmpdt;
+ TQDateTime tmpdt;
float tmpfloat;
long tmplong;
bool tmpbool;
- QString tmpstr;
+ TQString tmpstr;
// The UID is absolutely required!
// FIXME: Which field shall be used as uid???
@@ -503,12 +503,12 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
return true;
}
-bool ExchangeConverterCalendar::readJournal( const QDomElement &node, Journal *journal )
+bool ExchangeConverterCalendar::readJournal( const TQDomElement &node, Journal *journal )
{
if ( !readIncidence( node, journal ) ) return false;
kdDebug()<<"ExchangeConverterCalendar::readJournal"<<endl;
- QDateTime tmpdt;
- QString tmpstr;
+ TQDateTime tmpdt;
+ TQString tmpstr;
// The UID is absolutely required!
// FIXME: Which field shall be used as UID?
if ( WebdavHandler::extractString( node, "uid", tmpstr ) ) {
@@ -528,13 +528,13 @@ kdDebug()<<"ExchangeConverterCalendar::readJournal: ERROR: No UID given"<<endl;
return true;
}
-Incidence::List ExchangeConverterCalendar::parseWebDAV( const QDomDocument& davdata )
+Incidence::List ExchangeConverterCalendar::parseWebDAV( const TQDomDocument& davdata )
{
- QDomElement prop = davdata.documentElement().namedItem( "response" )
+ TQDomElement prop = davdata.documentElement().namedItem( "response" )
.namedItem( "propstat" ).namedItem( "prop" ).toElement();
if ( prop.isNull() ) return Incidence::List();
- QString contentclass;
+ TQString contentclass;
bool success = WebdavHandler::extractString( prop, "contentclass", contentclass );
if ( !success ) return Incidence::List();
@@ -581,7 +581,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
{
public:
createWebDAVVisitor() : Visitor() {}
- bool act( QDomDocument doc, QDomElement el, IncidenceBase *incidence, const QString &timeZoneId )
+ bool act( TQDomDocument doc, TQDomElement el, IncidenceBase *incidence, const TQString &timeZoneId )
{
mDoc = doc;
mElement = el;
@@ -589,15 +589,15 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
return incidence->accept( *this );
}
protected:
- void addBoolProp( QDomElement &el ) { el.setAttribute( "b:dt", "boolean" ); }
- void addDateProp( QDomElement &el ) { el.setAttribute( "b:dt", "dateTime.tz" ); }
- void addFloatProp( QDomElement &el ) { el.setAttribute( "b:dt", "float" ); }
- void addIntProp( QDomElement &el ) { el.setAttribute( "b:dt", "int" ); }
- QString timePropString( const QDateTime &dt ) { return dt.toString( Qt::ISODate )+"Z"; }
+ void addBoolProp( TQDomElement &el ) { el.setAttribute( "b:dt", "boolean" ); }
+ 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"; }
bool visitIncidence( Incidence *incidence )
{
- QString tmpstr;
+ TQString tmpstr;
domDavProperty( "isreadonly", (incidence->isReadOnly())?"1":"0" );
// FIXME: scheduling ID
// domProperty( "http://schemas.microsoft.com/repl/", "repl-uid", ??? );
@@ -607,7 +607,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
// domHTTPMailProperty( "date", ??? ); // timestamp not available in libkcal
// domDavProperty( "comment", incidence->comments() ); // libkcal has a QStringlist, not one string
// domProperty( "urn:schemas-microsoft-com:office:office", "Keywords", ??? ); // It's a <v>entyr1</v><v>entry2</v> String list!
- tmpstr = QString::null;
+ tmpstr = TQString::null;
switch ( incidence->secrecy() ) {
case KCal::Incidence::SecrecyPublic: tmpstr = "0"; break;
case KCal::Incidence::SecrecyPrivate: tmpstr = "2"; break;
@@ -617,14 +617,14 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
if ( !tmpstr.isEmpty() )
domProperty( "http://schemas.microsoft.com/exchange/", "sensitivity", tmpstr );
- domHTTPMailProperty( "priority", QString::number(incidence->priority()) );
+ domHTTPMailProperty( "priority", TQString::number(incidence->priority()) );
domMailHeaderProperty( "from", incidence->organizer().fullName() );
// Attendees:
- tmpstr = QString::null;
- QStringList reqattnames;
- QStringList optattnames;
+ tmpstr = TQString::null;
+ TQStringList reqattnames;
+ TQStringList optattnames;
Attendee::List atts = incidence->attendees();
for ( Attendee::List::Iterator it = atts.begin(); it != atts.end(); ++it ) {
switch ( (*it)->role() ) {
@@ -652,7 +652,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
{
if ( !visitIncidence(event) ) return false;
- QDomAttr att_c = mDoc.createAttribute( "xmlns:c" );
+ TQDomAttr att_c = mDoc.createAttribute( "xmlns:c" );
att_c.setValue( "urn:schemas:calendar:" );
mDoc.documentElement().setAttributeNode( att_c );
@@ -660,7 +660,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
domProperty( "http://schemas.microsoft.com/exchange/",
"outlookmessageclass", "IPM.Appointment" );
domCalendarProperty( "uid", event->uid() );
- QDomElement el = domCalendarProperty( "created", timePropString( WebdavHandler::zoneAsUtc( event->created(), mTimeZoneId ) ) );
+ TQDomElement el = domCalendarProperty( "created", timePropString( WebdavHandler::zoneAsUtc( event->created(), mTimeZoneId ) ) );
addDateProp( el );
el = domCalendarProperty( "lastmodified", timePropString( WebdavHandler::zoneAsUtc( event->lastModified(), mTimeZoneId ) ) );
addDateProp( el );
@@ -668,7 +668,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
// FIXME: domCalendarProperty( "sequence", event->sequence() );
domCalendarProperty( "location", event->location() );
- QString tmpstr( QString::null );
+ TQString tmpstr( TQString::null );
switch ( event->transparency() ) {
case KCal::Event::Transparent: tmpstr = "FREE"; break;
case KCal::Event::Opaque: tmpstr = "BUSY"; break;
@@ -684,7 +684,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
el = domCalendarProperty( "dtend", timePropString( WebdavHandler::zoneAsUtc( event->dtEnd(), mTimeZoneId ) ) );
addDateProp( el );
} else {
- domCalendarProperty( "duration", QString::number( event->duration() ) );
+ domCalendarProperty( "duration", TQString::number( event->duration() ) );
}
// FIXME: Convert the recurrence rule to a string:
if ( event->doesRecur() ) {
@@ -703,7 +703,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
Alarm::List alarms = event->alarms();
for( it = alarms.begin(); it != alarms.end(); ++it ) {
if ((*it)->hasStartOffset()) {
- domCalendarProperty( "reminderoffset", QString::number( (*it)->startOffset().asSeconds() * -1 ) );
+ domCalendarProperty( "reminderoffset", TQString::number( (*it)->startOffset().asSeconds() * -1 ) );
} else {
kdDebug() << "ExchangeConverterCalendar::createWebDAVVisitor: Alarm type not supported\n";
}
@@ -715,11 +715,11 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
{
if ( !visitIncidence(todo) ) return false;
- QDomAttr att_t1 = mDoc.createAttribute( "xmlns:t1" );
+ TQDomAttr att_t1 = mDoc.createAttribute( "xmlns:t1" );
att_t1.setValue( TaskNamespace1 );
mDoc.documentElement().setAttributeNode( att_t1 );
- QDomAttr att_t2 = mDoc.createAttribute( "xmlns:t2" );
+ TQDomAttr att_t2 = mDoc.createAttribute( "xmlns:t2" );
att_t2.setValue( TaskNamespace2 );
mDoc.documentElement().setAttributeNode( att_t2 );
@@ -765,9 +765,9 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
}
protected:
- QDomDocument mDoc;
- QDomElement mElement;
- QString mTimeZoneId;
+ TQDomDocument mDoc;
+ TQDomElement mElement;
+ TQString mTimeZoneId;
};
// Prefixes for the namespaces:
@@ -780,27 +780,27 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
// o... office
//
-QDomDocument ExchangeConverterCalendar::createWebDAV( Incidence *incidence )
+TQDomDocument ExchangeConverterCalendar::createWebDAV( Incidence *incidence )
{
// TODO
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propertyupdate" );
- QDomElement set = WebdavHandler::addElement( doc, root, "d:set" );
- QDomElement prop = WebdavHandler::addElement( doc, set, "d:prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propertyupdate" );
+ TQDomElement set = WebdavHandler::addElement( doc, root, "d:set" );
+ TQDomElement prop = WebdavHandler::addElement( doc, set, "d:prop" );
- QDomAttr att_b = doc.createAttribute( "xmlns:b" );
+ TQDomAttr att_b = doc.createAttribute( "xmlns:b" );
att_b.setValue( "urn:schemas-microsoft-com:datatypes" );
root.setAttributeNode( att_b );
- QDomAttr att_h = doc.createAttribute( "xmlns:h" );
+ TQDomAttr att_h = doc.createAttribute( "xmlns:h" );
att_h.setValue( "urn:schemas:mailheader:" );
root.setAttributeNode( att_h );
- QDomAttr att_m = doc.createAttribute( "xmlns:m" );
+ TQDomAttr att_m = doc.createAttribute( "xmlns:m" );
att_m.setValue( "urn:schemas:httpmail:" );
root.setAttributeNode( att_m );
-// QDomAttr att1 = doc.createAttributeNS( "do:whatever:you:like", "x:attname");
+// TQDomAttr att1 = doc.createAttributeNS( "do:whatever:you:like", "x:attname");
// att1.setValue( "value" );
// prop.setAttributeNodeNS( att1 );
// root.setAttributeNodeNS( att1 );
diff --git a/kresources/newexchange/exchangeconvertercalendar.h b/kresources/newexchange/exchangeconvertercalendar.h
index 346b2a954..a561d0cdf 100644
--- a/kresources/newexchange/exchangeconvertercalendar.h
+++ b/kresources/newexchange/exchangeconvertercalendar.h
@@ -21,8 +21,8 @@
#ifndef KCal_EXCHANGECONVERTERCONTACT_H
#define KCal_EXCHANGECONVERTERCONTACT_H
-#include <qstring.h>
-#include <qdom.h>
+#include <tqstring.h>
+#include <tqdom.h>
#include <libkcal/incidence.h>
#include <libkcal/icalformat.h>
@@ -36,23 +36,23 @@ class ExchangeConverterCalendar
ExchangeConverterCalendar();
- void setTimeZone( const QString &id );
+ void setTimeZone( const TQString &id );
- static void createRequestAppointment( QDomDocument &doc, QDomElement &root );
- static void createRequestTask( QDomDocument &doc, QDomElement &root );
- static void createRequestJournal( QDomDocument &doc, QDomElement &root );
+ static void createRequestAppointment( TQDomDocument &doc, TQDomElement &root );
+ static void createRequestTask( TQDomDocument &doc, TQDomElement &root );
+ static void createRequestJournal( TQDomDocument &doc, TQDomElement &root );
- QDomDocument createWebDAV( Incidence *incidence );
+ TQDomDocument createWebDAV( Incidence *incidence );
- Incidence::List parseWebDAV( const QDomDocument& davdata );
- bool readIncidence( const QDomElement &node, Incidence *incidence );
+ Incidence::List parseWebDAV( const TQDomDocument& davdata );
+ bool readIncidence( const TQDomElement &node, Incidence *incidence );
protected:
- static void createRequestIncidence( QDomDocument &doc, QDomElement &root );
- bool readEvent( const QDomElement &node, Event *event );
- bool readTodo( const QDomElement &node, Todo *todo );
- bool readJournal( const QDomElement &node, Journal *journal );
- bool readTZ( const QDomElement &node, Incidence *incidence );
+ static void createRequestIncidence( TQDomDocument &doc, TQDomElement &root );
+ bool readEvent( const TQDomElement &node, Event *event );
+ bool readTodo( const TQDomElement &node, Todo *todo );
+ bool readJournal( const TQDomElement &node, Journal *journal );
+ bool readTZ( const TQDomElement &node, Incidence *incidence );
KCal::ICalFormat mFormat;
class createWebDAVVisitor;
diff --git a/kresources/newexchange/exchangeconvertercontact.cpp b/kresources/newexchange/exchangeconvertercontact.cpp
index 1e756574f..0764d3101 100644
--- a/kresources/newexchange/exchangeconvertercontact.cpp
+++ b/kresources/newexchange/exchangeconvertercontact.cpp
@@ -44,12 +44,12 @@ ExchangeConverterContact::ExchangeConverterContact()
#define property( prop ) \
Webdavhandler::addElement( doc, props, prop )
-void ExchangeConverterContact::createRequest( QDomDocument &doc, QDomElement &props )
+void ExchangeConverterContact::createRequest( TQDomDocument &doc, TQDomElement &props )
{
- QDomAttr att_c = doc.createAttribute( "xmlns:c" );
+ TQDomAttr att_c = doc.createAttribute( "xmlns:c" );
att_c.setValue( "urn:schemas:contacts:" );
doc.documentElement().setAttributeNode( att_c );
- QDomAttr att_cal = doc.createAttribute( "xmlns:cal" );
+ TQDomAttr att_cal = doc.createAttribute( "xmlns:cal" );
att_cal.setValue( "urn:schemas:calendar:" );
doc.documentElement().setAttributeNode( att_cal );
@@ -160,15 +160,15 @@ void ExchangeConverterContact::createRequest( QDomDocument &doc, QDomElement &pr
#undef property
-bool ExchangeConverterContact::extractAddress( const QDomElement &node,
+bool ExchangeConverterContact::extractAddress( const TQDomElement &node,
Addressee &addressee, int type,
- const QString &street, const QString &pobox, const QString &location,
- const QString &postalcode, const QString &state, const QString &country,
- const QString &/*countycode*/ )
+ const TQString &street, const TQString &pobox, const TQString &location,
+ const TQString &postalcode, const TQString &state, const TQString &country,
+ const TQString &/*countycode*/ )
{
bool haveAddr = false;
Address addr( type );
- QString tmpstr;
+ TQString tmpstr;
if ( WebdavHandler::extractString( node, street, tmpstr ) ) {
addr.setStreet( tmpstr );
@@ -208,9 +208,9 @@ bool ExchangeConverterContact::extractAddress( const QDomElement &node,
/**
For the complete list of Exchange <=> KABC field mappings see the file
Person.mapping */
-bool ExchangeConverterContact::readAddressee( const QDomElement &node, Addressee &addressee )
+bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addressee &addressee )
{
- QString tmpstr;
+ TQString tmpstr;
long tmplng;
// The UID is absolutely required!
@@ -283,7 +283,7 @@ bool ExchangeConverterContact::readAddressee( const QDomElement &node, Addressee
// General stuff:
- QStringList tmplst;
+ TQStringList tmplst;
if ( WebdavHandler::extractStringList( node, "Keywords", tmplst ) )
addressee.setCategories( tmplst );
// Exchange sentitivity values:
@@ -345,7 +345,7 @@ bool ExchangeConverterContact::readAddressee( const QDomElement &node, Addressee
if ( WebdavHandler::extractString( node, "spousecn", tmpstr ) )
addressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", tmpstr );
- QDateTime tmpdt;
+ TQDateTime tmpdt;
if ( WebdavHandler::extractDateTime( node, "bday", tmpdt ) )
addressee.setBirthday( tmpdt.date() );
if ( WebdavHandler::extractString( node, "weddinganniversary", tmpstr ) )
@@ -369,19 +369,19 @@ bool ExchangeConverterContact::readAddressee( const QDomElement &node, Addressee
return true;
}
-Addressee::List ExchangeConverterContact::parseWebDAV( const QDomDocument& davdata )
+Addressee::List ExchangeConverterContact::parseWebDAV( const TQDomDocument& davdata )
{
// TODO: Handle multiple addressees per reply!
Addressee::List list;
- QDomElement prop = davdata.documentElement().namedItem( "response" )
+ TQDomElement prop = davdata.documentElement().namedItem( "response" )
.namedItem( "propstat" ).namedItem( "prop" ).toElement();
if ( prop.isNull() ) {
kdDebug()<<"ExchangeConverterContact::parseWebDAV, no response->propstat->prop element!"<<endl;
return list;
}
- QString contentclass;
+ TQString contentclass;
bool success = WebdavHandler::extractString( prop, "contentclass", contentclass );
if ( !success ) {
kdDebug()<<"ExchangeConverterContact::parseWebDAV, No contentclass entry"<<endl;
@@ -414,18 +414,18 @@ kdDebug()<<"ExchangeConverterContact::parseWebDAV, No contentclass entry"<<endl;
domContactProperty( name, addr.phoneNumber( type ).number() );
-QDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
+TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
{
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propertyupdate" );
- QDomElement set = WebdavHandler::addElement( doc, root, "d:set" );
- QDomElement prop = WebdavHandler::addElement( doc, set, "d:prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propertyupdate" );
+ TQDomElement set = WebdavHandler::addElement( doc, root, "d:set" );
+ TQDomElement prop = WebdavHandler::addElement( doc, set, "d:prop" );
- QDomAttr att_c = doc.createAttribute( "xmlns:c" );
+ TQDomAttr att_c = doc.createAttribute( "xmlns:c" );
att_c.setValue( "urn:schemas:contacts:" );
doc.documentElement().setAttributeNode( att_c );
- QDomAttr att_b = doc.createAttribute( "xmlns:b" );
+ TQDomAttr att_b = doc.createAttribute( "xmlns:b" );
att_b.setValue( "urn:schemas-microsoft-com:datatypes" );
root.setAttributeNode( att_b );
@@ -449,8 +449,8 @@ QDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
domContactProperty( "manager", addr.custom( "KADDRESSBOOK", "X-ManagersName" ) );
domContactProperty( "secretarycn", addr.custom( "KADDRESSBOOK", "X-AssistantsName" ) );
- QStringList emails = addr.emails();
- QString prefemail = addr.preferredEmail();
+ TQStringList emails = addr.emails();
+ TQString prefemail = addr.preferredEmail();
if ( emails.contains( prefemail ) )
emails.remove( prefemail );
emails.prepend( prefemail );
@@ -467,27 +467,27 @@ QDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
// No value for "personalHomePage"
domContactProperty( "businesshomepage", addr.url().url() );
- QString fburl = KCal::FreeBusyUrlStore::self()->readUrl( addr.preferredEmail() );
+ TQString fburl = KCal::FreeBusyUrlStore::self()->readUrl( addr.preferredEmail() );
if ( !fburl.isEmpty() ) {
domContactProperty( "fburl", fburl );
}
/* FIXME: This doesn't work!
- QStringList cats = addr.categories();
+ TQStringList cats = addr.categories();
if ( cats.isEmpty() ) {
- QDomElement catsnode = WebdavHandler::addElementNS( doc, prop,
+ TQDomElement catsnode = WebdavHandler::addElementNS( doc, prop,
"urn:schemas-microsoft-com:office:office", "Keywords" );
- for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
+ for ( TQStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
WebdavHandler::addElementNS( doc, catsnode, "xml:", "v", *it );
}
} else {
-// QDomElement catsnode = addProperty( doc, prop,
+// TQDomElement catsnode = addProperty( doc, prop,
// "urn:schemas-microsoft-com:office:office", "Keywords", "" );
}*/
// Exchange sentitivity values:
// 0 None, 1 Personal, 2 Private, 3 Company Confidential
- QString value;
+ TQString value;
switch ( addr.secrecy().type() ) {
case KABC::Secrecy::Private: value = "2"; break;
case KABC::Secrecy::Confidential: value = "3"; break;
@@ -574,16 +574,16 @@ QDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
// TODO: Birthday and Anniversary:
// FIXME: Exchange uses the date in the form 8/13, i.e. possibly without a
// year! How shall I deal with this?
-/* QDate dt = addr.birthday().date();
- QString str = (dt.isValid())?(dt.toString( Qt::ISODate )):(QString::null);
+/* TQDate dt = addr.birthday().date();
+ TQString str = (dt.isValid())?(dt.toString( Qt::ISODate )):(TQString::null);
if ( !str.isEmpty() ) {
- QDomElement el = domContactProperty( "bday", str );
+ TQDomElement el = domContactProperty( "bday", str );
el.setAttribute( "b:dt", "date" );
}
- dt = QDate::fromString( addr.custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
- str = (dt.isValid())?(dt.toString( Qt::ISODate )):(QString::null);
+ dt = TQDate::fromString( addr.custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+ str = (dt.isValid())?(dt.toString( Qt::ISODate )):(TQString::null);
if ( !str.isEmpty() ) {
- QDomElement el = domContactProperty( "weddinganniversary", str );
+ TQDomElement el = domContactProperty( "weddinganniversary", str );
el.setAttribute( "b:dt", "date" );
}*/
@@ -592,12 +592,12 @@ QDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
KABC::Geo geo = addr.geo();
if ( geo.isValid() ) {
// TODO: Do we need to set any other attribute to make it a float?
- QDomAttr att_cal = doc.createAttribute( "xmlns:cal" );
+ TQDomAttr att_cal = doc.createAttribute( "xmlns:cal" );
att_cal.setValue( "urn:schemas:calendar:" );
doc.documentElement().setAttributeNode( att_cal );
- QDomElement el = domCalendarProperty( "geolatitude", QString::number( geo.latitude() ) );
+ TQDomElement el = domCalendarProperty( "geolatitude", TQString::number( geo.latitude() ) );
el.setAttribute( "b:dt", "float" );
- el = domCalendarProperty( "geolongitude", QString::number( geo.longitude() ) );
+ el = domCalendarProperty( "geolongitude", TQString::number( geo.longitude() ) );
el.setAttribute( "b:dt", "float" );
}
*/
diff --git a/kresources/newexchange/exchangeconvertercontact.h b/kresources/newexchange/exchangeconvertercontact.h
index 45ee7c7ca..191abccb7 100644
--- a/kresources/newexchange/exchangeconvertercontact.h
+++ b/kresources/newexchange/exchangeconvertercontact.h
@@ -21,8 +21,8 @@
#ifndef KABC_EXCHANGECONVERTERCONTACT_H
#define KABC_EXCHANGECONVERTERCONTACT_H
-#include <qstring.h>
-#include <qdom.h>
+#include <tqstring.h>
+#include <tqdom.h>
#include <kabc/addressee.h>
@@ -34,18 +34,18 @@ class ExchangeConverterContact
ExchangeConverterContact();
- static void createRequest( QDomDocument &doc, QDomElement &root );
+ static void createRequest( TQDomDocument &doc, TQDomElement &root );
- QDomDocument createWebDAV( Addressee addr );
+ TQDomDocument createWebDAV( Addressee addr );
- Addressee::List parseWebDAV( const QDomDocument& davdata );
- bool readAddressee( const QDomElement &node, Addressee &addressee );
+ Addressee::List parseWebDAV( const TQDomDocument& davdata );
+ bool readAddressee( const TQDomElement &node, Addressee &addressee );
protected:
- bool extractAddress( const QDomElement &node, Addressee &addressee, int type,
- const QString &street, const QString &pobox, const QString &location,
- const QString &postalcode, const QString &state, const QString &country,
- const QString &countycode );
+ bool extractAddress( const TQDomElement &node, Addressee &addressee, int type,
+ const TQString &street, const TQString &pobox, const TQString &location,
+ const TQString &postalcode, const TQString &state, const TQString &country,
+ const TQString &countycode );
};
}
diff --git a/kresources/newexchange/exchangeglobals.cpp b/kresources/newexchange/exchangeglobals.cpp
index 7cca837df..544051667 100644
--- a/kresources/newexchange/exchangeglobals.cpp
+++ b/kresources/newexchange/exchangeglobals.cpp
@@ -33,14 +33,14 @@
#include <kio/davjob.h>
#include <kdebug.h>
-KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const QDomElement &prop )
+KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const TQDomElement &prop )
{
- const QString &contentclass = prop.namedItem("contentclass").toElement().text();
+ const TQString &contentclass = prop.namedItem("contentclass").toElement().text();
kdDebug()<<"contentclass: "<<contentclass<<endl;
return getContentType( contentclass );
}
-KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const QString &contentclass )
+KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const TQString &contentclass )
{
if ( contentclass == "urn:content-classes:appointment" )
return KPIM::FolderLister::Event;
@@ -54,15 +54,15 @@ KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const QString &
}
-KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const QDomNode &folderNode )
+KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const TQDomNode &folderNode )
{
kdDebug()<<"ExchangeGlobals::getContentType(...)"<<endl;
- QDomNode n4;
+ TQDomNode n4;
for( n4 = folderNode.firstChild(); !n4.isNull(); n4 = n4.nextSibling() ) {
- QDomElement e = n4.toElement();
+ TQDomElement e = n4.toElement();
if ( e.tagName() == "contentclass" ) {
- QString contentclass( e.text() );
+ TQString contentclass( e.text() );
if ( contentclass == "urn:content-classes:contactfolder" )
return KPIM::FolderLister::Contact;
if ( contentclass == "urn:content-classes:calendarfolder" )
@@ -78,9 +78,9 @@ kdDebug()<<"ExchangeGlobals::getContentType(...)"<<endl;
return KPIM::FolderLister::Unknown;
}
-bool ExchangeGlobals::getFolderHasSubs( const QDomNode &folderNode )
+bool ExchangeGlobals::getFolderHasSubs( const TQDomNode &folderNode )
{
- QString hassubs = folderNode.namedItem( "hassubs" ).toElement().text();
+ TQString hassubs = folderNode.namedItem( "hassubs" ).toElement().text();
return hassubs == "1";
}
@@ -89,9 +89,9 @@ bool ExchangeGlobals::getFolderHasSubs( const QDomNode &folderNode )
KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
{
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
- QDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
+ TQDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
WebdavHandler::addElement( doc, prop, "d:displayname" );
WebdavHandler::addElement( doc, prop, "d:contentclass" );
WebdavHandler::addElement( doc, prop, "d:hassubs" );
@@ -103,9 +103,9 @@ KIO::Job *ExchangeGlobals::createListFoldersJob( const KURL &url )
KIO::TransferJob *ExchangeGlobals::createListItemsJob( const KURL &url )
{
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
- QDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
+ TQDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
WebdavHandler::addElement( doc, prop, "d:getetag" );
WebdavHandler::addElement( doc, prop, "d:contentclass" );
kdDebug(5800) << "props = "<< doc.toString() << endl;
@@ -125,14 +125,14 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", "
<< "Message=" << KPIM::FolderLister::Message << endl;
// Don't use an <allprop/> request!
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
- QDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
- QDomAttr att_h = doc.createAttribute( "xmlns:h" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propfind" );
+ TQDomElement prop = WebdavHandler::addElement( doc, root, "d:prop" );
+ TQDomAttr att_h = doc.createAttribute( "xmlns:h" );
att_h.setValue( "urn:schemas:mailheader:" );
root.setAttributeNode( att_h );
- QDomAttr att_m = doc.createAttribute( "xmlns:m" );
+ TQDomAttr att_m = doc.createAttribute( "xmlns:m" );
att_m.setValue( "urn:schemas:httpmail:" );
root.setAttributeNode( att_m );
@@ -158,7 +158,7 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", "
KURL authURL = url;
KIO::DavJob *job = KIO::davPropFind( authURL, doc, "0", false );
/* KURL httpurl( url );
- QString proto("http");
+ TQString proto("http");
httpurl.setProtocol( proto );
KIO::TransferJob *job = KIO::get(httpurl, false, false);
job->addMetaData("customHTTPHeader", "Translate: f");
@@ -170,7 +170,7 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", "
KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl,
const KPIM::GroupwareUploadItem::List &deletedItems )
{
- QStringList urls;
+ TQStringList urls;
KPIM::GroupwareUploadItem::List::const_iterator it;
kdDebug() << " ExchangeGlobals::createRemoveJob: , URL="<<uploadurl.url()<<endl;
for ( it = deletedItems.begin(); it != deletedItems.end(); ++it ) {
@@ -192,7 +192,7 @@ KIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl,
// it calls getContentType of the ExchangeGlobals class, instead of the one
// from OGoGlobals!!!!
bool ExchangeGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
- KIO::Job *job, const QString &/*jobData*/ )
+ KIO::Job *job, const TQString &/*jobData*/ )
{
kdDebug()<<"ExchangeGlobals::interpretListItemsJob"<<endl;
KIO::DavJob *davjob = dynamic_cast<KIO::DavJob *>(job);
@@ -200,28 +200,28 @@ kdDebug()<<"ExchangeGlobals::interpretListItemsJob"<<endl;
if ( !davjob ) {
return false;
}
- QDomDocument doc = davjob->response();
+ TQDomDocument doc = davjob->response();
kdDebug(7000) << " Doc: " << doc.toString() << endl;
kdDebug(7000) << " IdMapper: " << adaptor->idMapper()->asString() << endl;
- QDomElement docElem = doc.documentElement();
- QDomNode n = docElem.firstChild();
+ TQDomElement docElem = doc.documentElement();
+ TQDomNode n = docElem.firstChild();
while( !n.isNull() ) {
- QDomElement e = n.toElement(); // try to convert the node to an element.
+ TQDomElement e = n.toElement(); // try to convert the node to an element.
n = n.nextSibling();
if ( e.isNull() )
continue;
const KURL &entry( e.namedItem("href").toElement().text() );
- QDomElement propstat = e.namedItem("propstat").toElement();
+ TQDomElement propstat = e.namedItem("propstat").toElement();
if ( propstat.isNull() )
continue;
- QDomElement prop = propstat.namedItem( "prop" ).toElement();
+ TQDomElement prop = propstat.namedItem( "prop" ).toElement();
if ( prop.isNull() )
continue;
- QDomElement elem = prop.namedItem("getetag").toElement();
- const QString &newFingerprint = elem.text();
+ TQDomElement elem = prop.namedItem("getetag").toElement();
+ const TQString &newFingerprint = elem.text();
if ( elem.isNull() || newFingerprint.isEmpty() )
continue;
@@ -237,7 +237,7 @@ kdDebug()<<"ExchangeGlobals::interpretListItemsJob"<<endl;
bool ExchangeGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
- KIO::Job *job, const QString &/*jobData*/ )
+ KIO::Job *job, const TQString &/*jobData*/ )
{
KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
if ( !davjob || !adaptor ) return false;
@@ -251,7 +251,7 @@ kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): QDomDocument
bool res = false;
KCal::Incidence::List::Iterator it = incidences.begin();
for ( ; it != incidences.end(); ++it ) {
- QString fpr = (*it)->customProperty( "KDEPIM-Exchange-Resource", "fingerprint" );
+ TQString fpr = (*it)->customProperty( "KDEPIM-Exchange-Resource", "fingerprint" );
KURL href( (*it)->customProperty( "KDEPIM-Exchange-Resource", "href" ) );
adaptor->calendarItemDownloaded( (*it), (*it)->uid(), href, fpr, href.prettyURL() );
res = true;
@@ -261,7 +261,7 @@ kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): QDomDocument
bool ExchangeGlobals::interpretAddressBookDownloadItemsJob(
- KABC::AddressBookAdaptor *adaptor, KIO::Job *job, const QString &/*jobData*/ )
+ KABC::AddressBookAdaptor *adaptor, KIO::Job *job, const TQString &/*jobData*/ )
{
KIO::DavJob *davjob = dynamic_cast<KIO::DavJob*>(job);
if ( !davjob || !adaptor ) return false;
@@ -274,7 +274,7 @@ kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): QDomDocum
bool res = false;
KABC::Addressee::List::Iterator it = addressees.begin();
for ( ; it != addressees.end(); ++it ) {
- QString fpr = (*it).custom( "KDEPIM-Exchange-Resource", "fingerprint" );
+ TQString fpr = (*it).custom( "KDEPIM-Exchange-Resource", "fingerprint" );
KURL href( (*it).custom( "KDEPIM-Exchange-Resource", "href" ) );
adaptor->addressbookItemDownloaded( (*it), (*it).uid(), href, fpr, href.prettyURL() );
res = true;
diff --git a/kresources/newexchange/exchangeglobals.h b/kresources/newexchange/exchangeglobals.h
index ba56830d7..f8ad33178 100644
--- a/kresources/newexchange/exchangeglobals.h
+++ b/kresources/newexchange/exchangeglobals.h
@@ -23,7 +23,7 @@
#include <kurl.h>
#include <groupwareuploadjob.h>
-#include <qdom.h>
+#include <tqdom.h>
namespace KIO {
class Job;
@@ -45,10 +45,10 @@ class ExchangeGlobals
{
public:
ExchangeGlobals() {}
- static KPIM::FolderLister::ContentType getContentType( const QDomElement &prop );
- static KPIM::FolderLister::ContentType getContentType( const QString &contentclass );
- static KPIM::FolderLister::ContentType getContentType( const QDomNode &folderNode );
- static bool getFolderHasSubs( const QDomNode &folderNode );
+ static KPIM::FolderLister::ContentType getContentType( const TQDomElement &prop );
+ static KPIM::FolderLister::ContentType getContentType( const TQString &contentclass );
+ static KPIM::FolderLister::ContentType getContentType( const TQDomNode &folderNode );
+ static bool getFolderHasSubs( const TQDomNode &folderNode );
static KIO::Job *createListFoldersJob( const KURL &url );
@@ -60,11 +60,11 @@ class ExchangeGlobals
static bool interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor,
- KIO::Job *job, const QString &jobData );
+ KIO::Job *job, const TQString &jobData );
static bool interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
- KIO::Job *job, const QString &jobData );
+ KIO::Job *job, const TQString &jobData );
static bool interpretAddressBookDownloadItemsJob( KABC::AddressBookAdaptor *adaptor,
- KIO::Job *job, const QString &jobData );
+ KIO::Job *job, const TQString &jobData );
};
#endif
diff --git a/kresources/newexchange/kabc_resourceexchange.h b/kresources/newexchange/kabc_resourceexchange.h
index 542b79955..36f3ca2eb 100644
--- a/kresources/newexchange/kabc_resourceexchange.h
+++ b/kresources/newexchange/kabc_resourceexchange.h
@@ -32,7 +32,7 @@ class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
public:
ResourceExchange( const KConfig * );
/* ResourceExchange( const KURL &url,
- const QString &user, const QString &password );*/
+ const TQString &user, const TQString &password );*/
protected:
void init();
};
diff --git a/kresources/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp
index 68d484c01..2aceaad0c 100644
--- a/kresources/remote/resourceremote.cpp
+++ b/kresources/remote/resourceremote.cpp
@@ -22,9 +22,9 @@
#include <typeinfo>
#include <stdlib.h>
-#include <qdatetime.h>
-#include <qstring.h>
-#include <qptrlist.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
#include <kdebug.h>
#include <kurl.h>
@@ -101,7 +101,7 @@ void ResourceRemote::init()
void ResourceRemote::readConfig( const KConfig *config )
{
- QString url = config->readEntry( "DownloadUrl" );
+ TQString url = config->readEntry( "DownloadUrl" );
mDownloadUrl = KURL( url );
url = config->readEntry( "UploadUrl" );
@@ -195,11 +195,11 @@ bool ResourceRemote::doLoad()
mDownloadJob = KIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true,
false, !mUseProgressManager );
- connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotLoadJobResult( KIO::Job * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotLoadJobResult( KIO::Job * ) ) );
if ( mUseProgressManager ) {
- connect( mDownloadJob, SIGNAL( percent( KIO::Job *, unsigned long ) ),
- SLOT( slotPercent( KIO::Job *, unsigned long ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
+ TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) );
mProgress = KPIM::ProgressManager::createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading Calendar") );
@@ -222,8 +222,8 @@ void ResourceRemote::slotLoadJobResult( KIO::Job *job )
{
if ( job->error() ) {
// TODO: Should detect 404, 401 etc. vs host not found and prompt to create new resource only when 404 is returned
- QString warningString = QString("<b>") + i18n("Remote data access failure") + QString("</b><p>") + i18n("Detailed information") \
- + QString(":<br>") + job->errorString() + QString("<p>") + i18n("What would you like to do?");
+ TQString warningString = TQString("<b>") + i18n("Remote data access failure") + TQString("</b><p>") + i18n("Detailed information") \
+ + TQString(":<br>") + job->errorString() + TQString("<p>") + i18n("What would you like to do?");
int rc = KMessageBox::warningContinueCancel(0,
warningString, i18n("Remote Data Access Failure"), i18n("&Continue with cached resource"));
if ( rc == KMessageBox::Continue ) {
@@ -281,8 +281,8 @@ bool ResourceRemote::doSave()
saveCache();
mUploadJob = KIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true );
- connect( mUploadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotSaveJobResult( KIO::Job * ) ) );
+ connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotSaveJobResult( KIO::Job * ) ) );
return true;
}
@@ -325,13 +325,13 @@ void ResourceRemote::dump() const
kdDebug(5800) << " ReloadPolicy: " << reloadPolicy() << endl;
}
-void ResourceRemote::addInfoText( QString &txt ) const
+void ResourceRemote::addInfoText( TQString &txt ) const
{
txt += "<br>";
txt += i18n("URL: %1").arg( mDownloadUrl.prettyURL() );
}
-bool ResourceRemote::setValue( const QString &key, const QString &value )
+bool ResourceRemote::setValue( const TQString &key, const TQString &value )
{
if ( key == "URL" ) {
setUploadUrl( KURL( value ) );
diff --git a/kresources/remote/resourceremote.h b/kresources/remote/resourceremote.h
index 5d32b0fc6..3cea7ef1f 100644
--- a/kresources/remote/resourceremote.h
+++ b/kresources/remote/resourceremote.h
@@ -21,9 +21,9 @@
#ifndef KCAL_RESOURCEREMOTEDIR_H
#define KCAL_RESOURCEREMOTEDIR_H
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qdatetime.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
#include <kurl.h>
#include <kconfig.h>
@@ -89,7 +89,7 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
void dump() const;
- bool setValue( const QString &key, const QString &value );
+ bool setValue( const TQString &key, const TQString &value );
protected slots:
@@ -102,7 +102,7 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
bool doLoad();
bool doSave();
- void addInfoText( QString & ) const;
+ void addInfoText( TQString & ) const;
private:
void init();
diff --git a/kresources/remote/resourceremoteconfig.cpp b/kresources/remote/resourceremoteconfig.cpp
index 3128eaade..67d7f4b94 100644
--- a/kresources/remote/resourceremoteconfig.cpp
+++ b/kresources/remote/resourceremoteconfig.cpp
@@ -21,8 +21,8 @@
#include <typeinfo>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <kdebug.h>
@@ -38,21 +38,21 @@
using namespace KCal;
-ResourceRemoteConfig::ResourceRemoteConfig( QWidget* parent, const char* name )
+ResourceRemoteConfig::ResourceRemoteConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
resize( 245, 115 );
- QGridLayout *mainLayout = new QGridLayout( this, 2, 2 );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
mainLayout->setSpacing( KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "Download from:" ), this );
+ TQLabel *label = new TQLabel( i18n( "Download from:" ), this );
mDownloadUrl = new KURLRequester( this );
mDownloadUrl->setMode( KFile::File );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mDownloadUrl, 1, 1 );
- label = new QLabel( i18n( "Upload to:" ), this );
+ label = new TQLabel( i18n( "Upload to:" ), this );
mUploadUrl = new KURLRequester( this );
mUploadUrl->setMode( KFile::File );
mainLayout->addWidget( label, 2, 0 );
diff --git a/kresources/remote/resourceremoteconfig.h b/kresources/remote/resourceremoteconfig.h
index a102bd0bd..20ab3fcf0 100644
--- a/kresources/remote/resourceremoteconfig.h
+++ b/kresources/remote/resourceremoteconfig.h
@@ -23,8 +23,8 @@
#ifndef KCAL_RESOURCEREMOTECONFIG_H
#define KCAL_RESOURCEREMOTECONFIG_H
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
#include <kurlrequester.h>
#include <kresources/resource.h>
@@ -46,7 +46,7 @@ class KDE_EXPORT ResourceRemoteConfig : public KRES::ConfigWidget
{
Q_OBJECT
public:
- ResourceRemoteConfig( QWidget *parent = 0, const char *name = 0 );
+ ResourceRemoteConfig( TQWidget *parent = 0, const char *name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp
index 156ae01af..06c67442e 100644
--- a/kresources/scalix/kabc/contact.cpp
+++ b/kresources/scalix/kabc/contact.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qdom.h>
+#include <tqdom.h>
#include <libkdepim/distributionlist.h>
#include <kstaticdeleter.h>
@@ -27,24 +27,24 @@
using namespace Scalix;
-static QMap<QString, QString> *s_distListMap = 0;
-static KStaticDeleter< QMap<QString, QString> > sd;
+static TQMap<TQString, TQString> *s_distListMap = 0;
+static KStaticDeleter< TQMap<TQString, TQString> > sd;
-static QString custom( const QString &name, const KABC::Addressee &addr, const QString &defaultValue = QString() )
+static TQString custom( const TQString &name, const KABC::Addressee &addr, const TQString &defaultValue = TQString() )
{
- const QString value = addr.custom( "Scalix", name );
+ const TQString value = addr.custom( "Scalix", name );
if ( value.isEmpty() )
return defaultValue;
else
return value;
}
-static void setCustom( const QString &name, const QString &value, KABC::Addressee &addr )
+static void setCustom( const TQString &name, const TQString &value, KABC::Addressee &addr )
{
addr.insertCustom( "Scalix", name, value );
}
-QString Contact::toXml( const KABC::Addressee &addr )
+TQString Contact::toXml( const KABC::Addressee &addr )
{
/**
* Handle distribution lists.
@@ -53,13 +53,13 @@ QString Contact::toXml( const KABC::Addressee &addr )
if ( s_distListMap )
return (*s_distListMap)[ addr.uid() ];
else
- return QString();
+ return TQString();
}
/**
* Handle normal contacts.
*/
- QString xml;
+ TQString xml;
xml += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
xml += "<contact>\n";
@@ -86,9 +86,9 @@ QString Contact::toXml( const KABC::Addressee &addr )
xml += "<company_name>" + addr.organization() + "</company_name>\n";
xml += "<job_title>" + addr.title() + "</job_title>\n";
- QStringList emails = addr.emails();
+ TQStringList emails = addr.emails();
for ( uint i = 0; i < 3; ++i ) {
- QString type, address, comment, display;
+ TQString type, address, comment, display;
if ( i < emails.count() ) {
type = "SMTP";
@@ -103,19 +103,19 @@ QString Contact::toXml( const KABC::Addressee &addr )
comment = addr.formattedName();
display = emails[ i ];
} else {
- comment = custom( QString( "email%1_address_with_comment" ).arg( i + 1 ), addr );
- display = custom( QString( "email%1_display_name" ).arg( i + 1 ), addr );
+ comment = custom( TQString( "email%1_address_with_comment" ).arg( i + 1 ), addr );
+ display = custom( TQString( "email%1_display_name" ).arg( i + 1 ), addr );
}
}
- xml += QString( "<email%1_address_type>" ).arg( i + 1 ) + type +
- QString( "</email%1_address_type>" ).arg( i + 1 ) +"\n";
- xml += QString( "<email%1_address>" ).arg( i + 1 ) + address +
- QString( "</email%1_address>" ).arg( i + 1 ) +"\n";
- xml += QString( "<email%1_address_with_comment>" ).arg( i + 1 ) + comment +
- QString( "</email%1_address_with_comment>" ).arg( i + 1 ) + "\n";
- xml += QString( "<email%1_display_name>" ).arg( i + 1 ) + display +
- QString( "</email%1_display_name>" ).arg( i + 1 ) + "\n";
+ xml += TQString( "<email%1_address_type>" ).arg( i + 1 ) + type +
+ TQString( "</email%1_address_type>" ).arg( i + 1 ) +"\n";
+ xml += TQString( "<email%1_address>" ).arg( i + 1 ) + address +
+ TQString( "</email%1_address>" ).arg( i + 1 ) +"\n";
+ xml += TQString( "<email%1_address_with_comment>" ).arg( i + 1 ) + comment +
+ TQString( "</email%1_address_with_comment>" ).arg( i + 1 ) + "\n";
+ xml += TQString( "<email%1_display_name>" ).arg( i + 1 ) + display +
+ TQString( "</email%1_display_name>" ).arg( i + 1 ) + "\n";
}
KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home );
@@ -176,22 +176,22 @@ QString Contact::toXml( const KABC::Addressee &addr )
return xml;
}
-KABC::Addressee Contact::fromXml( const QString &xml )
+KABC::Addressee Contact::fromXml( const TQString &xml )
{
- QDomDocument document;
+ TQDomDocument document;
- QString errorMsg;
+ TQString errorMsg;
int errorLine, errorColumn;
if ( !document.setContent( xml, true, &errorMsg, &errorLine, &errorColumn ) ) {
qDebug( "Error parsing XML in Scalix::Contact::fromXml: %s (%d,%d)", errorMsg.latin1(), errorLine, errorColumn );
return KABC::Addressee();
}
- QDomElement contactElement = document.documentElement();
+ TQDomElement contactElement = document.documentElement();
if ( contactElement.tagName() != "contact" ) {
if ( contactElement.tagName() == "distlist" ) {
- const QDomNodeList names = contactElement.elementsByTagName( "display_name" );
- const QString listName = ( names.count() == 1 ? names.item( 0 ).toElement().text() : "Scalix Dummy List" );
+ const TQDomNodeList names = contactElement.elementsByTagName( "display_name" );
+ const TQString listName = ( names.count() == 1 ? names.item( 0 ).toElement().text() : "Scalix Dummy List" );
/**
* As we can't provide distribution list functionality we store the entry
@@ -201,7 +201,7 @@ KABC::Addressee Contact::fromXml( const QString &xml )
list.setName( listName );
if ( !s_distListMap )
- sd.setObject( s_distListMap, new QMap<QString, QString>() );
+ sd.setObject( s_distListMap, new TQMap<TQString, TQString>() );
s_distListMap->insert( list.uid(), xml );
@@ -212,7 +212,7 @@ KABC::Addressee Contact::fromXml( const QString &xml )
}
}
- QString emails[ 3 ];
+ TQString emails[ 3 ];
KABC::Address homeAddress( KABC::Address::Home );
KABC::Address workAddress( KABC::Address::Work );
KABC::Address otherAddress( KABC::Address::Dom );
@@ -220,9 +220,9 @@ KABC::Addressee Contact::fromXml( const QString &xml )
KABC::Addressee addr;
setCustom( "comes_from_scalix", "true", addr );
- QDomNode node = contactElement.firstChild();
+ TQDomNode node = contactElement.firstChild();
while ( !node.isNull() ) {
- QDomElement element = node.toElement();
+ TQDomElement element = node.toElement();
if ( !element.isNull() ) {
if ( element.tagName() == "direct_ref" )
addr.setUid( element.text() );
@@ -235,7 +235,7 @@ KABC::Addressee Contact::fromXml( const QString &xml )
else if ( element.tagName() == "send_rich_info" )
setCustom( "send_rich_info", element.text(), addr );
else if ( element.tagName() == "last_modification_time" )
- addr.setRevision( QDateTime::fromString( element.text(), Qt::ISODate ) );
+ addr.setRevision( TQDateTime::fromString( element.text(), Qt::ISODate ) );
// name
else if ( element.tagName() == "display_name_prefix" )
@@ -352,7 +352,7 @@ KABC::Addressee Contact::fromXml( const QString &xml )
addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", element.text() );
else if ( element.tagName() == "bday" )
- addr.setBirthday( QDateTime::fromString( element.text(), Qt::ISODate ) );
+ addr.setBirthday( TQDateTime::fromString( element.text(), Qt::ISODate ) );
else if ( element.tagName() == "anniversary" )
addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", element.text() );
else
diff --git a/kresources/scalix/kabc/contact.h b/kresources/scalix/kabc/contact.h
index d73765ede..ad095a8d0 100644
--- a/kresources/scalix/kabc/contact.h
+++ b/kresources/scalix/kabc/contact.h
@@ -28,8 +28,8 @@ namespace Scalix {
class Contact
{
public:
- static QString toXml( const KABC::Addressee &addr );
- static KABC::Addressee fromXml( const QString &xml );
+ static TQString toXml( const KABC::Addressee &addr );
+ static KABC::Addressee fromXml( const TQString &xml );
};
}
diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp
index 6cbf10832..31ccdf2c9 100644
--- a/kresources/scalix/kabc/resourcescalix.cpp
+++ b/kresources/scalix/kabc/resourcescalix.cpp
@@ -44,11 +44,11 @@
#include <kapplication.h>
#include <dcopclient.h>
-#include <qobject.h>
-#include <qtimer.h>
-#include <qstring.h>
-#include <qfile.h>
-#include <qapplication.h>
+#include <tqobject.h>
+#include <tqtimer.h>
+#include <tqstring.h>
+#include <tqfile.h>
+#include <tqapplication.h>
#include <assert.h>
@@ -64,7 +64,7 @@ class ScalixFactory : public KRES::PluginFactoryBase
return new KABC::ResourceScalix( config );
}
- KRES::ConfigWidget *configWidget( QWidget* )
+ KRES::ConfigWidget *configWidget( TQWidget* )
{
return 0;
}
@@ -80,7 +80,7 @@ static const char* s_inlineMimeType = "application/scalix-properties";
KABC::ResourceScalix::ResourceScalix( const KConfig *config )
: KPIM::ResourceABC( config ),
Scalix::ResourceScalixBase( "ResourceScalix-KABC" ),
- mCachedSubresource( QString::null ), mLocked( false )
+ mCachedSubresource( TQString::null ), mLocked( false )
{
setType( "scalix" );
}
@@ -95,8 +95,8 @@ KABC::ResourceScalix::~ResourceScalix()
}
void KABC::ResourceScalix::loadSubResourceConfig( KConfig& config,
- const QString& name,
- const QString& label,
+ const TQString& name,
+ const TQString& label,
bool writable )
{
KConfigGroup group( &config, name );
@@ -111,11 +111,11 @@ bool KABC::ResourceScalix::doOpen()
KConfig config( configFile() );
// Read the calendar entries
- QValueList<KMailICalIface::SubResource> subResources;
+ TQValueList<KMailICalIface::SubResource> subResources;
if ( !kmailSubresources( subResources, s_kmailContentsType ) )
return false;
mSubResources.clear();
- QValueList<KMailICalIface::SubResource>::ConstIterator it;
+ TQValueList<KMailICalIface::SubResource>::ConstIterator it;
for ( it = subResources.begin(); it != subResources.end(); ++it ) {
loadSubResourceConfig( config, (*it).location, (*it).label, (*it).writable );
}
@@ -149,12 +149,12 @@ KABC::Ticket * KABC::ResourceScalix::requestSaveTicket()
void KABC::ResourceScalix::releaseSaveTicket( Ticket* ticket )
{
mLocked = false;
- mCachedSubresource = QString::null;
+ mCachedSubresource = TQString::null;
delete ticket;
}
-QString KABC::ResourceScalix::loadContact( const QString& contactData,
- const QString& subResource,
+TQString KABC::ResourceScalix::loadContact( const TQString& contactData,
+ const TQString& subResource,
Q_UINT32 sernum,
KMailICalIface::StorageFormat )
{
@@ -168,7 +168,7 @@ QString KABC::ResourceScalix::loadContact( const QString& contactData,
return addr.uid();
}
-bool KABC::ResourceScalix::loadSubResource( const QString& subResource )
+bool KABC::ResourceScalix::loadSubResource( const TQString& subResource )
{
bool scalixcontacts = loadSubResourceHelper( subResource, s_attachmentMimeTypeContact, KMailICalIface::StorageXML );
bool scalixdistlists = loadSubResourceHelper( subResource, s_attachmentMimeTypeDistList, KMailICalIface::StorageXML );
@@ -176,7 +176,7 @@ bool KABC::ResourceScalix::loadSubResource( const QString& subResource )
return scalixcontacts && scalixdistlists && vcardstyle;
}
-bool KABC::ResourceScalix::loadSubResourceHelper( const QString& subResource,
+bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
const char* mimetype,
KMailICalIface::StorageFormat format )
{
@@ -204,7 +204,7 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const QString& subResource,
}
for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) {
- QMap<Q_UINT32, QString> lst;
+ TQMap<Q_UINT32, TQString> lst;
if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
kdError() << "Communication problem in ResourceScalix::load()\n";
@@ -213,7 +213,7 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const QString& subResource,
return false;
}
- for( QMap<Q_UINT32, QString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+ for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
loadContact( it.data(), subResource, it.key(), format );
}
if ( progressId ) {
@@ -263,24 +263,24 @@ bool KABC::ResourceScalix::save( Ticket* )
namespace Scalix {
struct AttachmentList {
- QStringList attachmentURLs;
- QStringList attachmentNames;
- QStringList attachmentMimeTypes;
- QStringList deletedAttachments;
- QValueList<KTempFile *> tempFiles;
+ TQStringList attachmentURLs;
+ TQStringList attachmentNames;
+ TQStringList attachmentMimeTypes;
+ TQStringList deletedAttachments;
+ TQValueList<KTempFile *> tempFiles;
- void addAttachment( const QString& url, const QString& name, const QString& mimetype ) {
+ void addAttachment( const TQString& url, const TQString& name, const TQString& mimetype ) {
attachmentURLs.append( url );
attachmentNames.append( name );
attachmentMimeTypes.append( mimetype );
}
- void updatePictureAttachment( const QImage& image, const QString& name );
- void updateAttachment( const QByteArray& data, const QString& name, const char* mimetype );
+ void updatePictureAttachment( const TQImage& image, const TQString& name );
+ void updateAttachment( const TQByteArray& data, const TQString& name, const char* mimetype );
};
} // namespace
-void AttachmentList::updatePictureAttachment( const QImage& image, const QString& name )
+void AttachmentList::updatePictureAttachment( const TQImage& image, const TQString& name )
{
assert( !name.isEmpty() );
if ( !image.isNull() ) {
@@ -296,7 +296,7 @@ void AttachmentList::updatePictureAttachment( const QImage& image, const QString
}
}
-void AttachmentList::updateAttachment( const QByteArray& data, const QString& name, const char* mimetype )
+void AttachmentList::updateAttachment( const TQByteArray& data, const TQString& name, const char* mimetype )
{
assert( !name.isEmpty() );
if ( !data.isNull() ) {
@@ -314,8 +314,8 @@ void AttachmentList::updateAttachment( const QByteArray& data, const QString& na
bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
{
- const QString uid = addr.uid();
- QString subResource;
+ const TQString uid = addr.uid();
+ TQString subResource;
Q_UINT32 sernum;
if ( mUidMap.find( uid ) != mUidMap.end() ) {
subResource = mUidMap[ uid ].resource();
@@ -340,11 +340,11 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
}
AttachmentList att;
- QString subject = addr.formattedName();
+ TQString subject = addr.formattedName();
- QString mimetype = s_inlineMimeType;
+ TQString mimetype = s_inlineMimeType;
- QString data = Contact::toXml( addr );
+ TQString data = Contact::toXml( addr );
CustomHeaderMap customHeaders;
customHeaders.insert( "X-Scalix-Class", "IPM.Contact" );
@@ -365,7 +365,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
const_cast<Addressee&>(addr).setChanged( false );
}
- for( QValueList<KTempFile *>::Iterator it = att.tempFiles.begin(); it != att.tempFiles.end(); ++it ) {
+ for( TQValueList<KTempFile *>::Iterator it = att.tempFiles.begin(); it != att.tempFiles.end(); ++it ) {
(*it)->setAutoDelete( true );
delete (*it);
}
@@ -374,7 +374,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
{
- const QString uid = addr.uid();
+ const TQString uid = addr.uid();
//kdDebug(5650) << k_funcinfo << uid << endl;
bool ok = false;
if ( mUidMap.contains( uid ) ) {
@@ -391,10 +391,10 @@ void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
void KABC::ResourceScalix::removeAddressee( const Addressee& addr )
{
- const QString uid = addr.uid();
+ const TQString uid = addr.uid();
if ( mUidMap.find( uid ) == mUidMap.end() ) return;
//kdDebug(5650) << k_funcinfo << uid << endl;
- const QString resource = mUidMap[ uid ].resource();
+ const TQString resource = mUidMap[ uid ].resource();
if ( !subresourceWritable( resource ) ) {
kdWarning() << "Wow! Something tried to delete a non-writable addressee! Fix this caller: " << kdBacktrace() << endl;
return;
@@ -412,18 +412,18 @@ void KABC::ResourceScalix::removeAddressee( const Addressee& addr )
* These are the DCOP slots that KMail call to notify when something
* changed.
*/
-bool KABC::ResourceScalix::fromKMailAddIncidence( const QString& type,
- const QString& subResource,
+bool KABC::ResourceScalix::fromKMailAddIncidence( const TQString& type,
+ const TQString& subResource,
Q_UINT32 sernum,
int format,
- const QString& contactXML )
+ const TQString& contactXML )
{
// Check if this is a contact
if( type != s_kmailContentsType || !subresourceActive( subResource ) )
return false;
// Load contact to find the UID
- const QString uid = loadContact( contactXML, subResource, sernum,
+ const TQString uid = loadContact( contactXML, subResource, sernum,
( KMailICalIface::StorageFormat )format );
//kdDebug(5650) << k_funcinfo << uid << endl;
@@ -440,9 +440,9 @@ bool KABC::ResourceScalix::fromKMailAddIncidence( const QString& type,
return true;
}
-void KABC::ResourceScalix::fromKMailDelIncidence( const QString& type,
- const QString& subResource,
- const QString& uid )
+void KABC::ResourceScalix::fromKMailDelIncidence( const TQString& type,
+ const TQString& subResource,
+ const TQString& uid )
{
// Check if this is a contact
if( type != s_kmailContentsType || !subresourceActive( subResource ) )
@@ -464,8 +464,8 @@ void KABC::ResourceScalix::fromKMailDelIncidence( const QString& type,
}
}
-void KABC::ResourceScalix::fromKMailRefresh( const QString& type,
- const QString& /*subResource*/ )
+void KABC::ResourceScalix::fromKMailRefresh( const TQString& type,
+ const TQString& /*subResource*/ )
{
// Check if this is a contact
if( type != s_kmailContentsType ) return;
@@ -476,9 +476,9 @@ void KABC::ResourceScalix::fromKMailRefresh( const QString& type,
addressBook()->emitAddressBookChanged();
}
-void KABC::ResourceScalix::fromKMailAddSubresource( const QString& type,
- const QString& subResource,
- const QString& label,
+void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type,
+ const TQString& subResource,
+ const TQString& label,
bool writable )
{
if( type != s_kmailContentsType ) return;
@@ -495,8 +495,8 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const QString& type,
emit signalSubresourceAdded( this, type, subResource );
}
-void KABC::ResourceScalix::fromKMailDelSubresource( const QString& type,
- const QString& subResource )
+void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
+ const TQString& subResource )
{
if( type != s_kmailContentsType ) return;
@@ -513,7 +513,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const QString& type,
// Make a list of all uids to remove
Scalix::UidMap::ConstIterator mapIt;
- QStringList uids;
+ TQStringList uids;
for ( mapIt = mUidMap.begin(); mapIt != mUidMap.end(); ++mapIt )
if ( mapIt.data().resource() == subResource )
// We have a match
@@ -521,7 +521,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const QString& type,
// Finally delete all the incidences
if ( !uids.isEmpty() ) {
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for ( it = uids.begin(); it != uids.end(); ++it ) {
mAddrMap.remove( *it );
mUidMap.remove( *it );
@@ -535,13 +535,13 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const QString& type,
-void KABC::ResourceScalix::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& /* type */,
- const QString& folder )
+void KABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& /* type */,
+ const TQString& folder )
{
// FIXME
KMailICalIface::StorageFormat format = KMailICalIface::StorageXML;
- for( QMap<Q_UINT32, QString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+ for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
loadContact( it.data(), folder, it.key(), format );
}
if ( !addressBook() ){
@@ -550,12 +550,12 @@ void KABC::ResourceScalix::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QStrin
addressBook()->emitAddressBookChanged();
}
-QStringList KABC::ResourceScalix::subresources() const
+TQStringList KABC::ResourceScalix::subresources() const
{
return mSubResources.keys();
}
-bool KABC::ResourceScalix::subresourceActive( const QString& subresource ) const
+bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].active();
@@ -567,7 +567,7 @@ bool KABC::ResourceScalix::subresourceActive( const QString& subresource ) const
return true;
}
-bool KABC::ResourceScalix::subresourceWritable( const QString& subresource ) const
+bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].writable();
@@ -575,7 +575,7 @@ bool KABC::ResourceScalix::subresourceWritable( const QString& subresource ) con
return false; //better a safe default
}
-int KABC::ResourceScalix::subresourceCompletionWeight( const QString& subresource ) const
+int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].completionWeight();
@@ -586,17 +586,17 @@ int KABC::ResourceScalix::subresourceCompletionWeight( const QString& subresourc
return 80;
}
-QString KABC::ResourceScalix::subresourceLabel( const QString& subresource ) const
+TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].label();
}
kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!\n";
- return QString::null;
+ return TQString::null;
}
-void KABC::ResourceScalix::setSubresourceCompletionWeight( const QString& subresource, int completionWeight )
+void KABC::ResourceScalix::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
{
if ( mSubResources.contains( subresource ) ) {
mSubResources[ subresource ].setCompletionWeight( completionWeight );
@@ -605,17 +605,17 @@ void KABC::ResourceScalix::setSubresourceCompletionWeight( const QString& subres
}
}
-QMap<QString, QString> KABC::ResourceScalix::uidToResourceMap() const
+TQMap<TQString, TQString> KABC::ResourceScalix::uidToResourceMap() const
{
// TODO: Couldn't this be made simpler?
- QMap<QString, QString> map;
+ TQMap<TQString, TQString> map;
Scalix::UidMap::ConstIterator mapIt;
for ( mapIt = mUidMap.begin(); mapIt != mUidMap.end(); ++mapIt )
map[ mapIt.key() ] = mapIt.data().resource();
return map;
}
-void KABC::ResourceScalix::setSubresourceActive( const QString &subresource, bool active )
+void KABC::ResourceScalix::setSubresourceActive( const TQString &subresource, bool active )
{
if ( mSubResources.contains( subresource ) ) {
mSubResources[ subresource ].setActive( active );
diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h
index 10d3d8aa5..25eca7e49 100644
--- a/kresources/scalix/kabc/resourcescalix.h
+++ b/kresources/scalix/kabc/resourcescalix.h
@@ -107,61 +107,61 @@ public:
virtual void removeAddressee( const Addressee& addr );
// Listen to KMail changes in the amount of sub resources
- void fromKMailAddSubresource( const QString& type, const QString& id,
- const QString& label, bool writable );
- void fromKMailDelSubresource( const QString& type, const QString& id );
+ void fromKMailAddSubresource( const TQString& type, const TQString& id,
+ const TQString& label, bool writable );
+ void fromKMailDelSubresource( const TQString& type, const TQString& id );
- bool fromKMailAddIncidence( const QString& type, const QString& resource,
- Q_UINT32 sernum, int format, const QString& contact );
- void fromKMailDelIncidence( const QString& type, const QString& resource,
- const QString& contact );
- void fromKMailRefresh( const QString& type, const QString& resource );
+ bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
+ Q_UINT32 sernum, int format, const TQString& contact );
+ void fromKMailDelIncidence( const TQString& type, const TQString& resource,
+ const TQString& contact );
+ void fromKMailRefresh( const TQString& type, const TQString& resource );
- void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder );
+ void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder );
/// Return the list of subresources.
- QStringList subresources() const;
+ TQStringList subresources() const;
/// Is this subresource active?
- bool subresourceActive( const QString& ) const;
+ bool subresourceActive( const TQString& ) const;
/// Is this subresource writabel?
- bool subresourceWritable( const QString& ) const;
+ bool subresourceWritable( const TQString& ) const;
- virtual void setSubresourceActive( const QString &, bool );
+ virtual void setSubresourceActive( const TQString &, bool );
/// Completion weight for a given subresource
- virtual int subresourceCompletionWeight( const QString& ) const;
+ virtual int subresourceCompletionWeight( const TQString& ) const;
/// Label for a given subresource
- virtual QString subresourceLabel( const QString& ) const;
+ virtual TQString subresourceLabel( const TQString& ) const;
/// Set completion weight for a given subresource
- virtual void setSubresourceCompletionWeight( const QString&, int );
+ virtual void setSubresourceCompletionWeight( const TQString&, int );
/// Give the uidmap. Used for ordered searching
- QMap<QString, QString> uidToResourceMap() const;
+ TQMap<TQString, TQString> uidToResourceMap() const;
protected:
bool kmailUpdateAddressee( const Addressee& );
void doClose();
- void loadSubResourceConfig( KConfig& config, const QString& name,
- const QString& label, bool writable );
- bool loadSubResource( const QString& subResource );
- bool loadSubResourceHelper( const QString& subResource, const char* mimetype, KMailICalIface::StorageFormat format );
- QString loadContact( const QString& contactData, const QString& subResource,
+ void loadSubResourceConfig( KConfig& config, const TQString& name,
+ const TQString& label, bool writable );
+ bool loadSubResource( const TQString& subResource );
+ bool loadSubResourceHelper( const TQString& subResource, const char* mimetype, KMailICalIface::StorageFormat format );
+ TQString loadContact( const TQString& contactData, const TQString& subResource,
Q_UINT32 sernum, const KMailICalIface::StorageFormat format );
- QString configFile() const {
+ TQString configFile() const {
return Scalix::ResourceScalixBase::configFile( "kabc" );
}
// The list of subresources
Scalix::ResourceMap mSubResources;
- QString mCachedSubresource;
+ TQString mCachedSubresource;
bool mLocked;
};
diff --git a/kresources/scalix/kabc/resourcescalix_plugin.cpp b/kresources/scalix/kabc/resourcescalix_plugin.cpp
index 95bc28beb..a5f289a78 100644
--- a/kresources/scalix/kabc/resourcescalix_plugin.cpp
+++ b/kresources/scalix/kabc/resourcescalix_plugin.cpp
@@ -43,7 +43,7 @@ class ScalixFactory : public KRES::PluginFactoryBase
return new KABC::ResourceScalix( config );
}
- KRES::ConfigWidget *configWidget( QWidget* )
+ KRES::ConfigWidget *configWidget( TQWidget* )
{
return 0;
}
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index 9a8beeb9e..d2849e862 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -43,9 +43,9 @@
#include <kmainwindow.h>
#include <klocale.h>
-#include <qobject.h>
-#include <qtimer.h>
-#include <qapplication.h>
+#include <tqobject.h>
+#include <tqtimer.h>
+#include <tqapplication.h>
#include <assert.h>
@@ -63,11 +63,11 @@ static const char* incidenceInlineMimeType = "text/calendar";
ResourceScalix::ResourceScalix( const KConfig *config )
: ResourceCalendar( config ), ResourceScalixBase( "ResourceScalix-libkcal" ),
- mCalendar( QString::fromLatin1("UTC") ), mOpen( false )
+ mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
{
setType( "scalix" );
- connect( &mResourceChangedTimer, SIGNAL( timeout() ),
- this, SLOT( slotEmitResourceChanged() ) );
+ connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotEmitResourceChanged() ) );
}
ResourceScalix::~ResourceScalix()
@@ -80,8 +80,8 @@ ResourceScalix::~ResourceScalix()
}
void ResourceScalix::loadSubResourceConfig( KConfig& config,
- const QString& name,
- const QString& label,
+ const TQString& name,
+ const TQString& label,
bool writable,
ResourceMap& subResource )
{
@@ -94,11 +94,11 @@ bool ResourceScalix::openResource( KConfig& config, const char* contentType,
ResourceMap& map )
{
// Read the subresource entries from KMail
- QValueList<KMailICalIface::SubResource> subResources;
+ TQValueList<KMailICalIface::SubResource> subResources;
if ( !kmailSubresources( subResources, contentType ) )
return false;
map.clear();
- QValueList<KMailICalIface::SubResource>::ConstIterator it;
+ TQValueList<KMailICalIface::SubResource>::ConstIterator it;
for ( it = subResources.begin(); it != subResources.end(); ++it )
loadSubResourceConfig( config, (*it).location, (*it).label, (*it).writable, map );
return true;
@@ -142,7 +142,7 @@ void ResourceScalix::doClose()
closeResource( config, mJournalSubResources );
}
-bool ResourceScalix::loadSubResource( const QString& subResource,
+bool ResourceScalix::loadSubResource( const TQString& subResource,
const char* mimetype )
{
int count = 0;
@@ -156,10 +156,10 @@ bool ResourceScalix::loadSubResource( const QString& subResource,
const int nbMessages = 200; // read 200 mails at a time (see kabc resource)
- const QString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
+ const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
: !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." )
: i18n( "Loading events..." );
- const bool useProgress = qApp && qApp->type() != QApplication::Tty && count > mProgressDialogIncidenceLimit;
+ const bool useProgress = qApp && qApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
if ( useProgress )
(void)::Observer::self(); // ensure kio_uiserver is running
UIServer_stub uiserver( "kio_uiserver", "UIServer" );
@@ -172,7 +172,7 @@ bool ResourceScalix::loadSubResource( const QString& subResource,
}
for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) {
- QMap<Q_UINT32, QString> lst;
+ TQMap<Q_UINT32, TQString> lst;
if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
kdError(5650) << "Communication problem in ResourceScalix::load()\n";
if ( progressId )
@@ -182,7 +182,7 @@ bool ResourceScalix::loadSubResource( const QString& subResource,
{ // for RAII scoping below
TemporarySilencer t( this );
- for( QMap<Q_UINT32, QString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+ for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
addIncidence( mimetype, it.data(), subResource, it.key() );
}
}
@@ -238,7 +238,7 @@ bool ResourceScalix::loadAllJournals()
return doLoadAll( mJournalSubResources, incidenceInlineMimeType );
}
-void ResourceScalix::removeIncidences( const QCString& incidenceType )
+void ResourceScalix::removeIncidences( const TQCString& incidenceType )
{
Scalix::UidMap::Iterator mapIt = mUidMap.begin();
while ( mapIt != mUidMap.end() )
@@ -250,7 +250,7 @@ void ResourceScalix::removeIncidences( const QCString& incidenceType )
// A faster but hackish way would probably be to check the type of the resource,
// like mEventSubResources.find( it.data().resource() ) != mEventSubResources.end() ?
- const QString& uid = it.key();
+ const TQString& uid = it.key();
if ( incidenceType == "Event" && mCalendar.event( uid ) )
mUidMap.remove( it );
else if ( incidenceType == "Todo" && mCalendar.todo( uid ) )
@@ -269,12 +269,12 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
{
if ( incidencebase->isReadOnly() ) return; // Should not happen (TM)
incidencebase->setSyncStatus( KCal::Event::SYNCMOD );
- incidencebase->setLastModified( QDateTime::currentDateTime() );
+ incidencebase->setLastModified( TQDateTime::currentDateTime() );
// we should probably update the revision number here,
// or internally in the Event itself when certain things change.
// need to verify with ical documentation.
- const QString uid = incidencebase->uid();
+ const TQString uid = incidencebase->uid();
if ( mUidsPendingUpdate.contains( uid ) || mUidsPendingAdding.contains( uid ) ) {
/* We are currently processing this event ( removing and readding or
@@ -284,7 +284,7 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
return;
}
- QString subResource;
+ TQString subResource;
Q_UINT32 sernum = 0;
if ( mUidMap.contains( uid ) ) {
subResource = mUidMap[ uid ].resource();
@@ -294,7 +294,7 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
sendKMailUpdate( incidencebase, subResource, sernum );
}
-void ResourceScalix::resolveConflict( KCal::Incidence* inc, const QString& subresource, Q_UINT32 sernum )
+void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subresource, Q_UINT32 sernum )
{
if ( ! inc )
return;
@@ -310,7 +310,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const QString& subre
KIncidenceChooser* ch = new KIncidenceChooser();
ch->setIncidence( local ,inc );
if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) {
- connect ( this, SIGNAL( useGlobalMode() ), ch, SLOT ( useGlobalMode() ) );
+ connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) );
if ( ch->exec() )
if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask )
emit useGlobalMode() ;
@@ -343,8 +343,8 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const QString& subre
mSilent = silent;
}
}
-void ResourceScalix::addIncidence( const char* mimetype, const QString& data,
- const QString& subResource, Q_UINT32 sernum )
+void ResourceScalix::addIncidence( const char* mimetype, const TQString& data,
+ const TQString& subResource, Q_UINT32 sernum )
{
// This uses pointer comparison, so it only works if we use the static
// objects defined in the top of the file
@@ -353,12 +353,12 @@ void ResourceScalix::addIncidence( const char* mimetype, const QString& data,
}
-bool ResourceScalix::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const QString& subresource,
+bool ResourceScalix::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const TQString& subresource,
Q_UINT32 sernum )
{
- const QString& type = incidencebase->type();
+ const TQString& type = incidencebase->type();
const char* mimetype = 0;
- QString data;
+ TQString data;
if ( type == "Event" ) {
mimetype = incidenceInlineMimeType;
data = mFormat.createScheduleMessage( static_cast<KCal::Event *>(incidencebase),
@@ -385,7 +385,7 @@ bool ResourceScalix::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const
else if ( type == "Todo" )
customHeaders.insert( "X-Scalix-Class", "IPM.Task" );
- QString subject = incidence->summary();
+ TQString subject = incidence->summary();
// behold, sernum is an in-parameter
const bool rc = kmailUpdate( subresource, sernum, data, mimetype, subject, customHeaders );
@@ -396,17 +396,17 @@ bool ResourceScalix::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const
return rc;
}
-bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const QString& _subresource,
+bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _subresource,
Q_UINT32 sernum )
{
Q_ASSERT( incidence );
if ( !incidence ) return false;
- const QString &uid = incidence->uid();
- QString subResource = _subresource;
+ const TQString &uid = incidence->uid();
+ TQString subResource = _subresource;
Scalix::ResourceMap *map = &mEventSubResources; // don't use a ref here!
- const QString& type = incidence->type();
+ const TQString& type = incidence->type();
if ( type == "Event" )
map = &mEventSubResources;
else if ( type == "Todo" )
@@ -507,14 +507,14 @@ bool ResourceScalix::addEvent( KCal::Event* event )
if ( mUidMap.contains( event->uid() ) )
return true; //noop
else
- return addIncidence( event, QString::null, 0 );
+ return addIncidence( event, TQString::null, 0 );
}
bool ResourceScalix::deleteIncidence( KCal::Incidence* incidence )
{
if ( incidence->isReadOnly() ) return false;
- const QString uid = incidence->uid();
+ const TQString uid = incidence->uid();
if( !mUidMap.contains( uid ) ) return false; // Odd
/* The user told us to delete, tell KMail */
if ( !mSilent ) {
@@ -535,7 +535,7 @@ bool ResourceScalix::deleteEvent( KCal::Event* event )
return deleteIncidence( event );
}
-KCal::Event* ResourceScalix::event( const QString& uid )
+KCal::Event* ResourceScalix::event( const TQString& uid )
{
return mCalendar.event(uid);
}
@@ -545,20 +545,20 @@ KCal::Event::List ResourceScalix::rawEvents( EventSortField sortField, SortDirec
return mCalendar.rawEvents( sortField, sortDirection );
}
-KCal::Event::List ResourceScalix::rawEventsForDate( const QDate& date,
+KCal::Event::List ResourceScalix::rawEventsForDate( const TQDate& date,
EventSortField sortField,
SortDirection sortDirection )
{
return mCalendar.rawEventsForDate( date, sortField, sortDirection );
}
-KCal::Event::List ResourceScalix::rawEventsForDate( const QDateTime& qdt )
+KCal::Event::List ResourceScalix::rawEventsForDate( const TQDateTime& qdt )
{
return mCalendar.rawEventsForDate( qdt );
}
-KCal::Event::List ResourceScalix::rawEvents( const QDate& start,
- const QDate& end,
+KCal::Event::List ResourceScalix::rawEvents( const TQDate& start,
+ const TQDate& end,
bool inclusive )
{
return mCalendar.rawEvents( start, end, inclusive );
@@ -569,7 +569,7 @@ bool ResourceScalix::addTodo( KCal::Todo* todo )
if ( mUidMap.contains( todo->uid() ) )
return true; //noop
else
- return addIncidence( todo, QString::null, 0 );
+ return addIncidence( todo, TQString::null, 0 );
}
bool ResourceScalix::deleteTodo( KCal::Todo* todo )
@@ -577,7 +577,7 @@ bool ResourceScalix::deleteTodo( KCal::Todo* todo )
return deleteIncidence( todo );
}
-KCal::Todo* ResourceScalix::todo( const QString& uid )
+KCal::Todo* ResourceScalix::todo( const TQString& uid )
{
return mCalendar.todo( uid );
}
@@ -587,7 +587,7 @@ KCal::Todo::List ResourceScalix::rawTodos( TodoSortField sortField, SortDirectio
return mCalendar.rawTodos( sortField, sortDirection );
}
-KCal::Todo::List ResourceScalix::rawTodosForDate( const QDate& date )
+KCal::Todo::List ResourceScalix::rawTodosForDate( const TQDate& date )
{
return mCalendar.rawTodosForDate( date );
}
@@ -597,7 +597,7 @@ bool ResourceScalix::addJournal( KCal::Journal* journal )
if ( mUidMap.contains( journal->uid() ) )
return true; //noop
else
- return addIncidence( journal, QString::null, 0 );
+ return addIncidence( journal, TQString::null, 0 );
}
bool ResourceScalix::deleteJournal( KCal::Journal* journal )
@@ -605,7 +605,7 @@ bool ResourceScalix::deleteJournal( KCal::Journal* journal )
return deleteIncidence( journal );
}
-KCal::Journal* ResourceScalix::journal( const QString& uid )
+KCal::Journal* ResourceScalix::journal( const TQString& uid )
{
return mCalendar.journal(uid);
}
@@ -615,33 +615,33 @@ KCal::Journal::List ResourceScalix::rawJournals( JournalSortField sortField, Sor
return mCalendar.rawJournals( sortField, sortDirection );
}
-KCal::Journal::List ResourceScalix::rawJournalsForDate( const QDate &date )
+KCal::Journal::List ResourceScalix::rawJournalsForDate( const TQDate &date )
{
return mCalendar.rawJournalsForDate( date );
}
-KCal::Alarm::List ResourceScalix::alarms( const QDateTime& from,
- const QDateTime& to )
+KCal::Alarm::List ResourceScalix::alarms( const TQDateTime& from,
+ const TQDateTime& to )
{
return mCalendar.alarms( from, to );
}
-KCal::Alarm::List ResourceScalix::alarmsTo( const QDateTime& to )
+KCal::Alarm::List ResourceScalix::alarmsTo( const TQDateTime& to )
{
return mCalendar.alarmsTo(to);
}
-void ResourceScalix::setTimeZoneId( const QString& tzid )
+void ResourceScalix::setTimeZoneId( const TQString& tzid )
{
mCalendar.setTimeZoneId( tzid );
mFormat.setTimeZone( mCalendar.timeZoneId(), !mCalendar.isLocalTime() );
}
-bool ResourceScalix::fromKMailAddIncidence( const QString& type,
- const QString& subResource,
+bool ResourceScalix::fromKMailAddIncidence( const TQString& type,
+ const TQString& subResource,
Q_UINT32 sernum,
int /*format*/,
- const QString& data )
+ const TQString& data )
{
bool rc = true;
TemporarySilencer t( this ); // RAII
@@ -660,9 +660,9 @@ bool ResourceScalix::fromKMailAddIncidence( const QString& type,
return rc;
}
-void ResourceScalix::fromKMailDelIncidence( const QString& type,
- const QString& subResource,
- const QString& uid )
+void ResourceScalix::fromKMailDelIncidence( const TQString& type,
+ const TQString& subResource,
+ const TQString& uid )
{
if ( type != kmailCalendarContentsType && type != kmailTodoContentsType
&& type != kmailJournalContentsType )
@@ -688,8 +688,8 @@ void ResourceScalix::fromKMailDelIncidence( const QString& type,
}
}
-void ResourceScalix::fromKMailRefresh( const QString& type,
- const QString& /*subResource*/ )
+void ResourceScalix::fromKMailRefresh( const TQString& type,
+ const TQString& /*subResource*/ )
{
// TODO: Only load the specified subResource
if ( type == "Calendar" )
@@ -703,9 +703,9 @@ void ResourceScalix::fromKMailRefresh( const QString& type,
mResourceChangedTimer.changeInterval( 100 );
}
-void ResourceScalix::fromKMailAddSubresource( const QString& type,
- const QString& subResource,
- const QString& label,
+void ResourceScalix::fromKMailAddSubresource( const TQString& type,
+ const TQString& subResource,
+ const TQString& label,
bool writable )
{
ResourceMap* map = 0;
@@ -736,8 +736,8 @@ void ResourceScalix::fromKMailAddSubresource( const QString& type,
emit signalSubresourceAdded( this, type, subResource, label );
}
-void ResourceScalix::fromKMailDelSubresource( const QString& type,
- const QString& subResource )
+void ResourceScalix::fromKMailDelSubresource( const TQString& type,
+ const TQString& subResource )
{
ResourceMap* map = subResourceMap( type );
if ( !map ) // not ours
@@ -755,7 +755,7 @@ void ResourceScalix::fromKMailDelSubresource( const QString& type,
// Make a list of all uids to remove
Scalix::UidMap::ConstIterator mapIt;
- QStringList uids;
+ TQStringList uids;
for ( mapIt = mUidMap.begin(); mapIt != mUidMap.end(); ++mapIt )
if ( mapIt.data().resource() == subResource )
// We have a match
@@ -764,7 +764,7 @@ void ResourceScalix::fromKMailDelSubresource( const QString& type,
// Finally delete all the incidences
if ( !uids.isEmpty() ) {
TemporarySilencer t( this );
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for ( it = uids.begin(); it != uids.end(); ++it ) {
KCal::Incidence* incidence = mCalendar.incidence( *it );
if( incidence )
@@ -776,7 +776,7 @@ void ResourceScalix::fromKMailDelSubresource( const QString& type,
emit signalSubresourceRemoved( this, type, subResource );
}
-QStringList ResourceScalix::subresources() const
+TQStringList ResourceScalix::subresources() const
{
// Workaround: The ResourceView in KOrganizer wants to know this
// before it opens the resource :-( Make sure we are open
@@ -787,7 +787,7 @@ QStringList ResourceScalix::subresources() const
}
const QString
-ResourceScalix::labelForSubresource( const QString& subresource ) const
+ResourceScalix::labelForSubresource( const TQString& subresource ) const
{
if ( mEventSubResources.contains( subresource ) )
return mEventSubResources[ subresource ].label();
@@ -798,28 +798,28 @@ ResourceScalix::labelForSubresource( const QString& subresource ) const
return subresource;
}
-QString ResourceScalix::subresourceIdentifier( Incidence *incidence )
+TQString ResourceScalix::subresourceIdentifier( Incidence *incidence )
{
- QString uid = incidence->uid();
+ TQString uid = incidence->uid();
if ( mUidMap.contains( uid ) )
return mUidMap[ uid ].resource();
else
if ( mNewIncidencesMap.contains( uid ) )
return mNewIncidencesMap[ uid ];
else
- return QString();
+ return TQString();
}
-void ResourceScalix::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder )
+void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder )
{
TemporarySilencer t( this );
- for( QMap<Q_UINT32, QString>::ConstIterator it = map.begin(); it != map.end(); ++it )
+ for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
addIncidence( type.latin1(), it.data(), folder, it.key() );
}
-bool ResourceScalix::subresourceActive( const QString& subresource ) const
+bool ResourceScalix::subresourceActive( const TQString& subresource ) const
{
// Workaround: The ResourceView in KOrganizer wants to know this
// before it opens the resource :-( Make sure we are open
@@ -838,7 +838,7 @@ bool ResourceScalix::subresourceActive( const QString& subresource ) const
return true;
}
-void ResourceScalix::setSubresourceActive( const QString &subresource, bool v )
+void ResourceScalix::setSubresourceActive( const TQString &subresource, bool v )
{
ResourceMap *map = 0;
@@ -869,7 +869,7 @@ KABC::Lock* ResourceScalix::lock()
}
-Scalix::ResourceMap* ResourceScalix::subResourceMap( const QString& contentsType )
+Scalix::ResourceMap* ResourceScalix::subResourceMap( const TQString& contentsType )
{
if ( contentsType == kmailCalendarContentsType ) {
return &mEventSubResources;
diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index 0c845a6ce..223161b4b 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -34,7 +34,7 @@
#ifndef KCAL_RESOURCESCALIX_H
#define KCAL_RESOURCESCALIX_H
-#include <qtimer.h>
+#include <tqtimer.h>
#include <kdepimmacros.h>
#include <libkcal/calendarlocal.h>
@@ -71,63 +71,63 @@ public:
// The libkcal functions. See the resource for descriptions
bool addEvent( KCal::Event* anEvent );
bool deleteEvent( KCal::Event* );
- KCal::Event* event( const QString &UniqueStr );
+ KCal::Event* event( const TQString &UniqueStr );
KCal::Event::List rawEvents( EventSortField sortField = EventSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
KCal::Event::List rawEventsForDate(
- const QDate& date,
+ const TQDate& date,
EventSortField sortField=EventSortUnsorted,
SortDirection sortDirection=SortDirectionAscending );
- KCal::Event::List rawEventsForDate( const QDateTime& qdt );
- KCal::Event::List rawEvents( const QDate& start, const QDate& end,
+ KCal::Event::List rawEventsForDate( const TQDateTime& qdt );
+ KCal::Event::List rawEvents( const TQDate& start, const TQDate& end,
bool inclusive = false );
bool addTodo( KCal::Todo* todo );
bool deleteTodo( KCal::Todo* );
- KCal::Todo* todo( const QString& uid );
+ KCal::Todo* todo( const TQString& uid );
KCal::Todo::List rawTodos( TodoSortField sortField = TodoSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
- KCal::Todo::List rawTodosForDate( const QDate& date );
+ KCal::Todo::List rawTodosForDate( const TQDate& date );
bool addJournal( KCal::Journal* );
bool deleteJournal( KCal::Journal* );
- KCal::Journal* journal( const QString& uid );
+ KCal::Journal* journal( const TQString& uid );
KCal::Journal::List rawJournals( JournalSortField sortField = JournalSortUnsorted, SortDirection sortDirection = SortDirectionAscending );
- KCal::Journal::List rawJournalsForDate( const QDate &date );
+ KCal::Journal::List rawJournalsForDate( const TQDate &date );
- KCal::Alarm::List alarms( const QDateTime& from, const QDateTime& to );
- KCal::Alarm::List alarmsTo( const QDateTime& to );
+ KCal::Alarm::List alarms( const TQDateTime& from, const TQDateTime& to );
+ KCal::Alarm::List alarmsTo( const TQDateTime& to );
- void setTimeZoneId( const QString& tzid );
+ void setTimeZoneId( const TQString& tzid );
bool deleteIncidence( KCal::Incidence* i );
/// The ResourceScalixBase methods called by KMail
- bool fromKMailAddIncidence( const QString& type, const QString& subResource,
- Q_UINT32 sernum, int format, const QString& data );
- void fromKMailDelIncidence( const QString& type, const QString& subResource,
- const QString& uid );
- void fromKMailRefresh( const QString& type, const QString& subResource );
+ bool fromKMailAddIncidence( const TQString& type, const TQString& subResource,
+ Q_UINT32 sernum, int format, const TQString& data );
+ void fromKMailDelIncidence( const TQString& type, const TQString& subResource,
+ const TQString& uid );
+ void fromKMailRefresh( const TQString& type, const TQString& subResource );
/// Listen to KMail changes in the amount of sub resources
- void fromKMailAddSubresource( const QString& type, const QString& subResource,
- const QString& label, bool writable );
- void fromKMailDelSubresource( const QString& type, const QString& subResource );
+ void fromKMailAddSubresource( const TQString& type, const TQString& subResource,
+ const TQString& label, bool writable );
+ void fromKMailDelSubresource( const TQString& type, const TQString& subResource );
- void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder );
+ void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder );
/** Return the list of subresources. */
- QStringList subresources() const;
+ TQStringList subresources() const;
/** Is this subresource active? */
- bool subresourceActive( const QString& ) const;
+ bool subresourceActive( const TQString& ) const;
/** (De)activate the subresource */
- virtual void setSubresourceActive( const QString &, bool );
+ virtual void setSubresourceActive( const TQString &, bool );
/** What is the label for this subresource? */
- virtual const QString labelForSubresource( const QString& resource ) const;
+ virtual const TQString labelForSubresource( const TQString& resource ) const;
- virtual QString subresourceIdentifier( Incidence *incidence );
+ virtual TQString subresourceIdentifier( Incidence *incidence );
KABC::Lock* lock();
@@ -137,20 +137,20 @@ protected slots:
void slotEmitResourceChanged();
private:
- void removeIncidences( const QCString& incidenceType );
- void resolveConflict( KCal::Incidence*, const QString& subresource, Q_UINT32 sernum );
+ void removeIncidences( const TQCString& incidenceType );
+ void resolveConflict( KCal::Incidence*, const TQString& subresource, Q_UINT32 sernum );
- void addIncidence( const char* mimetype, const QString& xml,
- const QString& subResource, Q_UINT32 sernum );
+ void addIncidence( const char* mimetype, const TQString& xml,
+ const TQString& subResource, Q_UINT32 sernum );
- bool addIncidence( KCal::Incidence* i, const QString& subresource,
+ bool addIncidence( KCal::Incidence* i, const TQString& subresource,
Q_UINT32 sernum );
/*
- void addEvent( const QString& xml, const QString& subresource,
+ void addEvent( const TQString& xml, const TQString& subresource,
Q_UINT32 sernum );
- void addTodo( const QString& xml, const QString& subresource,
+ void addTodo( const TQString& xml, const TQString& subresource,
Q_UINT32 sernum );
- void addJournal( const QString& xml, const QString& subresource,
+ void addJournal( const TQString& xml, const TQString& subresource,
Q_UINT32 sernum );
*/
@@ -165,18 +165,18 @@ private:
bool openResource( KConfig& config, const char* contentType,
Scalix::ResourceMap& map );
- void loadSubResourceConfig( KConfig& config, const QString& name,
- const QString& label, bool writable,
+ void loadSubResourceConfig( KConfig& config, const TQString& name,
+ const TQString& label, bool writable,
Scalix::ResourceMap& subResource );
- bool loadSubResource( const QString& subResource, const char* mimetype );
+ bool loadSubResource( const TQString& subResource, const char* mimetype );
- QString configFile() const {
+ TQString configFile() const {
return ResourceScalixBase::configFile( "kcal" );
}
- Scalix::ResourceMap* subResourceMap( const QString& contentsType );
+ Scalix::ResourceMap* subResourceMap( const TQString& contentsType );
- bool sendKMailUpdate( KCal::IncidenceBase* incidence, const QString& _subresource,
+ bool sendKMailUpdate( KCal::IncidenceBase* incidence, const TQString& _subresource,
Q_UINT32 sernum );
@@ -186,8 +186,8 @@ private:
Scalix::ResourceMap mEventSubResources, mTodoSubResources, mJournalSubResources;
bool mOpen; // If the resource is open, this is true
- QDict<KCal::IncidenceBase> mPendingUpdates;
- QTimer mResourceChangedTimer;
+ TQDict<KCal::IncidenceBase> mPendingUpdates;
+ TQTimer mResourceChangedTimer;
ICalFormat mFormat;
/**
@@ -197,7 +197,7 @@ private:
We can't trust on mUidMap here, because it contains only non-pending uids.
*/
- QMap<QString, QString> mNewIncidencesMap;
+ TQMap<TQString, TQString> mNewIncidencesMap;
int mProgressDialogIncidenceLimit;
};
diff --git a/kresources/scalix/kcal/resourcescalix_plugin.cpp b/kresources/scalix/kcal/resourcescalix_plugin.cpp
index 53ac6705f..a36f5bf2c 100644
--- a/kresources/scalix/kcal/resourcescalix_plugin.cpp
+++ b/kresources/scalix/kcal/resourcescalix_plugin.cpp
@@ -41,7 +41,7 @@ public:
return new KCal::ResourceScalix( config );
}
- KRES::ConfigWidget *configWidget( QWidget* )
+ KRES::ConfigWidget *configWidget( TQWidget* )
{
return 0;
}
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index 199bd0980..043b0f4a1 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-#include <qeventloop.h>
+#include <tqapplication.h>
+#include <tqeventloop.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
@@ -62,7 +62,7 @@ int kdemain( int argc, char **argv )
return 0;
}
-Scalix::Scalix( const QCString &protocol, const QCString &pool, const QCString &app )
+Scalix::Scalix( const TQCString &protocol, const TQCString &pool, const TQCString &app )
: SlaveBase( protocol, pool, app )
{
}
@@ -71,7 +71,7 @@ void Scalix::get( const KURL &url )
{
mimeType( "text/plain" );
- QString path = url.path();
+ TQString path = url.path();
if ( path.contains( "/freebusy/" ) ) {
retrieveFreeBusy( url );
@@ -82,7 +82,7 @@ void Scalix::get( const KURL &url )
void Scalix::put( const KURL& url, int, bool, bool )
{
- QString path = url.path();
+ TQString path = url.path();
if ( path.contains( "/freebusy/" ) ) {
publishFreeBusy( url );
@@ -99,27 +99,27 @@ void Scalix::retrieveFreeBusy( const KURL &url )
*/
// Extract user@domain (e.g. everything between '/freebusy/' and '.ifb')
- const QString requestUser = url.path().mid( 10, url.path().length() - 14 );
+ const TQString requestUser = url.path().mid( 10, url.path().length() - 14 );
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
- const QString argument = QString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).arg( requestUser );
- const QString command = QString( "X-GET-ICAL-FREEBUSY {%1}" ).arg( argument.length() );
+ const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).arg( requestUser );
+ const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).arg( argument.length() );
stream << (int) 'X' << 'E' << command << argument;
- QString imapUrl = QString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
+ TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
url.user() : url.user() + ":" + url.pass() )
.arg( url.host() );
- mFreeBusyData = QString();
+ mFreeBusyData = TQString();
KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false );
- connect( job, SIGNAL( infoMessage( KIO::Job*, const QString& ) ),
- this, SLOT( slotInfoMessage( KIO::Job*, const QString& ) ) );
- connect( job, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( slotRetrieveResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
+ this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( slotRetrieveResult( KIO::Job* ) ) );
qApp->eventLoop()->enterLoop();
}
@@ -130,8 +130,8 @@ void Scalix::publishFreeBusy( const KURL &url )
* The url is of the following form:
* scalix://user:password@host/freebusy/path/to/calendar/user@domain
*/
- QString requestUser, calendar;
- QString path = url.path();
+ TQString requestUser, calendar;
+ TQString path = url.path();
// extract user name
int lastSlash = path.findRev( '/' );
@@ -149,11 +149,11 @@ void Scalix::publishFreeBusy( const KURL &url )
};
// read freebusy information
- QByteArray data;
+ TQByteArray data;
while ( true ) {
dataReq();
- QByteArray buffer;
+ TQByteArray buffer;
const int newSize = readData(buffer);
if ( newSize < 0 ) {
// read error: network in unknown state so disconnect
@@ -169,26 +169,26 @@ void Scalix::publishFreeBusy( const KURL &url )
memcpy( data.data() + oldSize, buffer.data(), buffer.size() );
}
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
- const QString argument = QString::fromUtf8( data );
- const QString command = QString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).arg( argument.length() );
+ const TQString argument = TQString::fromUtf8( data );
+ const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).arg( argument.length() );
stream << (int) 'X' << 'E' << command << argument;
- QString imapUrl = QString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
+ TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
url.user() : url.user() + ":" + url.pass() )
.arg( url.host() );
KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false );
- connect( job, SIGNAL( result( KIO::Job* ) ),
- this, SLOT( slotPublishResult( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
+ this, TQT_SLOT( slotPublishResult( KIO::Job* ) ) );
qApp->eventLoop()->enterLoop();
}
-void Scalix::slotInfoMessage( KIO::Job *job, const QString &data )
+void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data )
{
if ( job->error() ) {
// error is handled in slotResult
diff --git a/kresources/scalix/kioslave/scalix.h b/kresources/scalix/kioslave/scalix.h
index 3697c49d7..25a2fdeac 100644
--- a/kresources/scalix/kioslave/scalix.h
+++ b/kresources/scalix/kioslave/scalix.h
@@ -24,14 +24,14 @@
#include <kio/job.h>
#include <kio/slavebase.h>
-#include <qobject.h>
+#include <tqobject.h>
-class Scalix : public QObject, public KIO::SlaveBase
+class Scalix : public TQObject, public KIO::SlaveBase
{
Q_OBJECT
public:
- Scalix( const QCString &protocol, const QCString &pool, const QCString &app );
+ Scalix( const TQCString &protocol, const TQCString &pool, const TQCString &app );
void get( const KURL &url );
void put( const KURL &url, int permissions, bool overwrite, bool resume );
@@ -39,13 +39,13 @@ class Scalix : public QObject, public KIO::SlaveBase
private slots:
void slotRetrieveResult( KIO::Job* );
void slotPublishResult( KIO::Job* );
- void slotInfoMessage( KIO::Job*, const QString& );
+ void slotInfoMessage( KIO::Job*, const TQString& );
private:
void retrieveFreeBusy( const KURL& );
void publishFreeBusy( const KURL& );
- QString mFreeBusyData;
+ TQString mFreeBusyData;
};
#endif
diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp
index e43a9a912..2b7895282 100644
--- a/kresources/scalix/knotes/resourcescalix.cpp
+++ b/kresources/scalix/knotes/resourcescalix.cpp
@@ -49,7 +49,7 @@ static const char* inlineMimeType = "text/calendar";
ResourceScalix::ResourceScalix( const KConfig *config )
: ResourceNotes( config ), ResourceScalixBase( "ResourceScalix-KNotes" ),
- mCalendar( QString::fromLatin1("UTC") )
+ mCalendar( TQString::fromLatin1("UTC") )
{
setType( "scalix" );
}
@@ -64,15 +64,15 @@ bool ResourceScalix::doOpen()
config.setGroup( configGroupName );
// Get the list of Notes folders from KMail
- QValueList<KMailICalIface::SubResource> subResources;
+ TQValueList<KMailICalIface::SubResource> subResources;
if ( !kmailSubresources( subResources, kmailContentsType ) )
return false;
// Make the resource map from the folder list
- QValueList<KMailICalIface::SubResource>::ConstIterator it;
+ TQValueList<KMailICalIface::SubResource>::ConstIterator it;
mSubResources.clear();
for ( it = subResources.begin(); it != subResources.end(); ++it ) {
- const QString subResource = (*it).location;
+ const TQString subResource = (*it).location;
const bool active = config.readBoolEntry( subResource, true );
mSubResources[ subResource ] = Scalix::SubResource( active, (*it).writable, (*it).label );
}
@@ -89,8 +89,8 @@ void ResourceScalix::doClose()
config.writeEntry( it.key(), it.data().active() );
}
-bool ResourceScalix::loadSubResource( const QString& subResource,
- const QString &mimetype )
+bool ResourceScalix::loadSubResource( const TQString& subResource,
+ const TQString &mimetype )
{
// Get the list of journals
int count = 0;
@@ -99,7 +99,7 @@ bool ResourceScalix::loadSubResource( const QString& subResource,
return false;
}
- QMap<Q_UINT32, QString> lst;
+ TQMap<Q_UINT32, TQString> lst;
if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) {
kdError(5500) << "Communication problem in "
<< "ResourceScalix::getIncidenceList()\n";
@@ -111,7 +111,7 @@ bool ResourceScalix::loadSubResource( const QString& subResource,
// Populate with the new entries
const bool silent = mSilent;
mSilent = true;
- QMap<Q_UINT32, QString>::Iterator it;
+ TQMap<Q_UINT32, TQString>::Iterator it;
for ( it = lst.begin(); it != lst.end(); ++it ) {
KCal::Journal* journal = addNote( it.data(), subResource, it.key(), mimetype );
if ( !journal )
@@ -137,7 +137,7 @@ bool ResourceScalix::load()
// This subResource is disabled
continue;
- QString mimetype = inlineMimeType;
+ TQString mimetype = inlineMimeType;
rc &= loadSubResource( itR.key(), mimetype );
mimetype = attachmentMimeType;
rc &= loadSubResource( itR.key(), mimetype );
@@ -154,11 +154,11 @@ bool ResourceScalix::save()
bool ResourceScalix::addNote( KCal::Journal* journal )
{
- return addNote( journal, QString::null, 0 );
+ return addNote( journal, TQString::null, 0 );
}
-KCal::Journal* ResourceScalix::addNote( const QString& data, const QString& subresource,
- Q_UINT32 sernum, const QString& )
+KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& subresource,
+ Q_UINT32 sernum, const TQString& )
{
KCal::Journal* journal = 0;
// FIXME: This does not take into account the time zone!
@@ -175,7 +175,7 @@ KCal::Journal* ResourceScalix::addNote( const QString& data, const QString& subr
}
bool ResourceScalix::addNote( KCal::Journal* journal,
- const QString& subresource, Q_UINT32 sernum )
+ const TQString& subresource, Q_UINT32 sernum )
{
kdDebug(5500) << "ResourceScalix::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n";
@@ -185,14 +185,14 @@ bool ResourceScalix::addNote( KCal::Journal* journal,
bool newNote = subresource.isEmpty();
mCalendar.addJournal( journal );
- QString resource =
+ TQString resource =
newNote ? findWritableResource( mSubResources ) : subresource;
if ( resource.isEmpty() ) // canceled
return false;
if ( !mSilent ) {
KCal::ICalFormat formatter;
- const QString xml = formatter.toString( journal );
+ const TQString xml = formatter.toString( journal );
kdDebug(5500) << k_funcinfo << "XML string:\n" << xml << endl;
if( !kmailUpdate( resource, sernum, xml, attachmentMimeType, journal->uid() ) ) {
@@ -211,7 +211,7 @@ bool ResourceScalix::addNote( KCal::Journal* journal,
bool ResourceScalix::deleteNote( KCal::Journal* journal )
{
- const QString uid = journal->uid();
+ const TQString uid = journal->uid();
if ( !mUidMap.contains( uid ) )
// Odd
return false;
@@ -226,20 +226,20 @@ bool ResourceScalix::deleteNote( KCal::Journal* journal )
return true;
}
-KCal::Alarm::List ResourceScalix::alarms( const QDateTime& from, const QDateTime& to )
+KCal::Alarm::List ResourceScalix::alarms( const TQDateTime& from, const TQDateTime& to )
{
KCal::Alarm::List alarms;
KCal::Journal::List notes = mCalendar.journals();
KCal::Journal::List::ConstIterator note;
for ( note = notes.begin(); note != notes.end(); ++note )
{
- QDateTime preTime = from.addSecs( -1 );
+ TQDateTime preTime = from.addSecs( -1 );
KCal::Alarm::List::ConstIterator it;
for( it = (*note)->alarms().begin(); it != (*note)->alarms().end(); ++it )
{
if ( (*it)->enabled() )
{
- QDateTime dt = (*it)->nextRepetition( preTime );
+ TQDateTime dt = (*it)->nextRepetition( preTime );
if ( dt.isValid() && dt <= to )
alarms.append( *it );
}
@@ -251,7 +251,7 @@ KCal::Alarm::List ResourceScalix::alarms( const QDateTime& from, const QDateTime
void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* i )
{
- QString subResource;
+ TQString subResource;
Q_UINT32 sernum;
if ( mUidMap.contains( i->uid() ) ) {
subResource = mUidMap[ i->uid() ].resource();
@@ -265,7 +265,7 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* i )
KCal::Journal* journal = dynamic_cast<KCal::Journal*>( i );
KCal::ICalFormat formatter;
- const QString xml = formatter.toString( journal );
+ const TQString xml = formatter.toString( journal );
if( !xml.isEmpty() && kmailUpdate( subResource, sernum, xml, attachmentMimeType, journal->uid() ) )
mUidMap[ i->uid() ] = StorageReference( subResource, sernum );
}
@@ -274,18 +274,18 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* i )
* These are the DCOP slots that KMail call to notify when something
* changed.
*/
-bool ResourceScalix::fromKMailAddIncidence( const QString& type,
- const QString& subResource,
+bool ResourceScalix::fromKMailAddIncidence( const TQString& type,
+ const TQString& subResource,
Q_UINT32 sernum,
int,
- const QString& note )
+ const TQString& note )
{
// Check if this is a note
if( type != kmailContentsType ) return false;
const bool silent = mSilent;
mSilent = true;
- QString mimetype = inlineMimeType;
+ TQString mimetype = inlineMimeType;
KCal::Journal* journal = addNote( note, subResource, sernum, mimetype );
if ( journal )
manager()->registerNote( this, journal );
@@ -293,9 +293,9 @@ bool ResourceScalix::fromKMailAddIncidence( const QString& type,
return true;
}
-void ResourceScalix::fromKMailDelIncidence( const QString& type,
- const QString& /*subResource*/,
- const QString& uid )
+void ResourceScalix::fromKMailDelIncidence( const TQString& type,
+ const TQString& /*subResource*/,
+ const TQString& uid )
{
// Check if this is a note
if( type != kmailContentsType ) return;
@@ -311,16 +311,16 @@ void ResourceScalix::fromKMailDelIncidence( const QString& type,
mSilent = silent;
}
-void ResourceScalix::fromKMailRefresh( const QString& type,
- const QString& /*subResource*/ )
+void ResourceScalix::fromKMailRefresh( const TQString& type,
+ const TQString& /*subResource*/ )
{
if ( type == kmailContentsType )
load(); // ### should call loadSubResource(subResource) probably
}
-void ResourceScalix::fromKMailAddSubresource( const QString& type,
- const QString& subResource,
- const QString& mimetype,
+void ResourceScalix::fromKMailAddSubresource( const TQString& type,
+ const TQString& subResource,
+ const TQString& mimetype,
bool writable )
{
if ( type != kmailContentsType )
@@ -340,8 +340,8 @@ void ResourceScalix::fromKMailAddSubresource( const QString& type,
emit signalSubresourceAdded( this, type, subResource );
}
-void ResourceScalix::fromKMailDelSubresource( const QString& type,
- const QString& subResource )
+void ResourceScalix::fromKMailDelSubresource( const TQString& type,
+ const TQString& subResource )
{
if ( type != configGroupName )
// Not ours
@@ -361,7 +361,7 @@ void ResourceScalix::fromKMailDelSubresource( const QString& type,
// Make a list of all uids to remove
Scalix::UidMap::ConstIterator mapIt;
- QStringList uids;
+ TQStringList uids;
for ( mapIt = mUidMap.begin(); mapIt != mUidMap.end(); ++mapIt )
if ( mapIt.data().resource() == subResource )
// We have a match
@@ -371,7 +371,7 @@ void ResourceScalix::fromKMailDelSubresource( const QString& type,
if ( !uids.isEmpty() ) {
const bool silent = mSilent;
mSilent = true;
- QStringList::ConstIterator it;
+ TQStringList::ConstIterator it;
for ( it = uids.begin(); it != uids.end(); ++it ) {
KCal::Journal* j = mCalendar.journal( *it );
if( j )
@@ -383,17 +383,17 @@ void ResourceScalix::fromKMailDelSubresource( const QString& type,
emit signalSubresourceRemoved( this, type, subResource );
}
-void ResourceScalix::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder )
+void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder )
{
// We are only interested in notes
if ( ( type != attachmentMimeType ) && ( type != inlineMimeType ) ) return;
// Populate with the new entries
const bool silent = mSilent;
mSilent = true;
- QString mimetype = inlineMimeType;
- for( QMap<Q_UINT32, QString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+ TQString mimetype = inlineMimeType;
+ for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
KCal::Journal* journal = addNote( it.data(), folder, it.key(), mimetype );
if ( !journal )
kdDebug(5500) << "loading note " << it.key() << " failed" << endl;
@@ -404,12 +404,12 @@ void ResourceScalix::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& ma
}
-QStringList ResourceScalix::subresources() const
+TQStringList ResourceScalix::subresources() const
{
return mSubResources.keys();
}
-bool ResourceScalix::subresourceActive( const QString& res ) const
+bool ResourceScalix::subresourceActive( const TQString& res ) const
{
if ( mSubResources.contains( res ) ) {
return mSubResources[ res ].active();
diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h
index a26bd1973..cb0c50fbf 100644
--- a/kresources/scalix/knotes/resourcescalix.h
+++ b/kresources/scalix/knotes/resourcescalix.h
@@ -73,46 +73,46 @@ public:
bool deleteNote( KCal::Journal* );
- KCal::Alarm::List alarms( const QDateTime& from, const QDateTime& to );
+ KCal::Alarm::List alarms( const TQDateTime& from, const TQDateTime& to );
/// Reimplemented from IncidenceBase::Observer to know when a note was changed
void incidenceUpdated( KCal::IncidenceBase* );
/// The ResourceScalixBase methods called by KMail
- bool fromKMailAddIncidence( const QString& type, const QString& resource,
- Q_UINT32 sernum, int format, const QString& note );
- void fromKMailDelIncidence( const QString& type, const QString& resource,
- const QString& uid );
- void fromKMailRefresh( const QString& type, const QString& resource );
+ bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
+ Q_UINT32 sernum, int format, const TQString& note );
+ void fromKMailDelIncidence( const TQString& type, const TQString& resource,
+ const TQString& uid );
+ void fromKMailRefresh( const TQString& type, const TQString& resource );
/// Listen to KMail changes in the amount of sub resources
- void fromKMailAddSubresource( const QString& type, const QString& resource,
- const QString& label, bool writable );
- void fromKMailDelSubresource( const QString& type, const QString& resource );
+ void fromKMailAddSubresource( const TQString& type, const TQString& resource,
+ const TQString& label, bool writable );
+ void fromKMailDelSubresource( const TQString& type, const TQString& resource );
- void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder );
+ void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder );
/** Return the list of subresources. */
- QStringList subresources() const;
+ TQStringList subresources() const;
/** Is this subresource active? */
- bool subresourceActive( const QString& ) const;
+ bool subresourceActive( const TQString& ) const;
signals:
- void signalSubresourceAdded( Resource*, const QString&, const QString& );
- void signalSubresourceRemoved( Resource*, const QString&, const QString& );
+ void signalSubresourceAdded( Resource*, const TQString&, const TQString& );
+ void signalSubresourceRemoved( Resource*, const TQString&, const TQString& );
private:
- bool addNote( KCal::Journal* journal, const QString& resource,
+ bool addNote( KCal::Journal* journal, const TQString& resource,
Q_UINT32 sernum );
- KCal::Journal* addNote( const QString& data, const QString& subresource,
- Q_UINT32 sernum, const QString &mimetype );
+ KCal::Journal* addNote( const TQString& data, const TQString& subresource,
+ Q_UINT32 sernum, const TQString &mimetype );
- bool loadSubResource( const QString& resource, const QString& mimetype );
+ bool loadSubResource( const TQString& resource, const TQString& mimetype );
- QString configFile() const {
+ TQString configFile() const {
return ResourceScalixBase::configFile( "knotes" );
}
diff --git a/kresources/scalix/knotes/resourcescalix_plugin.cpp b/kresources/scalix/knotes/resourcescalix_plugin.cpp
index a83bbd746..222d5ed68 100644
--- a/kresources/scalix/knotes/resourcescalix_plugin.cpp
+++ b/kresources/scalix/knotes/resourcescalix_plugin.cpp
@@ -41,7 +41,7 @@ public:
return new Scalix::ResourceScalix( config );
}
- KRES::ConfigWidget *configWidget( QWidget* )
+ KRES::ConfigWidget *configWidget( TQWidget* )
{
return 0;
}
diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp
index 3dc0412a4..661f57430 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.cpp
+++ b/kresources/scalix/scalixadmin/delegatedialog.cpp
@@ -18,11 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qtoolbutton.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqtoolbutton.h>
#include <klocale.h>
@@ -31,24 +31,24 @@
#include "delegatedialog.h"
-DelegateDialog::DelegateDialog( QWidget *parent )
+DelegateDialog::DelegateDialog( TQWidget *parent )
: KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
{
- QWidget *page = new QWidget( this );
- QGridLayout *layout = new QGridLayout( page, 5, 3, 11, 6 );
+ TQWidget *page = new TQWidget( this );
+ TQGridLayout *layout = new TQGridLayout( page, 5, 3, 11, 6 );
- QLabel *label = new QLabel( i18n( "User:" ), page );
+ TQLabel *label = new TQLabel( i18n( "User:" ), page );
layout->addWidget( label, 0, 0 );
- mEmail = new QLineEdit( page );
+ mEmail = new TQLineEdit( page );
layout->addWidget( mEmail, 0, 1 );
- QToolButton *emailSelector = new QToolButton( page );
+ TQToolButton *emailSelector = new TQToolButton( page );
emailSelector->setUsesTextLabel( true );
emailSelector->setTextLabel( i18n( "..." ) );
layout->addWidget( emailSelector, 0, 2 );
- QValueList<Scalix::DelegateTypes> types;
+ TQValueList<Scalix::DelegateTypes> types;
types << Scalix::SendOnBehalfOf;
types << Scalix::SeePrivate;
types << Scalix::GetMeetings;
@@ -56,14 +56,14 @@ DelegateDialog::DelegateDialog( QWidget *parent )
int row = 1;
for ( uint i = 0; i < types.count(); ++i ) {
- QCheckBox *box = new QCheckBox( Scalix::Delegate::rightsAsString( types[ i ] ), page );
+ TQCheckBox *box = new TQCheckBox( Scalix::Delegate::rightsAsString( types[ i ] ), page );
layout->addMultiCellWidget( box, row, row, 1, 2 );
mRights.insert( types[ i ], box );
row++;
}
- connect( emailSelector, SIGNAL( clicked() ), SLOT( selectEmail() ) );
+ connect( emailSelector, TQT_SIGNAL( clicked() ), TQT_SLOT( selectEmail() ) );
setMainWidget( page );
}
@@ -72,7 +72,7 @@ void DelegateDialog::setDelegate( const Scalix::Delegate &delegate )
{
mEmail->setText( delegate.email() );
- QMap<int, QCheckBox*>::Iterator it;
+ TQMap<int, TQCheckBox*>::Iterator it;
for ( it = mRights.begin(); it != mRights.end(); ++it )
it.data()->setChecked( delegate.rights() & it.key() );
}
@@ -81,7 +81,7 @@ Scalix::Delegate DelegateDialog::delegate() const
{
int rights = 0;
- QMap<int, QCheckBox*>::ConstIterator it;
+ TQMap<int, TQCheckBox*>::ConstIterator it;
for ( it = mRights.begin(); it != mRights.end(); ++it )
if ( it.data()->isChecked() )
rights |= it.key();
@@ -95,7 +95,7 @@ void DelegateDialog::selectEmail()
if ( !dlg.exec() )
return;
- const QString email = dlg.selectedUser();
+ const TQString email = dlg.selectedUser();
if ( email.isEmpty() )
return;
diff --git a/kresources/scalix/scalixadmin/delegatedialog.h b/kresources/scalix/scalixadmin/delegatedialog.h
index b5503a4f3..3d712d8e2 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.h
+++ b/kresources/scalix/scalixadmin/delegatedialog.h
@@ -21,7 +21,7 @@
#ifndef DELEGATEDIALOG_H
#define DELEGATEDIALOG_H
-#include <qmap.h>
+#include <tqmap.h>
#include <kdialogbase.h>
@@ -37,7 +37,7 @@ class DelegateDialog : public KDialogBase
Q_OBJECT
public:
- DelegateDialog( QWidget *parent = 0 );
+ DelegateDialog( TQWidget *parent = 0 );
void setDelegate( const Scalix::Delegate &delegate );
Scalix::Delegate delegate() const;
@@ -46,8 +46,8 @@ class DelegateDialog : public KDialogBase
void selectEmail();
private:
- QLineEdit *mEmail;
- QMap<int, QCheckBox*> mRights;
+ TQLineEdit *mEmail;
+ TQMap<int, TQCheckBox*> mRights;
};
#endif
diff --git a/kresources/scalix/scalixadmin/delegatemanager.h b/kresources/scalix/scalixadmin/delegatemanager.h
index f27b79a1b..7f5e2e5a7 100644
--- a/kresources/scalix/scalixadmin/delegatemanager.h
+++ b/kresources/scalix/scalixadmin/delegatemanager.h
@@ -21,8 +21,8 @@
#ifndef DELEGATEMANAGER_H
#define DELEGATEMANAGER_H
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
#include "jobs.h"
diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp
index f9a9b8e7a..033472901 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
#include <kinputdialog.h>
#include <klocale.h>
@@ -34,29 +34,29 @@
#include "delegatepage.h"
-DelegatePage::DelegatePage( QWidget *parent )
- : QWidget( parent )
+DelegatePage::DelegatePage( TQWidget *parent )
+ : TQWidget( parent )
{
- QGridLayout *layout = new QGridLayout( this, 2, 3, 11, 6 );
+ TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
mView = new DelegateView( &mManager, this );
layout->addMultiCellWidget( mView, 0, 0, 0, 2 );
- mAddButton = new QPushButton( i18n( "Add Delegate..." ), this );
+ mAddButton = new TQPushButton( i18n( "Add Delegate..." ), this );
layout->addWidget( mAddButton, 1, 0 );
- mEditButton = new QPushButton( i18n( "Edit Delegate..." ), this );
+ mEditButton = new TQPushButton( i18n( "Edit Delegate..." ), this );
mEditButton->setEnabled( false );
layout->addWidget( mEditButton, 1, 1 );
- mRemoveButton = new QPushButton( i18n( "Remove Delegate" ), this );
+ mRemoveButton = new TQPushButton( i18n( "Remove Delegate" ), this );
mRemoveButton->setEnabled( false );
layout->addWidget( mRemoveButton, 1, 2 );
- connect( mView, SIGNAL( selectionChanged() ), SLOT( selectionChanged() ) );
- connect( mAddButton, SIGNAL( clicked() ), SLOT( addDelegate() ) );
- connect( mEditButton, SIGNAL( clicked() ), SLOT( editDelegate() ) );
- connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeDelegate() ) );
+ 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() ) );
loadAllDelegates();
}
@@ -69,7 +69,7 @@ void DelegatePage::loadAllDelegates()
{
Scalix::GetDelegatesJob *job = Scalix::getDelegates( Settings::self()->globalSlave(),
Settings::self()->accountUrl() );
- connect( job, SIGNAL( result( KIO::Job* ) ), SLOT( allDelegates( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( allDelegates( KIO::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, SIGNAL( result( KIO::Job* ) ), SLOT( delegateAdded( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateAdded( KIO::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, SIGNAL( result( KIO::Job* ) ), SLOT( delegateAdded( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateAdded( KIO::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, SIGNAL( result( KIO::Job* ) ), SLOT( delegateRemoved( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( delegateRemoved( KIO::Job* ) ) );
}
void DelegatePage::allDelegates( KIO::Job *job )
diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/kresources/scalix/scalixadmin/delegatepage.h
index 243c0f0d3..edaad8e78 100644
--- a/kresources/scalix/scalixadmin/delegatepage.h
+++ b/kresources/scalix/scalixadmin/delegatepage.h
@@ -21,7 +21,7 @@
#ifndef DELEGATEPAGE_H
#define DELEGATEPAGE_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include "delegatemanager.h"
@@ -33,7 +33,7 @@ class DelegatePage : public QWidget
Q_OBJECT
public:
- DelegatePage( QWidget *parent = 0 );
+ DelegatePage( TQWidget *parent = 0 );
~DelegatePage();
private slots:
@@ -49,9 +49,9 @@ class DelegatePage : public QWidget
void selectionChanged();
private:
- QPushButton *mAddButton;
- QPushButton *mEditButton;
- QPushButton *mRemoveButton;
+ TQPushButton *mAddButton;
+ TQPushButton *mEditButton;
+ TQPushButton *mRemoveButton;
DelegateManager mManager;
DelegateView *mView;
diff --git a/kresources/scalix/scalixadmin/delegateview.cpp b/kresources/scalix/scalixadmin/delegateview.cpp
index 9ea16cf1a..e253f1f36 100644
--- a/kresources/scalix/scalixadmin/delegateview.cpp
+++ b/kresources/scalix/scalixadmin/delegateview.cpp
@@ -27,8 +27,8 @@
class DelegateItem : public QListViewItem
{
public:
- DelegateItem( QListView *parent, const Scalix::Delegate &delegate )
- : QListViewItem( parent ), mDelegate( delegate )
+ DelegateItem( TQListView *parent, const Scalix::Delegate &delegate )
+ : TQListViewItem( parent ), mDelegate( delegate )
{
setText( 0, mDelegate.email() );
setText( 1, Scalix::Delegate::rightsAsString( mDelegate.rights() ) );
@@ -40,7 +40,7 @@ class DelegateItem : public QListViewItem
Scalix::Delegate mDelegate;
};
-DelegateView::DelegateView( DelegateManager *manager, QWidget *parent )
+DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent )
: KListView( parent ), mManager( manager )
{
addColumn( i18n( "Delegate" ) );
@@ -48,7 +48,7 @@ DelegateView::DelegateView( DelegateManager *manager, QWidget *parent )
setFullWidth( true );
setAllColumnsShowFocus( true );
- connect( mManager, SIGNAL( changed() ), SLOT( delegateChanged() ) );
+ connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( delegateChanged() ) );
delegateChanged();
}
diff --git a/kresources/scalix/scalixadmin/delegateview.h b/kresources/scalix/scalixadmin/delegateview.h
index 61725be29..1e9e6300f 100644
--- a/kresources/scalix/scalixadmin/delegateview.h
+++ b/kresources/scalix/scalixadmin/delegateview.h
@@ -34,7 +34,7 @@ class DelegateView : public KListView
Q_OBJECT
public:
- DelegateView( DelegateManager *manager, QWidget *parent = 0 );
+ DelegateView( DelegateManager *manager, TQWidget *parent = 0 );
Scalix::Delegate selectedDelegate() const;
diff --git a/kresources/scalix/scalixadmin/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp
index c463463d2..f1bce9f2c 100644
--- a/kresources/scalix/scalixadmin/jobs.cpp
+++ b/kresources/scalix/scalixadmin/jobs.cpp
@@ -30,7 +30,7 @@ Delegate::Delegate()
{
}
-Delegate::Delegate( const QString &email, int rights )
+Delegate::Delegate( const TQString &email, int rights )
: mEmail( email ), mRights( rights )
{
}
@@ -40,7 +40,7 @@ bool Delegate::isValid() const
return ( !mEmail.isEmpty() && mRights != -1 );
}
-QString Delegate::email() const
+TQString Delegate::email() const
{
return mEmail;
}
@@ -50,9 +50,9 @@ int Delegate::rights() const
return mRights;
}
-QString Delegate::rightsAsString( int rights )
+TQString Delegate::rightsAsString( int rights )
{
- QStringList rightNames;
+ TQStringList rightNames;
if ( rights & SendOnBehalfOf )
rightNames.append( i18n( "Send on behalf of" ) );
@@ -68,21 +68,21 @@ QString Delegate::rightsAsString( int rights )
SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url,
- const QString &oldPassword, const QString& newPassword )
+ const TQString &oldPassword, const TQString& newPassword )
{
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << QString( "X-SCALIX-PASSWORD" ) << QString( "%1 %2" ).arg( oldPassword ).arg( newPassword );
+ << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword );
SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
-SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const QString& email, int params )
+SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const TQString& email, int params )
{
- QStringList types;
+ TQStringList types;
if ( params & SendOnBehalfOf )
types.append( "SOBO" );
if ( params & SeePrivate )
@@ -92,22 +92,22 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const Q
if ( params & InsteadOfMe )
types.append( "INSTEADOFME" );
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << QString( "X-SET-DELEGATE" ) << QString( "%1 %2" ).arg( email ).arg( types.join( " " ) );
+ << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) );
SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
-DeleteDelegateJob* Scalix::deleteDelegate( KIO::Slave* slave, const KURL& url, const QString& email )
+DeleteDelegateJob* Scalix::deleteDelegate( KIO::Slave* slave, const KURL& url, const TQString& email )
{
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << QString( "X-DELETE-DELEGATE" ) << email;
+ << TQString( "X-DELETE-DELEGATE" ) << email;
DeleteDelegateJob* job = new DeleteDelegateJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
@@ -116,33 +116,33 @@ DeleteDelegateJob* Scalix::deleteDelegate( KIO::Slave* slave, const KURL& url, c
GetDelegatesJob* Scalix::getDelegates( KIO::Slave* slave, const KURL& url )
{
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
- stream << (int)'X' << (int)'N' << QString( "X-GET-DELEGATES" ) << QString();
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
+ stream << (int)'X' << (int)'N' << TQString( "X-GET-DELEGATES" ) << TQString();
GetDelegatesJob* job = new GetDelegatesJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
-AddOtherUserJob* Scalix::addOtherUser( KIO::Slave* slave, const KURL& url, const QString& email )
+AddOtherUserJob* Scalix::addOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email )
{
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << QString( "X-ADD-OTHER-USER" ) << email;
+ << TQString( "X-ADD-OTHER-USER" ) << email;
AddOtherUserJob* job = new AddOtherUserJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
-DeleteOtherUserJob* Scalix::deleteOtherUser( KIO::Slave* slave, const KURL& url, const QString& email )
+DeleteOtherUserJob* Scalix::deleteOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email )
{
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << QString( "X-DELETE-OTHER-USER" ) << email;
+ << TQString( "X-DELETE-OTHER-USER" ) << email;
DeleteOtherUserJob* job = new DeleteOtherUserJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
@@ -151,25 +151,25 @@ DeleteOtherUserJob* Scalix::deleteOtherUser( KIO::Slave* slave, const KURL& url,
GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url )
{
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << QString( "X-GET-OTHER-USERS" ) << QString();
+ << TQString( "X-GET-OTHER-USERS" ) << TQString();
GetOtherUsersJob* job = new GetOtherUsersJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
-SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const QString& msg )
+SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg )
{
- const QString argument = msg;
- const QString command = QString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" )
+ const TQString argument = msg;
+ const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" )
.arg( "UTF-8" )
.arg( msg.utf8().length() );
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int) 'X' << (int)'E' << command << argument;
SetOutOfOfficeJob* job = new SetOutOfOfficeJob( url, packedArgs, false );
@@ -179,36 +179,36 @@ SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, b
GetOutOfOfficeJob* Scalix::getOutOfOffice( KIO::Slave* slave, const KURL& url )
{
- QByteArray packedArgs;
- QDataStream stream( packedArgs, IO_WriteOnly );
+ TQByteArray packedArgs;
+ TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << QString( "X-GET-OUT-OF-OFFICE" ) << QString();
+ << TQString( "X-GET-OUT-OF-OFFICE" ) << TQString();
GetOutOfOfficeJob* job = new GetOutOfOfficeJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
return job;
}
-SetPasswordJob::SetPasswordJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo )
+SetPasswordJob::SetPasswordJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
}
-SetDelegateJob::SetDelegateJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo )
+SetDelegateJob::SetDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
}
-DeleteDelegateJob::DeleteDelegateJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo )
+DeleteDelegateJob::DeleteDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
}
-GetDelegatesJob::GetDelegatesJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo )
+GetDelegatesJob::GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, SIGNAL( infoMessage( KIO::Job*, const QString& ) ),
- this, SLOT( slotInfoMessage( KIO::Job*, const QString& ) ) );
+ connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
+ this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
}
Delegate::List GetDelegatesJob::delegates() const
@@ -216,21 +216,21 @@ Delegate::List GetDelegatesJob::delegates() const
return mDelegates;
}
-void GetDelegatesJob::slotInfoMessage( KIO::Job*, const QString &data )
+void GetDelegatesJob::slotInfoMessage( KIO::Job*, const TQString &data )
{
/**
* The passed data have the following form:
*
* "user1@host.com:right1,right2,right4 user2@host.com:right3,right5"
*/
- QStringList delegates = QStringList::split( ' ', data );
+ TQStringList delegates = TQStringList::split( ' ', data );
for ( uint i = 0; i < delegates.count(); ++i ) {
- QStringList delegate = QStringList::split( ':', delegates[ i ] );
+ TQStringList delegate = TQStringList::split( ':', delegates[ i ] );
- const QString email = delegate[ 0 ];
+ const TQString email = delegate[ 0 ];
int rights = 0;
- QStringList rightsList = QStringList::split( ',', delegate[ 1 ] );
+ TQStringList rightsList = TQStringList::split( ',', delegate[ 1 ] );
for ( uint j = 0; j < rightsList.count(); ++j ) {
if ( rightsList[ j ] == "SOBO" )
rights |= SendOnBehalfOf;
@@ -246,43 +246,43 @@ void GetDelegatesJob::slotInfoMessage( KIO::Job*, const QString &data )
}
}
-AddOtherUserJob::AddOtherUserJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo )
+AddOtherUserJob::AddOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
}
-DeleteOtherUserJob::DeleteOtherUserJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo )
+DeleteOtherUserJob::DeleteOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
}
-GetOtherUsersJob::GetOtherUsersJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo )
+GetOtherUsersJob::GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, SIGNAL( infoMessage( KIO::Job*, const QString& ) ),
- this, SLOT( slotInfoMessage( KIO::Job*, const QString& ) ) );
+ connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
+ this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
}
-QStringList GetOtherUsersJob::otherUsers() const
+TQStringList GetOtherUsersJob::otherUsers() const
{
return mOtherUsers;
}
-void GetOtherUsersJob::slotInfoMessage( KIO::Job*, const QString &data )
+void GetOtherUsersJob::slotInfoMessage( KIO::Job*, const TQString &data )
{
- mOtherUsers = QStringList::split( ' ', data );
+ mOtherUsers = TQStringList::split( ' ', data );
}
-SetOutOfOfficeJob::SetOutOfOfficeJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo )
+SetOutOfOfficeJob::SetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
}
-GetOutOfOfficeJob::GetOutOfOfficeJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo )
+GetOutOfOfficeJob::GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: KIO::SimpleJob( url, KIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, SIGNAL( infoMessage( KIO::Job*, const QString& ) ),
- this, SLOT( slotInfoMessage( KIO::Job*, const QString& ) ) );
+ connect( this, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ),
+ this, TQT_SLOT( slotInfoMessage( KIO::Job*, const TQString& ) ) );
}
bool GetOutOfOfficeJob::enabled() const
@@ -290,14 +290,14 @@ bool GetOutOfOfficeJob::enabled() const
return mEnabled;
}
-QString GetOutOfOfficeJob::message() const
+TQString GetOutOfOfficeJob::message() const
{
return mMessage;
}
-void GetOutOfOfficeJob::slotInfoMessage( KIO::Job*, const QString &data )
+void GetOutOfOfficeJob::slotInfoMessage( KIO::Job*, const TQString &data )
{
- const QStringList fields = QStringList::split( '^', data );
+ const TQStringList fields = TQStringList::split( '^', data );
mEnabled = ( fields[ 0 ] == "ENABLED" );
mMessage = fields[ 1 ];
diff --git a/kresources/scalix/scalixadmin/jobs.h b/kresources/scalix/scalixadmin/jobs.h
index 3b5a1b81f..24ce1c020 100644
--- a/kresources/scalix/scalixadmin/jobs.h
+++ b/kresources/scalix/scalixadmin/jobs.h
@@ -46,37 +46,37 @@ namespace Scalix {
class Delegate
{
public:
- typedef QValueList<Delegate> List;
+ typedef TQValueList<Delegate> List;
Delegate();
- Delegate( const QString &email, int rights );
+ Delegate( const TQString &email, int rights );
bool isValid() const;
- QString email() const;
+ TQString email() const;
int rights() const;
- static QString rightsAsString( int rights );
+ static TQString rightsAsString( int rights );
private:
- QString mEmail;
+ TQString mEmail;
int mRights;
};
/**
* Sets/Changes the password of the user encoded in @p url.
*/
- SetPasswordJob* setPassword( KIO::Slave* slave, const KURL& url, const QString& oldPassword, const QString& newPassword );
+ SetPasswordJob* setPassword( KIO::Slave* slave, const KURL& url, const TQString& oldPassword, const TQString& newPassword );
/**
* Adds a delegate represented by @p email with the given @p params for the user encoded in @p url.
*/
- SetDelegateJob* setDelegate( KIO::Slave* slave, const KURL& url, const QString& email, int params );
+ SetDelegateJob* setDelegate( KIO::Slave* slave, const KURL& url, const TQString& email, int params );
/**
* Deletes the delegate represented by @p email for the user encoded in @p url.
*/
- DeleteDelegateJob* deleteDelegate( KIO::Slave* slave, const KURL& url, const QString& email );
+ DeleteDelegateJob* deleteDelegate( KIO::Slave* slave, const KURL& url, const TQString& email );
/**
* Retrieves the delegates for the user encoded in @p url.
@@ -86,12 +86,12 @@ namespace Scalix {
/**
* Adds the mailbox of another user represented by @p email to the users 'Other Users' namespace.
*/
- AddOtherUserJob* addOtherUser( KIO::Slave* slave, const KURL& url, const QString& email );
+ AddOtherUserJob* addOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email );
/**
* Deletes the mailbox of another user represented by @p email from the users 'Other Users' namespace.
*/
- DeleteOtherUserJob* deleteOtherUser( KIO::Slave* slave, const KURL& url, const QString& email );
+ DeleteOtherUserJob* deleteOtherUser( KIO::Slave* slave, const KURL& url, const TQString& email );
/**
* Retrieves the list of all other users.
@@ -104,7 +104,7 @@ namespace Scalix {
* @param enabled Whether the out-of-office functionality is enabled.
* @param msg The out-of-office message.
*/
- SetOutOfOfficeJob* setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const QString& msg );
+ SetOutOfOfficeJob* setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg );
/**
* Retrieves the out-of-office data.
@@ -115,19 +115,19 @@ namespace Scalix {
class SetPasswordJob : public KIO::SimpleJob
{
public:
- SetPasswordJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo );
+ SetPasswordJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
};
class SetDelegateJob : public KIO::SimpleJob
{
public:
- SetDelegateJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo );
+ SetDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
};
class DeleteDelegateJob : public KIO::SimpleJob
{
public:
- DeleteDelegateJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo );
+ DeleteDelegateJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
};
class GetDelegatesJob : public KIO::SimpleJob
@@ -135,12 +135,12 @@ namespace Scalix {
Q_OBJECT
public:
- GetDelegatesJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo );
+ GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
Delegate::List delegates() const;
private slots:
- void slotInfoMessage( KIO::Job*, const QString& );
+ void slotInfoMessage( KIO::Job*, const TQString& );
private:
Delegate::List mDelegates;
@@ -149,13 +149,13 @@ namespace Scalix {
class AddOtherUserJob : public KIO::SimpleJob
{
public:
- AddOtherUserJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo );
+ AddOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
};
class DeleteOtherUserJob : public KIO::SimpleJob
{
public:
- DeleteOtherUserJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo );
+ DeleteOtherUserJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
};
class GetOtherUsersJob : public KIO::SimpleJob
@@ -163,21 +163,21 @@ namespace Scalix {
Q_OBJECT
public:
- GetOtherUsersJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo );
+ GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
- QStringList otherUsers() const;
+ TQStringList otherUsers() const;
private slots:
- void slotInfoMessage( KIO::Job*, const QString& );
+ void slotInfoMessage( KIO::Job*, const TQString& );
private:
- QStringList mOtherUsers;
+ TQStringList mOtherUsers;
};
class SetOutOfOfficeJob : public KIO::SimpleJob
{
public:
- SetOutOfOfficeJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo );
+ SetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
};
class GetOutOfOfficeJob : public KIO::SimpleJob
@@ -185,17 +185,17 @@ namespace Scalix {
Q_OBJECT
public:
- GetOutOfOfficeJob( const KURL& url, const QByteArray &packedArgs, bool showProgressInfo );
+ GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
bool enabled() const;
- QString message() const;
+ TQString message() const;
private slots:
- void slotInfoMessage( KIO::Job*, const QString& );
+ void slotInfoMessage( KIO::Job*, const TQString& );
private:
bool mEnabled;
- QString mMessage;
+ TQString mMessage;
};
}
diff --git a/kresources/scalix/scalixadmin/ldapdialog.cpp b/kresources/scalix/scalixadmin/ldapdialog.cpp
index be624f131..6af08c4d7 100644
--- a/kresources/scalix/scalixadmin/ldapdialog.cpp
+++ b/kresources/scalix/scalixadmin/ldapdialog.cpp
@@ -24,7 +24,7 @@
#include "ldapdialog.h"
-LdapDialog::LdapDialog( QWidget *parent )
+LdapDialog::LdapDialog( TQWidget *parent )
: KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
{
setCaption( i18n( "User Account Selection" ) );
@@ -37,7 +37,7 @@ LdapDialog::LdapDialog( QWidget *parent )
resize( 400, 250 );
}
-QString LdapDialog::selectedUser() const
+TQString LdapDialog::selectedUser() const
{
return mView->selectedUser();
}
diff --git a/kresources/scalix/scalixadmin/ldapdialog.h b/kresources/scalix/scalixadmin/ldapdialog.h
index 6b326f550..9d822af19 100644
--- a/kresources/scalix/scalixadmin/ldapdialog.h
+++ b/kresources/scalix/scalixadmin/ldapdialog.h
@@ -27,9 +27,9 @@ class LdapView;
class LdapDialog : public KDialogBase
{
public:
- LdapDialog( QWidget *parent = 0 );
+ LdapDialog( TQWidget *parent = 0 );
- QString selectedUser() const;
+ TQString selectedUser() const;
private:
diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp
index 660f1944a..0e40f3ae6 100644
--- a/kresources/scalix/scalixadmin/ldapview.cpp
+++ b/kresources/scalix/scalixadmin/ldapview.cpp
@@ -29,8 +29,8 @@
class LdapItem : public QListViewItem
{
public:
- LdapItem( QListView *parent, const QString &text, const QString &email )
- : QListViewItem( parent )
+ LdapItem( TQListView *parent, const TQString &text, const TQString &email )
+ : TQListViewItem( parent )
{
setText( 0, text );
setText( 1, email );
@@ -38,7 +38,7 @@ class LdapItem : public QListViewItem
};
-LdapView::LdapView( QWidget *parent )
+LdapView::LdapView( TQWidget *parent )
: KListView( parent )
{
addColumn( i18n( "User" ) );
@@ -52,14 +52,14 @@ LdapView::LdapView( QWidget *parent )
mClient->setBindDN( Settings::self()->ldapBindDn() );
mClient->setPwdBindDN( Settings::self()->ldapPassword() );
- QStringList attrs;
+ TQStringList attrs;
attrs << "surname" << "mail";
mClient->setAttrs( attrs );
- connect( mClient, SIGNAL( result( const KABC::LdapObject& ) ),
- this, SLOT( entryAdded( const KABC::LdapObject& ) ) );
- connect( mClient, SIGNAL( error( const QString& ) ),
- this, SLOT( error( const QString& ) ) );
+ connect( mClient, TQT_SIGNAL( result( const KABC::LdapObject& ) ),
+ this, TQT_SLOT( entryAdded( const KABC::LdapObject& ) ) );
+ connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
+ this, TQT_SLOT( error( const TQString& ) ) );
}
LdapView::~LdapView()
@@ -68,16 +68,16 @@ LdapView::~LdapView()
delete mClient;
}
-QString LdapView::selectedUser() const
+TQString LdapView::selectedUser() const
{
- QListViewItem *item = selectedItem();
+ TQListViewItem *item = selectedItem();
if ( !item )
- return QString();
+ return TQString();
else
return item->text( 1 );
}
-void LdapView::setQuery( const QString &query )
+void LdapView::setQuery( const TQString &query )
{
clear();
mClient->startQuery( query );
@@ -85,13 +85,13 @@ void LdapView::setQuery( const QString &query )
void LdapView::entryAdded( const KABC::LdapObject &obj )
{
- const QString text = QString( "%1 (%2)" ).arg( obj.attrs[ "surname" ].first() )
+ const TQString text = TQString( "%1 (%2)" ).arg( obj.attrs[ "surname" ].first() )
.arg( obj.attrs[ "mail" ].first() );
new LdapItem( this, text, obj.attrs[ "mail" ].first() );
}
-void LdapView::error( const QString &msg )
+void LdapView::error( const TQString &msg )
{
KMessageBox::error( this, msg );
}
diff --git a/kresources/scalix/scalixadmin/ldapview.h b/kresources/scalix/scalixadmin/ldapview.h
index 0acb3602c..4616e11ce 100644
--- a/kresources/scalix/scalixadmin/ldapview.h
+++ b/kresources/scalix/scalixadmin/ldapview.h
@@ -32,17 +32,17 @@ class LdapView : public KListView
Q_OBJECT
public:
- LdapView( QWidget *parent = 0 );
+ LdapView( TQWidget *parent = 0 );
~LdapView();
- QString selectedUser() const;
+ TQString selectedUser() const;
public slots:
- void setQuery( const QString &query );
+ void setQuery( const TQString &query );
private slots:
void entryAdded( const KABC::LdapObject& );
- void error( const QString& );
+ void error( const TQString& );
private:
KABC::LdapClient *mClient;
diff --git a/kresources/scalix/scalixadmin/mainwindow.cpp b/kresources/scalix/scalixadmin/mainwindow.cpp
index e6cac550d..4f3dbf94b 100644
--- a/kresources/scalix/scalixadmin/mainwindow.cpp
+++ b/kresources/scalix/scalixadmin/mainwindow.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qvbox.h>
+#include <tqvbox.h>
#include <kglobal.h>
#include <kiconloader.h>
@@ -37,8 +37,8 @@ MainWindow::MainWindow()
{
KJanusWidget *wdg = new KJanusWidget( this, "", KJanusWidget::IconList );
- QPixmap icon = KGlobal::iconLoader()->loadIcon( "folder_yellow", KIcon::Desktop );
- QVBox *page = wdg->addVBoxPage( i18n( "Other Accounts" ), i18n( "Register other accounts" ), icon );
+ TQPixmap icon = KGlobal::iconLoader()->loadIcon( "folder_yellow", KIcon::Desktop );
+ TQVBox *page = wdg->addVBoxPage( i18n( "Other Accounts" ), i18n( "Register other accounts" ), icon );
new OtherUserPage( page );
icon = KGlobal::iconLoader()->loadIcon( "edu_languages", KIcon::Desktop );
diff --git a/kresources/scalix/scalixadmin/otherusermanager.cpp b/kresources/scalix/scalixadmin/otherusermanager.cpp
index b5b3d3ccf..a3c19de12 100644
--- a/kresources/scalix/scalixadmin/otherusermanager.cpp
+++ b/kresources/scalix/scalixadmin/otherusermanager.cpp
@@ -28,7 +28,7 @@ OtherUserManager::~OtherUserManager()
{
}
-void OtherUserManager::addOtherUser( const QString &email )
+void OtherUserManager::addOtherUser( const TQString &email )
{
if ( !mOtherUsers.contains( email ) ) {
mOtherUsers.append( email );
@@ -43,7 +43,7 @@ void OtherUserManager::clear()
emit changed();
}
-QStringList OtherUserManager::otherUsers() const
+TQStringList OtherUserManager::otherUsers() const
{
return mOtherUsers;
}
diff --git a/kresources/scalix/scalixadmin/otherusermanager.h b/kresources/scalix/scalixadmin/otherusermanager.h
index 6f7f9ac77..90d7195a4 100644
--- a/kresources/scalix/scalixadmin/otherusermanager.h
+++ b/kresources/scalix/scalixadmin/otherusermanager.h
@@ -21,8 +21,8 @@
#ifndef OTHERUSERMANAGER_H
#define OTHERUSERMANAGER_H
-#include <qobject.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqstringlist.h>
class OtherUserManager : public QObject
{
@@ -32,16 +32,16 @@ class OtherUserManager : public QObject
OtherUserManager();
~OtherUserManager();
- void addOtherUser( const QString &email );
+ void addOtherUser( const TQString &email );
void clear();
- QStringList otherUsers() const;
+ TQStringList otherUsers() const;
signals:
void changed();
private:
- QStringList mOtherUsers;
+ TQStringList mOtherUsers;
};
#endif
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index ae12290c7..8570cab06 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
+#include <tqapplication.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
#include <dcopref.h>
#include <kdcopservicestarter.h>
@@ -37,24 +37,24 @@
#include "otheruserpage.h"
-OtherUserPage::OtherUserPage( QWidget *parent )
- : QWidget( parent )
+OtherUserPage::OtherUserPage( TQWidget *parent )
+ : TQWidget( parent )
{
- QGridLayout *layout = new QGridLayout( this, 2, 2, 11, 6 );
+ TQGridLayout *layout = new TQGridLayout( this, 2, 2, 11, 6 );
mView = new OtherUserView( &mManager, this );
layout->addMultiCellWidget( mView, 0, 0, 0, 1 );
- mAddButton = new QPushButton( i18n( "Add Account..." ), this );
+ mAddButton = new TQPushButton( i18n( "Add Account..." ), this );
layout->addWidget( mAddButton, 1, 0 );
- mDeleteButton = new QPushButton( i18n( "Remove Account" ), this );
+ mDeleteButton = new TQPushButton( i18n( "Remove Account" ), this );
mDeleteButton->setEnabled( false );
layout->addWidget( mDeleteButton, 1, 1 );
- connect( mView, SIGNAL( selectionChanged() ), SLOT( selectionChanged() ) );
- connect( mAddButton, SIGNAL( clicked() ), SLOT( addUser() ) );
- connect( mDeleteButton, SIGNAL( clicked() ), SLOT( removeUser() ) );
+ connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
+ connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) );
+ connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeUser() ) );
loadAllUsers();
}
@@ -67,7 +67,7 @@ void OtherUserPage::loadAllUsers()
{
Scalix::GetOtherUsersJob *job = Scalix::getOtherUsers( Settings::self()->globalSlave(),
Settings::self()->accountUrl() );
- connect( job, SIGNAL( result( KIO::Job* ) ), SLOT( allUsers( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( allUsers( KIO::Job* ) ) );
}
void OtherUserPage::addUser()
@@ -76,24 +76,24 @@ void OtherUserPage::addUser()
if ( !dlg.exec() )
return;
- const QString email = dlg.selectedUser();
+ const TQString email = dlg.selectedUser();
if ( email.isEmpty() )
return;
Scalix::AddOtherUserJob *job = Scalix::addOtherUser( Settings::self()->globalSlave(),
Settings::self()->accountUrl(), email );
- connect( job, SIGNAL( result( KIO::Job* ) ), SLOT( userAdded( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( userAdded( KIO::Job* ) ) );
}
void OtherUserPage::removeUser()
{
- const QString email = mView->selectedUser();
+ const TQString email = mView->selectedUser();
if ( email.isEmpty() )
return;
Scalix::DeleteOtherUserJob *job = Scalix::deleteOtherUser( Settings::self()->globalSlave(),
Settings::self()->accountUrl(), email );
- connect( job, SIGNAL( result( KIO::Job* ) ), SLOT( userRemoved( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( userRemoved( KIO::Job* ) ) );
}
void OtherUserPage::allUsers( KIO::Job *job )
@@ -105,7 +105,7 @@ void OtherUserPage::allUsers( KIO::Job *job )
mManager.clear();
- const QStringList users = userJob->otherUsers();
+ const TQStringList users = userJob->otherUsers();
for ( uint i = 0; i < users.count(); ++i )
mManager.addOtherUser( users[ i ] );
@@ -139,18 +139,18 @@ void OtherUserPage::selectionChanged()
void OtherUserPage::updateKmail()
{
- QMessageBox *msg = new QMessageBox( qApp->mainWidget() );
+ TQMessageBox *msg = new TQMessageBox( qApp->mainWidget() );
msg->setText( i18n( "Updating account..." ) );
msg->show();
qApp->processEvents();
sleep( 1 );
qApp->processEvents();
- QString error;
- QCString dcopService;
+ TQString error;
+ TQCString dcopService;
int result = KDCOPServiceStarter::self()->
- findServiceFor( "DCOP/ResourceBackend/IMAP", QString::null,
- QString::null, &error, &dcopService );
+ findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
+ TQString::null, &error, &dcopService );
if ( result != 0 ) {
KMessageBox::error( 0, i18n( "Unable to start KMail to trigger account update with Scalix server" ) );
delete msg;
@@ -160,12 +160,12 @@ void OtherUserPage::updateKmail()
DCOPRef ref( dcopService, "KMailIface" );
// loop until dcop iface is set up correctly
- QStringList list;
+ TQStringList list;
while ( list.isEmpty() ) {
ref.call( "accounts()" ).get( list );
}
- ref.call( "checkAccount(QString)", i18n( "Scalix Server" ) );
+ ref.call( "checkAccount(TQString)", i18n( "Scalix Server" ) );
delete msg;
}
diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/kresources/scalix/scalixadmin/otheruserpage.h
index f847a05d3..50e9292ca 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.h
+++ b/kresources/scalix/scalixadmin/otheruserpage.h
@@ -21,7 +21,7 @@
#ifndef OTHERUSERPAGE_H
#define OTHERUSERPAGE_H
-#include <qwidget.h>
+#include <tqwidget.h>
#include "otherusermanager.h"
@@ -33,7 +33,7 @@ class OtherUserPage : public QWidget
Q_OBJECT
public:
- OtherUserPage( QWidget *parent = 0 );
+ OtherUserPage( TQWidget *parent = 0 );
~OtherUserPage();
private slots:
@@ -50,8 +50,8 @@ class OtherUserPage : public QWidget
private:
void updateKmail();
- QPushButton *mAddButton;
- QPushButton *mDeleteButton;
+ TQPushButton *mAddButton;
+ TQPushButton *mDeleteButton;
OtherUserManager mManager;
OtherUserView *mView;
diff --git a/kresources/scalix/scalixadmin/otheruserview.cpp b/kresources/scalix/scalixadmin/otheruserview.cpp
index 70bc9e3d5..19b9c3b65 100644
--- a/kresources/scalix/scalixadmin/otheruserview.cpp
+++ b/kresources/scalix/scalixadmin/otheruserview.cpp
@@ -27,43 +27,43 @@
class OtherUserItem : public QListViewItem
{
public:
- OtherUserItem( QListView *parent, const QString &user )
- : QListViewItem( parent ), mUser( user )
+ OtherUserItem( TQListView *parent, const TQString &user )
+ : TQListViewItem( parent ), mUser( user )
{
setText( 0, mUser );
}
- QString user() const { return mUser; }
+ TQString user() const { return mUser; }
private:
- QString mUser;
+ TQString mUser;
};
-OtherUserView::OtherUserView( OtherUserManager *manager, QWidget *parent )
+OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent )
: KListView( parent ), mManager( manager )
{
addColumn( i18n( "Registered Accounts" ) );
setFullWidth( true );
- connect( mManager, SIGNAL( changed() ), SLOT( userChanged() ) );
+ connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( userChanged() ) );
userChanged();
}
-QString OtherUserView::selectedUser() const
+TQString OtherUserView::selectedUser() const
{
OtherUserItem *item = dynamic_cast<OtherUserItem*>( selectedItem() );
if ( item )
return item->user();
- return QString();
+ return TQString();
}
void OtherUserView::userChanged()
{
clear();
- QStringList users = mManager->otherUsers();
+ TQStringList users = mManager->otherUsers();
for ( uint i = 0; i < users.count(); ++i )
new OtherUserItem( this, users[ i ] );
}
diff --git a/kresources/scalix/scalixadmin/otheruserview.h b/kresources/scalix/scalixadmin/otheruserview.h
index 6eacc93c9..def14a84b 100644
--- a/kresources/scalix/scalixadmin/otheruserview.h
+++ b/kresources/scalix/scalixadmin/otheruserview.h
@@ -30,9 +30,9 @@ class OtherUserView : public KListView
Q_OBJECT
public:
- OtherUserView( OtherUserManager *manager, QWidget *parent = 0 );
+ OtherUserView( OtherUserManager *manager, TQWidget *parent = 0 );
- QString selectedUser() const;
+ TQString selectedUser() const;
private slots:
void userChanged();
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index 0b8d3f803..e1e331fc4 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qbuttongroup.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qtextedit.h>
+#include <tqbuttongroup.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqtextedit.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -33,20 +33,20 @@
#include "outofofficepage.h"
-OutOfOfficePage::OutOfOfficePage( QWidget *parent )
- : QWidget( parent )
+OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
+ : TQWidget( parent )
{
- QGridLayout *layout = new QGridLayout( this, 4, 2, 11, 6 );
+ TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 );
- QButtonGroup *group = new QButtonGroup( 1, Qt::Vertical, this );
+ TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this );
- mDisabled = new QRadioButton( i18n( "I am in the office" ), group );
+ mDisabled = new TQRadioButton( i18n( "I am in the office" ), group );
mDisabled->setChecked( true );
- mEnabled = new QRadioButton( i18n( "I am out of the office" ), group );
+ mEnabled = new TQRadioButton( i18n( "I am out of the office" ), group );
- mLabel = new QLabel( i18n( "Auto-reply once to each sender with the following text:" ), this );
- mMessage = new QTextEdit( this );
- mSaveButton = new QPushButton( i18n( "Save" ), this );
+ mLabel = new TQLabel( i18n( "Auto-reply once to each sender with the following text:" ), this );
+ mMessage = new TQTextEdit( this );
+ mSaveButton = new TQPushButton( i18n( "Save" ), this );
layout->addMultiCellWidget( group, 0, 0, 0, 1 );
layout->addMultiCellWidget( mLabel, 1, 1, 0, 1 );
@@ -55,10 +55,10 @@ OutOfOfficePage::OutOfOfficePage( QWidget *parent )
statusChanged();
- connect( mEnabled, SIGNAL( toggled( bool ) ), this, SLOT( statusChanged() ) );
- connect( mEnabled, SIGNAL( toggled( bool ) ), this, SLOT( changed() ) );
- connect( mSaveButton, SIGNAL( clicked() ), this, SLOT( store() ) );
- connect( mMessage, SIGNAL( textChanged() ), this, SLOT( changed() ) );
+ 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() ) );
load();
}
@@ -71,7 +71,7 @@ void OutOfOfficePage::load()
{
Scalix::GetOutOfOfficeJob *job = Scalix::getOutOfOffice( Settings::self()->globalSlave(),
Settings::self()->accountUrl() );
- connect( job, SIGNAL( result( KIO::Job* ) ), SLOT( loaded( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( loaded( KIO::Job* ) ) );
}
void OutOfOfficePage::loaded( KIO::Job* job )
@@ -98,7 +98,7 @@ void OutOfOfficePage::store()
mEnabled->isChecked(),
mMessage->text() );
- connect( job, SIGNAL( result( KIO::Job* ) ), SLOT( stored( KIO::Job* ) ) );
+ connect( job, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( stored( KIO::Job* ) ) );
mSaveButton->setEnabled( false );
}
diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/kresources/scalix/scalixadmin/outofofficepage.h
index cc5b2591a..cd5f04915 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.h
+++ b/kresources/scalix/scalixadmin/outofofficepage.h
@@ -21,7 +21,7 @@
#ifndef OUTOFOFFICEPAGE_H
#define OUTOFOFFICEPAGE_H
-#include <qwidget.h>
+#include <tqwidget.h>
class QLabel;
class QPushButton;
@@ -33,7 +33,7 @@ class OutOfOfficePage : public QWidget
Q_OBJECT
public:
- OutOfOfficePage( QWidget *parent = 0 );
+ OutOfOfficePage( TQWidget *parent = 0 );
~OutOfOfficePage();
private slots:
@@ -45,11 +45,11 @@ class OutOfOfficePage : public QWidget
void changed();
private:
- QRadioButton *mEnabled;
- QRadioButton *mDisabled;
- QLabel *mLabel;
- QTextEdit *mMessage;
- QPushButton *mSaveButton;
+ TQRadioButton *mEnabled;
+ TQRadioButton *mDisabled;
+ TQLabel *mLabel;
+ TQTextEdit *mMessage;
+ TQPushButton *mSaveButton;
bool mChanged;
};
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index 7d4182348..facc29170 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -18,11 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
+#include <tqapplication.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
#include <kconfig.h>
#include <klocale.h>
@@ -35,36 +35,36 @@
#include "passwordpage.h"
-PasswordPage::PasswordPage( QWidget *parent )
- : QWidget( parent ), mJob( 0 )
+PasswordPage::PasswordPage( TQWidget *parent )
+ : TQWidget( parent ), mJob( 0 )
{
- QGridLayout *layout = new QGridLayout( this, 2, 3, 11, 6 );
+ TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
- QLabel *label = new QLabel( i18n( "New password:" ), this );
+ TQLabel *label = new TQLabel( i18n( "New password:" ), this );
layout->addWidget( label, 0, 0 );
- mPassword = new QLineEdit( this );
- mPassword->setEchoMode( QLineEdit::Password );
+ mPassword = new TQLineEdit( this );
+ mPassword->setEchoMode( TQLineEdit::Password );
label->setBuddy( mPassword );
layout->addWidget( mPassword, 0, 1 );
- label = new QLabel( i18n( "Retype new password:" ), this );
+ label = new TQLabel( i18n( "Retype new password:" ), this );
layout->addWidget( label, 1, 0 );
- mPasswordRetype = new QLineEdit( this );
- mPasswordRetype->setEchoMode( QLineEdit::Password );
+ mPasswordRetype = new TQLineEdit( this );
+ mPasswordRetype->setEchoMode( TQLineEdit::Password );
label->setBuddy( mPasswordRetype );
layout->addWidget( mPasswordRetype, 1, 1 );
- mButton = new QPushButton( i18n( "Change" ), this );
+ mButton = new TQPushButton( i18n( "Change" ), this );
mButton->setEnabled( false );
layout->addWidget( mButton, 2, 1 );
layout->setRowSpacing( 3, 1 );
- connect( mPassword, SIGNAL( textChanged( const QString& ) ), this, SLOT( textChanged() ) );
- connect( mPasswordRetype, SIGNAL( textChanged( const QString& ) ), this, SLOT( textChanged() ) );
- connect( mButton, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) );
+ 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() ) );
}
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, SIGNAL( result( KIO::Job* ) ), this, SLOT( finished( KIO::Job* ) ) );
+ connect( mJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( finished( KIO::Job* ) ) );
updateState( true );
} else {
@@ -120,7 +120,7 @@ void PasswordPage::finished( KIO::Job* job )
// Update configuration files to the new password as well
- const QString newPassword = mPassword->text();
+ const TQString newPassword = mPassword->text();
{ // ScalixAdmin config
KConfig config( "scalixadminrc" );
@@ -138,8 +138,8 @@ void PasswordPage::finished( KIO::Job* job )
KConfig config( "kmailrc" );
// Try to find account group for Scalix
- QString scalixAccount;
- const QStringList groupList = config.groupList();
+ TQString scalixAccount;
+ const TQStringList groupList = config.groupList();
for ( uint i = 0; i < groupList.count(); ++i ) {
if ( groupList[ i ].startsWith( "Account " ) ) {
KConfigGroup group( &config, groupList[ i ] );
@@ -173,13 +173,13 @@ void PasswordPage::finished( KIO::Job* job )
if ( !wallet->hasFolder( "kmail" ) )
wallet->createFolder( "kmail" );
wallet->setFolder( "kmail" );
- wallet->writePassword( "account-" + QString::number( accountId ), newPassword );
+ wallet->writePassword( "account-" + TQString::number( accountId ), newPassword );
}
} else {
group.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
}
- KConfigGroup fileGroup( &config, QString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) );
+ KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) );
fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
}
}
diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/kresources/scalix/scalixadmin/passwordpage.h
index a397be416..b4cf3da00 100644
--- a/kresources/scalix/scalixadmin/passwordpage.h
+++ b/kresources/scalix/scalixadmin/passwordpage.h
@@ -21,7 +21,7 @@
#ifndef PASSWORDPAGE_H
#define PASSWORDPAGE_H
-#include <qwidget.h>
+#include <tqwidget.h>
class QLineEdit;
class QPushButton;
@@ -35,7 +35,7 @@ class PasswordPage : public QWidget
Q_OBJECT
public:
- PasswordPage( QWidget *parent = 0 );
+ PasswordPage( TQWidget *parent = 0 );
private slots:
void buttonClicked();
@@ -45,9 +45,9 @@ class PasswordPage : public QWidget
private:
void updateState( bool );
- QLineEdit *mPassword;
- QLineEdit *mPasswordRetype;
- QPushButton *mButton;
+ TQLineEdit *mPassword;
+ TQLineEdit *mPasswordRetype;
+ TQPushButton *mButton;
KIO::Job *mJob;
};
diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp
index 2f6b49bad..52f72296f 100644
--- a/kresources/scalix/scalixadmin/settings.cpp
+++ b/kresources/scalix/scalixadmin/settings.cpp
@@ -71,7 +71,7 @@ KURL Settings::accountUrl() const
return url;
}
-QString Settings::accountPassword() const
+TQString Settings::accountPassword() const
{
KConfig config( "scalixadminrc" );
KConfigGroup group( &config, "Account" );
@@ -84,50 +84,50 @@ KIO::Slave* Settings::globalSlave() const
return mSlave;
}
-QString Settings::rulesWizardUrl() const
+TQString Settings::rulesWizardUrl() const
{
KConfig config( "scalixadminrc" );
KConfigGroup group( &config, "Misc" );
- QString url = group.readEntry( "rulesWizardUrl" );
+ TQString url = group.readEntry( "rulesWizardUrl" );
if ( url.isEmpty() ) {
KConfigGroup group( &config, "Account" );
- url = QString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) )
+ url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) )
.arg( group.readEntry( "user" ) );
}
return url;
}
-QString Settings::ldapHost() const
+TQString Settings::ldapHost() const
{
KConfig config( "scalixadminrc" );
KConfigGroup group( &config, "LDAP" );
return group.readEntry( "host" );
}
-QString Settings::ldapPort() const
+TQString Settings::ldapPort() const
{
KConfig config( "scalixadminrc" );
KConfigGroup group( &config, "LDAP" );
return group.readEntry( "port" );
}
-QString Settings::ldapBase() const
+TQString Settings::ldapBase() const
{
KConfig config( "scalixadminrc" );
KConfigGroup group( &config, "LDAP" );
return group.readEntry( "base" );
}
-QString Settings::ldapBindDn() const
+TQString Settings::ldapBindDn() const
{
KConfig config( "scalixadminrc" );
KConfigGroup group( &config, "LDAP" );
return group.readEntry( "bindDn" );
}
-QString Settings::ldapPassword() const
+TQString Settings::ldapPassword() const
{
KConfig config( "scalixadminrc" );
KConfigGroup group( &config, "LDAP" );
diff --git a/kresources/scalix/scalixadmin/settings.h b/kresources/scalix/scalixadmin/settings.h
index 17ed9a2c9..1e36833ad 100644
--- a/kresources/scalix/scalixadmin/settings.h
+++ b/kresources/scalix/scalixadmin/settings.h
@@ -34,17 +34,17 @@ class Settings
KIO::MetaData accountData() const;
KURL accountUrl() const;
- QString accountPassword() const;
+ TQString accountPassword() const;
KIO::Slave *globalSlave() const;
- QString rulesWizardUrl() const;
+ TQString rulesWizardUrl() const;
- QString ldapHost() const;
- QString ldapPort() const;
- QString ldapBase() const;
- QString ldapBindDn() const;
- QString ldapPassword() const;
+ TQString ldapHost() const;
+ TQString ldapPort() const;
+ TQString ldapBase() const;
+ TQString ldapBindDn() const;
+ TQString ldapPassword() const;
private:
Settings();
diff --git a/kresources/scalix/shared/kmailconnection.cpp b/kresources/scalix/shared/kmailconnection.cpp
index af32cd74b..b4b4b9ebf 100644
--- a/kresources/scalix/shared/kmailconnection.cpp
+++ b/kresources/scalix/shared/kmailconnection.cpp
@@ -46,7 +46,7 @@ using namespace Scalix;
KMailConnection::KMailConnection( ResourceScalixBase* resource,
- const QCString& objId )
+ const TQCString& objId )
: DCOPObject( objId ), mResource( resource ), mKMailIcalIfaceStub( 0 )
{
// Make the connection to KMail ready
@@ -55,8 +55,8 @@ KMailConnection::KMailConnection( ResourceScalixBase* resource,
mDCOPClient->registerAs( objId, true );
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString& ) ),
- this, SLOT( unregisteredFromDCOP( const QCString& ) ) );
+ connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
}
KMailConnection::~KMailConnection()
@@ -68,15 +68,15 @@ KMailConnection::~KMailConnection()
mDCOPClient = 0;
}
-static const QCString dcopObjectId = "KMailICalIface";
+static const TQCString dcopObjectId = "KMailICalIface";
bool KMailConnection::connectToKMail()
{
if ( !mKMailIcalIfaceStub ) {
- QString error;
- QCString dcopService;
+ TQString error;
+ TQCString dcopService;
int result = KDCOPServiceStarter::self()->
- findServiceFor( "DCOP/ResourceBackend/IMAP", QString::null,
- QString::null, &error, &dcopService );
+ findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
+ TQString::null, &error, &dcopService );
if ( result != 0 ) {
kdError(5650) << "Couldn't connect to the IMAP resource backend\n";
// TODO: You might want to show "error" (if not empty) here,
@@ -88,34 +88,34 @@ bool KMailConnection::connectToKMail()
dcopService, dcopObjectId );
// Attach to the KMail signals
- if ( !connectKMailSignal( "incidenceAdded(QString,QString,Q_UINT32,int,QString)",
- "fromKMailAddIncidence(QString,QString,Q_UINT32,int,QString)" ) )
+ if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,Q_UINT32,int,TQString)",
+ "fromKMailAddIncidence(TQString,TQString,Q_UINT32,int,TQString)" ) )
kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
- if ( !connectKMailSignal( "incidenceDeleted(QString,QString,QString)",
- "fromKMailDelIncidence(QString,QString,QString)" ) )
+ if ( !connectKMailSignal( "incidenceDeleted(TQString,TQString,TQString)",
+ "fromKMailDelIncidence(TQString,TQString,TQString)" ) )
kdError(5650) << "DCOP connection to incidenceDeleted failed" << endl;
- if ( !connectKMailSignal( "signalRefresh(QString,QString)",
- "fromKMailRefresh(QString,QString)" ) )
+ if ( !connectKMailSignal( "signalRefresh(TQString,TQString)",
+ "fromKMailRefresh(TQString,TQString)" ) )
kdError(5650) << "DCOP connection to signalRefresh failed" << endl;
- if ( !connectKMailSignal( "subresourceAdded( QString, QString, QString )",
- "fromKMailAddSubresource( QString, QString, QString )" ) )
+ if ( !connectKMailSignal( "subresourceAdded( TQString, TQString, TQString )",
+ "fromKMailAddSubresource( TQString, TQString, TQString )" ) )
kdError(5650) << "DCOP connection to subresourceAdded failed" << endl;
- if ( !connectKMailSignal( "subresourceDeleted(QString,QString)",
- "fromKMailDelSubresource(QString,QString)" ) )
+ if ( !connectKMailSignal( "subresourceDeleted(TQString,TQString)",
+ "fromKMailDelSubresource(TQString,TQString)" ) )
kdError(5650) << "DCOP connection to subresourceDeleted failed" << endl;
- if ( !connectKMailSignal( "asyncLoadResult(QMap<Q_UINT32, QString>, QString, QString)",
- "fromKMailAsyncLoadResult(QMap<Q_UINT32, QString>, QString, QString)" ) )
+ if ( !connectKMailSignal( "asyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)",
+ "fromKMailAsyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)" ) )
kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl;
}
return ( mKMailIcalIfaceStub != 0 );
}
-bool KMailConnection::fromKMailAddIncidence( const QString& type,
- const QString& folder,
+bool KMailConnection::fromKMailAddIncidence( const TQString& type,
+ const TQString& folder,
Q_UINT32 sernum,
int format,
- const QString& data )
+ const TQString& data )
{
if ( format != KMailICalIface::StorageXML
&& format != KMailICalIface::StorageIcalVcard )
@@ -125,25 +125,25 @@ bool KMailConnection::fromKMailAddIncidence( const QString& type,
return mResource->fromKMailAddIncidence( type, folder, sernum, format, data );
}
-void KMailConnection::fromKMailDelIncidence( const QString& type,
- const QString& folder,
- const QString& xml )
+void KMailConnection::fromKMailDelIncidence( const TQString& type,
+ const TQString& folder,
+ const TQString& xml )
{
// kdDebug(5650) << "KMailConnection::fromKMailDelIncidence( " << type << ", "
// << folder << ", " << uid << " )\n";
mResource->fromKMailDelIncidence( type, folder, xml );
}
-void KMailConnection::fromKMailRefresh( const QString& type, const QString& folder )
+void KMailConnection::fromKMailRefresh( const TQString& type, const TQString& folder )
{
// kdDebug(5650) << "KMailConnection::fromKMailRefresh( " << type << ", "
// << folder << " )\n";
mResource->fromKMailRefresh( type, folder );
}
-void KMailConnection::fromKMailAddSubresource( const QString& type,
- const QString& resource,
- const QString& label )
+void KMailConnection::fromKMailAddSubresource( const TQString& type,
+ const TQString& resource,
+ const TQString& label )
{
// kdDebug(5650) << "KMailConnection::fromKMailAddSubresource( " << type << ", "
// << resource << " )\n";
@@ -156,30 +156,30 @@ void KMailConnection::fromKMailAddSubresource( const QString& type,
mResource->fromKMailAddSubresource( type, resource, label, writable );
}
-void KMailConnection::fromKMailDelSubresource( const QString& type,
- const QString& resource )
+void KMailConnection::fromKMailDelSubresource( const TQString& type,
+ const TQString& resource )
{
// kdDebug(5650) << "KMailConnection::fromKMailDelSubresource( " << type << ", "
// << resource << " )\n";
mResource->fromKMailDelSubresource( type, resource );
}
-void KMailConnection::fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder )
+void KMailConnection::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder )
{
mResource->fromKMailAsyncLoadResult( map, type, folder );
}
-bool KMailConnection::connectKMailSignal( const QCString& signal,
- const QCString& method )
+bool KMailConnection::connectKMailSignal( const TQCString& signal,
+ const TQCString& method )
{
return connectDCOPSignal( "kmail", dcopObjectId, signal, method, false )
&& connectDCOPSignal( "kontact", dcopObjectId, signal, method, false );
}
-bool KMailConnection::kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
- const QString& contentsType )
+bool KMailConnection::kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+ const TQString& contentsType )
{
if ( !connectToKMail() )
return false;
@@ -189,8 +189,8 @@ bool KMailConnection::kmailSubresources( QValueList<KMailICalIface::SubResource>
}
bool KMailConnection::kmailIncidencesCount( int& count,
- const QString& mimetype,
- const QString& resource )
+ const TQString& mimetype,
+ const TQString& resource )
{
if ( !connectToKMail() )
return false;
@@ -199,9 +199,9 @@ bool KMailConnection::kmailIncidencesCount( int& count,
return mKMailIcalIfaceStub->ok();
}
-bool KMailConnection::kmailIncidences( QMap<Q_UINT32, QString>& lst,
- const QString& mimetype,
- const QString& resource,
+bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+ const TQString& mimetype,
+ const TQString& resource,
int startIndex,
int nbMessages )
{
@@ -214,9 +214,9 @@ bool KMailConnection::kmailIncidences( QMap<Q_UINT32, QString>& lst,
bool KMailConnection::kmailGetAttachment( KURL& url,
- const QString& resource,
+ const TQString& resource,
Q_UINT32 sernum,
- const QString& filename )
+ const TQString& filename )
{
if ( !connectToKMail() )
return false;
@@ -225,7 +225,7 @@ bool KMailConnection::kmailGetAttachment( KURL& url,
return mKMailIcalIfaceStub->ok();
}
-bool KMailConnection::kmailDeleteIncidence( const QString& resource,
+bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
Q_UINT32 sernum )
{
return connectToKMail()
@@ -233,15 +233,15 @@ bool KMailConnection::kmailDeleteIncidence( const QString& resource,
&& mKMailIcalIfaceStub->ok();
}
-bool KMailConnection::kmailUpdate( const QString& resource,
+bool KMailConnection::kmailUpdate( const TQString& resource,
Q_UINT32& sernum,
- const QString& subject,
- const QString& plainTextBody,
- const QMap<QCString, QString>& customHeaders,
- const QStringList& attachmentURLs,
- const QStringList& attachmentMimetypes,
- const QStringList& attachmentNames,
- const QStringList& deletedAttachments )
+ const TQString& subject,
+ const TQString& plainTextBody,
+ const TQMap<TQCString, TQString>& customHeaders,
+ const TQStringList& attachmentURLs,
+ const TQStringList& attachmentMimetypes,
+ const TQStringList& attachmentNames,
+ const TQStringList& deletedAttachments )
{
//kdDebug(5006) << kdBacktrace() << endl;
if ( connectToKMail() ) {
@@ -254,7 +254,7 @@ bool KMailConnection::kmailUpdate( const QString& resource,
}
bool KMailConnection::kmailStorageFormat( KMailICalIface::StorageFormat& type,
- const QString& folder )
+ const TQString& folder )
{
bool ok = connectToKMail();
type = mKMailIcalIfaceStub->storageFormat( folder );
@@ -262,13 +262,13 @@ bool KMailConnection::kmailStorageFormat( KMailICalIface::StorageFormat& type,
}
-bool KMailConnection::kmailTriggerSync( const QString &contentsType )
+bool KMailConnection::kmailTriggerSync( const TQString &contentsType )
{
bool ok = connectToKMail();
return ok && mKMailIcalIfaceStub->triggerSync( contentsType );
}
-void KMailConnection::unregisteredFromDCOP( const QCString& appId )
+void KMailConnection::unregisteredFromDCOP( const TQCString& appId )
{
if ( mKMailIcalIfaceStub && mKMailIcalIfaceStub->app() == appId ) {
// Delete the stub so that the next time we need to talk to kmail,
diff --git a/kresources/scalix/shared/kmailconnection.h b/kresources/scalix/shared/kmailconnection.h
index ea57857a8..bd02d7bb0 100644
--- a/kresources/scalix/shared/kmailconnection.h
+++ b/kresources/scalix/shared/kmailconnection.h
@@ -47,24 +47,24 @@ class ResourceScalixBase;
/**
This class provides the kmail connectivity for IMAP resources.
*/
-class KMailConnection : public QObject, public DCOPObject {
+class KMailConnection : public TQObject, public DCOPObject {
Q_OBJECT
K_DCOP
// These are the methods called by KMail when the resource changes
k_dcop:
- bool fromKMailAddIncidence( const QString& type, const QString& resource,
- Q_UINT32 sernum, int format, const QString& xml );
- void fromKMailDelIncidence( const QString& type, const QString& resource,
- const QString& xml );
- void fromKMailRefresh( const QString& type, const QString& resource );
- void fromKMailAddSubresource( const QString& type, const QString& resource, const QString& label );
- void fromKMailDelSubresource( const QString& type, const QString& resource );
- void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map, const QString& type,
- const QString& folder );
+ bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
+ Q_UINT32 sernum, int format, const TQString& xml );
+ void fromKMailDelIncidence( const TQString& type, const TQString& resource,
+ const TQString& xml );
+ void fromKMailRefresh( const TQString& type, const TQString& resource );
+ void fromKMailAddSubresource( const TQString& type, const TQString& resource, const TQString& label );
+ void fromKMailDelSubresource( const TQString& type, const TQString& resource );
+ void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map, const TQString& type,
+ const TQString& folder );
public:
- KMailConnection( ResourceScalixBase* resource, const QCString& objId );
+ KMailConnection( ResourceScalixBase* resource, const TQCString& objId );
virtual ~KMailConnection();
/**
@@ -73,39 +73,39 @@ public:
bool connectToKMail();
// Call the DCOP methods
- bool kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
- const QString& contentsType );
+ bool kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+ const TQString& contentsType );
bool kmailIncidencesCount( int& count,
- const QString& mimetype,
- const QString& resource );
- bool kmailIncidences( QMap<Q_UINT32, QString>& lst, const QString& mimetype,
- const QString& resource,
+ const TQString& mimetype,
+ const TQString& resource );
+ bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+ const TQString& resource,
int startIndex,
int nbMessages );
- bool kmailGetAttachment( KURL& url, const QString& resource, Q_UINT32 sernum,
- const QString& filename );
- bool kmailDeleteIncidence( const QString& resource, Q_UINT32 sernum );
- bool kmailUpdate( const QString& resource,
+ bool kmailGetAttachment( KURL& url, const TQString& resource, Q_UINT32 sernum,
+ const TQString& filename );
+ bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+ bool kmailUpdate( const TQString& resource,
Q_UINT32& sernum,
- const QString& subject,
- const QString& plainTextBody,
- const QMap<QCString, QString>& customHeaders,
- const QStringList& attachmentURLs,
- const QStringList& attachmentMimetypes,
- const QStringList& attachmentNames,
- const QStringList& deletedAttachments );
+ const TQString& subject,
+ const TQString& plainTextBody,
+ const TQMap<TQCString, TQString>& customHeaders,
+ const TQStringList& attachmentURLs,
+ const TQStringList& attachmentMimetypes,
+ const TQStringList& attachmentNames,
+ const TQStringList& deletedAttachments );
- bool kmailStorageFormat( KMailICalIface::StorageFormat& type, const QString& folder);
+ bool kmailStorageFormat( KMailICalIface::StorageFormat& type, const TQString& folder);
- bool kmailTriggerSync( const QString& contentsType );
+ bool kmailTriggerSync( const TQString& contentsType );
private slots:
- virtual void unregisteredFromDCOP( const QCString& );
+ virtual void unregisteredFromDCOP( const TQCString& );
private:
/** Connect a signal from KMail to a local slot. */
- bool connectKMailSignal( const QCString&, const QCString& );
+ bool connectKMailSignal( const TQCString&, const TQCString& );
ResourceScalixBase* mResource;
DCOPClient* mDCOPClient;
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index e91e58787..e239bfb3e 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -41,19 +41,19 @@
#include <kurl.h>
#include <ktempfile.h>
#include <kmessagebox.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
#include <kdebug.h>
using namespace Scalix;
static unsigned int uniquifier = 0;
-ResourceScalixBase::ResourceScalixBase( const QCString& objId )
+ResourceScalixBase::ResourceScalixBase( const TQCString& objId )
: mSilent( false )
{
KGlobal::locale()->insertCatalogue( "kres_scalix" );
KGlobal::locale()->insertCatalogue( "libkcal" );
- QString uniqueObjId = QString( objId ) + QString::number( uniquifier++ );
+ TQString uniqueObjId = TQString( objId ) + TQString::number( uniquifier++ );
mConnection = new KMailConnection( this, uniqueObjId.utf8() );
}
@@ -63,62 +63,62 @@ ResourceScalixBase::~ResourceScalixBase()
}
-bool ResourceScalixBase::kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
- const QString& contentsType ) const
+bool ResourceScalixBase::kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+ const TQString& contentsType ) const
{
return mConnection->kmailSubresources( lst, contentsType );
}
-bool ResourceScalixBase::kmailTriggerSync( const QString& contentsType ) const
+bool ResourceScalixBase::kmailTriggerSync( const TQString& contentsType ) const
{
return mConnection->kmailTriggerSync( contentsType );
}
bool ResourceScalixBase::kmailIncidencesCount( int &count,
- const QString& mimetype,
- const QString& resource ) const
+ const TQString& mimetype,
+ const TQString& resource ) const
{
return mConnection->kmailIncidencesCount( count, mimetype, resource );
}
-bool ResourceScalixBase::kmailIncidences( QMap<Q_UINT32, QString>& lst,
- const QString& mimetype,
- const QString& resource,
+bool ResourceScalixBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+ const TQString& mimetype,
+ const TQString& resource,
int startIndex,
int nbMessages ) const
{
return mConnection->kmailIncidences( lst, mimetype, resource, startIndex, nbMessages );
}
-bool ResourceScalixBase::kmailGetAttachment( KURL& url, const QString& resource,
+bool ResourceScalixBase::kmailGetAttachment( KURL& url, const TQString& resource,
Q_UINT32 sernum,
- const QString& filename ) const
+ const TQString& filename ) const
{
return mConnection->kmailGetAttachment( url, resource, sernum, filename );
}
-bool ResourceScalixBase::kmailDeleteIncidence( const QString& resource,
+bool ResourceScalixBase::kmailDeleteIncidence( const TQString& resource,
Q_UINT32 sernum )
{
return mSilent || mConnection->kmailDeleteIncidence( resource, sernum );
}
-bool ResourceScalixBase::kmailUpdate( const QString& resource,
+bool ResourceScalixBase::kmailUpdate( const TQString& resource,
Q_UINT32& sernum,
- const QString& xml,
- const QString& mimetype,
- const QString& subject,
+ const TQString& xml,
+ const TQString& mimetype,
+ const TQString& subject,
const CustomHeaderMap& _customHeaders,
- const QStringList& _attachmentURLs,
- const QStringList& _attachmentMimetypes,
- const QStringList& _attachmentNames,
- const QStringList& deletedAttachments )
+ const TQStringList& _attachmentURLs,
+ const TQStringList& _attachmentMimetypes,
+ const TQStringList& _attachmentNames,
+ const TQStringList& deletedAttachments )
{
if ( mSilent )
return true;
- QString subj = subject;
+ TQString subj = subject;
if ( subj.isEmpty() )
subj = i18n("Internal kolab data: Do not delete this mail.");
@@ -127,10 +127,10 @@ bool ResourceScalixBase::kmailUpdate( const QString& resource,
_attachmentURLs, _attachmentMimetypes, _attachmentNames, deletedAttachments );
}
-QString ResourceScalixBase::configFile( const QString& type ) const
+TQString ResourceScalixBase::configFile( const TQString& type ) const
{
return locateLocal( "config",
- QString( "kresources/scalix/%1rc" ).arg( type ) );
+ TQString( "kresources/scalix/%1rc" ).arg( type ) );
}
bool ResourceScalixBase::connectToKMail() const
@@ -138,12 +138,12 @@ bool ResourceScalixBase::connectToKMail() const
return mConnection->connectToKMail();
}
-QString ResourceScalixBase::findWritableResource( const ResourceMap& resources )
+TQString ResourceScalixBase::findWritableResource( const ResourceMap& resources )
{
// I have to use the label (shown in the dialog) as key here. But given how the
// label is made up, it should be unique. If it's not, well the dialog would suck anyway...
- QMap<QString, QString> possible;
- QStringList labels;
+ TQMap<TQString, TQString> possible;
+ TQStringList labels;
ResourceMap::ConstIterator it;
for ( it = resources.begin(); it != resources.end(); ++it ) {
if ( it.data().writable() && it.data().active() ) {
@@ -155,23 +155,23 @@ QString ResourceScalixBase::findWritableResource( const ResourceMap& resources )
if ( possible.isEmpty() ) { // None found!!
kdWarning(5650) << "No writable resource found!" << endl;
KMessageBox::error( 0, i18n( "No writable resource was found, saving will not be possible. Reconfigure KMail first." ) );
- return QString::null;
+ return TQString::null;
}
if ( possible.count() == 1 )
// Just one found
return possible.begin().data(); // yes this is the subresource key, i.e. location
// Several found, ask the user
- QString chosenLabel = KPIM::FolderSelectDialog::getItem( i18n( "Select Resource Folder" ),
+ TQString chosenLabel = KPIM::FolderSelectDialog::getItem( i18n( "Select Resource Folder" ),
i18n( "You have more than one writable resource folder. "
"Please select the one you want to write to." ),
possible.keys() );
if ( chosenLabel.isEmpty() ) // cancelled
- return QString::null;
+ return TQString::null;
return possible[chosenLabel];
}
-KMailICalIface::StorageFormat ResourceScalixBase::kmailStorageFormat( const QString &folder ) const
+KMailICalIface::StorageFormat ResourceScalixBase::kmailStorageFormat( const TQString &folder ) const
{
KMailICalIface::StorageFormat format = (KMailICalIface::StorageFormat) 3;
mConnection->kmailStorageFormat( format, folder );
diff --git a/kresources/scalix/shared/resourcescalixbase.h b/kresources/scalix/shared/resourcescalixbase.h
index 3c32c1dfd..f1aefc19e 100644
--- a/kresources/scalix/shared/resourcescalixbase.h
+++ b/kresources/scalix/shared/resourcescalixbase.h
@@ -33,9 +33,9 @@
#ifndef RESOURCESCALIXBASE_H
#define RESOURCESCALIXBASE_H
-#include <qstring.h>
-#include <qmap.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqmap.h>
+#include <tqstringlist.h>
#include "subresource.h"
#include <kmail/kmailicalIface.h>
@@ -72,30 +72,30 @@ class KMailConnection;
*/
class ResourceScalixBase {
public:
- ResourceScalixBase( const QCString& objId );
+ ResourceScalixBase( const TQCString& objId );
virtual ~ResourceScalixBase();
// These are the methods called by KMail when the resource changes
- virtual bool fromKMailAddIncidence( const QString& type,
- const QString& resource,
+ virtual bool fromKMailAddIncidence( const TQString& type,
+ const TQString& resource,
Q_UINT32 sernum,
int format,
- const QString& data ) = 0;
- virtual void fromKMailDelIncidence( const QString& type,
- const QString& resource,
- const QString& xml ) = 0;
- virtual void fromKMailRefresh( const QString& type,
- const QString& resource ) = 0;
- virtual void fromKMailAddSubresource( const QString& type,
- const QString& resource,
- const QString& label,
+ const TQString& data ) = 0;
+ virtual void fromKMailDelIncidence( const TQString& type,
+ const TQString& resource,
+ const TQString& xml ) = 0;
+ virtual void fromKMailRefresh( const TQString& type,
+ const TQString& resource ) = 0;
+ virtual void fromKMailAddSubresource( const TQString& type,
+ const TQString& resource,
+ const TQString& label,
bool writable ) = 0;
- virtual void fromKMailDelSubresource( const QString& type,
- const QString& resource ) = 0;
+ virtual void fromKMailDelSubresource( const TQString& type,
+ const TQString& resource ) = 0;
- virtual void fromKMailAsyncLoadResult( const QMap<Q_UINT32, QString>& map,
- const QString& type,
- const QString& folder ) = 0;
+ virtual void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+ const TQString& type,
+ const TQString& folder ) = 0;
protected:
/// Do the connection to KMail.
bool connectToKMail() const;
@@ -103,58 +103,58 @@ protected:
// These are the KMail dcop function connections. The docs here say
// "Get", which here means that the first argument is the return arg
- /// List all folders with a certain contentsType. Returns a QMap with
+ /// List all folders with a certain contentsType. Returns a TQMap with
/// resourcename/writable pairs
- bool kmailSubresources( QValueList<KMailICalIface::SubResource>& lst,
- const QString& contentsType ) const;
+ bool kmailSubresources( TQValueList<KMailICalIface::SubResource>& lst,
+ const TQString& contentsType ) const;
/// Get the number of messages in this folder.
/// Used to iterate over kmailIncidences by chunks
- bool kmailIncidencesCount( int& count, const QString& mimetype,
- const QString& resource ) const;
+ bool kmailIncidencesCount( int& count, const TQString& mimetype,
+ const TQString& resource ) const;
/// Get the mimetype attachments from a chunk of messages from this folder.
- /// Returns a QMap with serialNumber/attachment pairs.
- bool kmailIncidences( QMap<Q_UINT32, QString>& lst, const QString& mimetype,
- const QString& resource,
+ /// Returns a TQMap with serialNumber/attachment pairs.
+ bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+ const TQString& resource,
int startIndex,
int nbMessages ) const;
- bool kmailTriggerSync( const QString& contentType ) const;
+ bool kmailTriggerSync( const TQString& contentType ) const;
public: // for Contact
/// Get an attachment from a mail. Returns a URL to it. This can
/// be called by the resource after obtaining the incidence.
/// The resource must delete the temp file.
- bool kmailGetAttachment( KURL& url, const QString& resource,
+ bool kmailGetAttachment( KURL& url, const TQString& resource,
Q_UINT32 sernum,
- const QString& filename ) const;
+ const TQString& filename ) const;
protected:
/// Delete an incidence.
- bool kmailDeleteIncidence( const QString& resource, Q_UINT32 sernum );
+ bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
- KMailICalIface::StorageFormat kmailStorageFormat( const QString& folder ) const;
+ KMailICalIface::StorageFormat kmailStorageFormat( const TQString& folder ) const;
- typedef QMap<QCString, QString> CustomHeaderMap;
+ typedef TQMap<TQCString, TQString> CustomHeaderMap;
/// Update an incidence. The list of attachments are URLs.
/// The parameter sernum is updated with the right KMail serial number
- bool kmailUpdate( const QString& resource, Q_UINT32& sernum,
- const QString& xml,
- const QString& mimetype,
- const QString& subject,
+ bool kmailUpdate( const TQString& resource, Q_UINT32& sernum,
+ const TQString& xml,
+ const TQString& mimetype,
+ const TQString& subject,
const CustomHeaderMap& customHeaders = CustomHeaderMap(),
- const QStringList& attachmentURLs = QStringList(),
- const QStringList& attachmentMimetypes = QStringList(),
- const QStringList& attachmentNames = QStringList(),
- const QStringList& deletedAttachments = QStringList() );
+ const TQStringList& attachmentURLs = TQStringList(),
+ const TQStringList& attachmentMimetypes = TQStringList(),
+ const TQStringList& attachmentNames = TQStringList(),
+ const TQStringList& deletedAttachments = TQStringList() );
/// Get the full path of the config file.
- QString configFile( const QString& type ) const;
+ TQString configFile( const TQString& type ) const;
/// If only one of these is writable, return that. Otherwise return null.
- QString findWritableResource( const ResourceMap& resources );
+ TQString findWritableResource( const ResourceMap& resources );
bool mSilent;
@@ -167,9 +167,9 @@ protected:
/// This is used to distinguish operations triggered by the user,
/// from operations triggered by KMail
- QStringList mUidsPendingAdding;
- QStringList mUidsPendingDeletion;
- QStringList mUidsPendingUpdate;
+ TQStringList mUidsPendingAdding;
+ TQStringList mUidsPendingDeletion;
+ TQStringList mUidsPendingUpdate;
private:
mutable KMailConnection* mConnection;
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index ab38500e2..8fb5177b7 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -36,14 +36,14 @@
#include <libkcal/journal.h>
#include <libkdepim/kpimprefs.h>
#include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
using namespace Scalix;
-ScalixBase::ScalixBase( const QString& tz )
- : mCreationDate( QDateTime::currentDateTime() ),
- mLastModified( QDateTime::currentDateTime() ),
+ScalixBase::ScalixBase( const TQString& tz )
+ : mCreationDate( TQDateTime::currentDateTime() ),
+ mLastModified( TQDateTime::currentDateTime() ),
mSensitivity( Public ), mTimeZoneId( tz ),
mHasPilotSyncId( false ), mHasPilotSyncStatus( false )
{
@@ -88,20 +88,20 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
setCategories( addressee->categories().join( "," ) );
// Set creation-time and last-modification-time
- const QString creationString = addressee->custom( "KOLAB", "CreationDate" );
+ const TQString creationString = addressee->custom( "KOLAB", "CreationDate" );
kdDebug(5006) << "Creation time string: " << creationString << endl;
- QDateTime creationDate;
+ TQDateTime creationDate;
if ( creationString.isEmpty() ) {
- creationDate = QDateTime::currentDateTime();
+ creationDate = TQDateTime::currentDateTime();
kdDebug(5006) << "Creation date set to current time\n";
}
else {
creationDate = stringToDateTime( creationString );
kdDebug(5006) << "Creation date loaded\n";
}
- QDateTime modified = addressee->revision();
+ TQDateTime modified = addressee->revision();
if ( !modified.isValid() )
- modified = QDateTime::currentDateTime();
+ modified = TQDateTime::currentDateTime();
setLastModified( modified );
if ( modified < creationDate ) {
// It's not possible that the modification date is earlier than creation
@@ -109,7 +109,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
kdDebug(5006) << "Creation date set to modification date\n";
}
setCreationDate( creationDate );
- const QString newCreationDate = dateTimeToString( creationDate );
+ const TQString newCreationDate = dateTimeToString( creationDate );
if ( creationString != newCreationDate ) {
// We modified the creation date, so store it for future reference
const_cast<KABC::Addressee*>( addressee )
@@ -135,7 +135,7 @@ void ScalixBase::saveTo( KABC::Addressee* addressee ) const
{
addressee->setUid( uid() );
addressee->setNote( body() );
- addressee->setCategories( QStringList::split( ',', categories() ) );
+ addressee->setCategories( TQStringList::split( ',', categories() ) );
addressee->setRevision( lastModified() );
addressee->insertCustom( "KOLAB", "CreationDate",
dateTimeToString( creationDate() ) );
@@ -155,52 +155,52 @@ void ScalixBase::saveTo( KABC::Addressee* addressee ) const
// TODO: Attachments
}
-void ScalixBase::setUid( const QString& uid )
+void ScalixBase::setUid( const TQString& uid )
{
mUid = uid;
}
-QString ScalixBase::uid() const
+TQString ScalixBase::uid() const
{
return mUid;
}
-void ScalixBase::setBody( const QString& body )
+void ScalixBase::setBody( const TQString& body )
{
mBody = body;
}
-QString ScalixBase::body() const
+TQString ScalixBase::body() const
{
return mBody;
}
-void ScalixBase::setCategories( const QString& categories )
+void ScalixBase::setCategories( const TQString& categories )
{
mCategories = categories;
}
-QString ScalixBase::categories() const
+TQString ScalixBase::categories() const
{
return mCategories;
}
-void ScalixBase::setCreationDate( const QDateTime& date )
+void ScalixBase::setCreationDate( const TQDateTime& date )
{
mCreationDate = date;
}
-QDateTime ScalixBase::creationDate() const
+TQDateTime ScalixBase::creationDate() const
{
return mCreationDate;
}
-void ScalixBase::setLastModified( const QDateTime& date )
+void ScalixBase::setLastModified( const TQDateTime& date )
{
mLastModified = date;
}
-QDateTime ScalixBase::lastModified() const
+TQDateTime ScalixBase::lastModified() const
{
return mLastModified;
}
@@ -247,14 +247,14 @@ int ScalixBase::pilotSyncStatus() const
return mPilotSyncStatus;
}
-bool ScalixBase::loadEmailAttribute( QDomElement& element, Email& email )
+bool ScalixBase::loadEmailAttribute( TQDomElement& element, Email& email )
{
- for ( QDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
- QString tagName = e.tagName();
+ TQDomElement e = n.toElement();
+ TQString tagName = e.tagName();
if ( tagName == "display-name" )
email.displayName = e.text();
@@ -270,18 +270,18 @@ bool ScalixBase::loadEmailAttribute( QDomElement& element, Email& email )
return true;
}
-void ScalixBase::saveEmailAttribute( QDomElement& element, const Email& email,
- const QString& tagName ) const
+void ScalixBase::saveEmailAttribute( TQDomElement& element, const Email& email,
+ const TQString& tagName ) const
{
- QDomElement e = element.ownerDocument().createElement( tagName );
+ TQDomElement e = element.ownerDocument().createElement( tagName );
element.appendChild( e );
writeString( e, "display-name", email.displayName );
writeString( e, "smtp-address", email.smtpAddress );
}
-bool ScalixBase::loadAttribute( QDomElement& element )
+bool ScalixBase::loadAttribute( TQDomElement& element )
{
- QString tagName = element.tagName();
+ TQString tagName = element.tagName();
if ( tagName == "uid" )
setUid( element.text() );
@@ -308,7 +308,7 @@ bool ScalixBase::loadAttribute( QDomElement& element )
return true;
}
-bool ScalixBase::saveAttributes( QDomElement& element ) const
+bool ScalixBase::saveAttributes( TQDomElement& element ) const
{
writeString( element, "product-id", productID() );
writeString( element, "uid", uid() );
@@ -319,17 +319,17 @@ bool ScalixBase::saveAttributes( QDomElement& element ) const
dateTimeToString( lastModified() ) );
writeString( element, "sensitivity", sensitivityToString( sensitivity() ) );
if ( hasPilotSyncId() )
- writeString( element, "pilot-sync-id", QString::number( pilotSyncId() ) );
+ writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) );
if ( hasPilotSyncStatus() )
- writeString( element, "pilot-sync-status", QString::number( pilotSyncStatus() ) );
+ writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) );
return true;
}
-bool ScalixBase::load( const QString& xml )
+bool ScalixBase::load( const TQString& xml )
{
- QString errorMsg;
+ TQString errorMsg;
int errorLine, errorColumn;
- QDomDocument document;
+ TQDomDocument document;
bool ok = document.setContent( xml, &errorMsg, &errorLine, &errorColumn );
if ( !ok ) {
@@ -342,11 +342,11 @@ bool ScalixBase::load( const QString& xml )
return loadXML( document );
}
-bool ScalixBase::load( QFile& xml )
+bool ScalixBase::load( TQFile& xml )
{
- QString errorMsg;
+ TQString errorMsg;
int errorLine, errorColumn;
- QDomDocument document;
+ TQDomDocument document;
bool ok = document.setContent( &xml, &errorMsg, &errorLine, &errorColumn );
if ( !ok ) {
@@ -359,41 +359,41 @@ bool ScalixBase::load( QFile& xml )
return loadXML( document );
}
-QDomDocument ScalixBase::domTree()
+TQDomDocument ScalixBase::domTree()
{
- QDomDocument document;
+ TQDomDocument document;
- QString p = "version=\"1.0\" encoding=\"UTF-8\"";
+ TQString p = "version=\"1.0\" encoding=\"UTF-8\"";
document.appendChild(document.createProcessingInstruction( "xml", p ) );
return document;
}
-QString ScalixBase::dateTimeToString( const QDateTime& time )
+TQString ScalixBase::dateTimeToString( const TQDateTime& time )
{
return time.toString( Qt::ISODate ) + 'Z';
}
-QString ScalixBase::dateToString( const QDate& date )
+TQString ScalixBase::dateToString( const TQDate& date )
{
return date.toString( Qt::ISODate );
}
-QDateTime ScalixBase::stringToDateTime( const QString& _date )
+TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
{
- QString date( _date );
+ TQString date( _date );
if ( date.endsWith( "Z" ) )
date.truncate( date.length() - 1 );
- return QDateTime::fromString( date, Qt::ISODate );
+ return TQDateTime::fromString( date, Qt::ISODate );
}
-QDate ScalixBase::stringToDate( const QString& date )
+TQDate ScalixBase::stringToDate( const TQString& date )
{
- return QDate::fromString( date, Qt::ISODate );
+ return TQDate::fromString( date, Qt::ISODate );
}
-QString ScalixBase::sensitivityToString( Sensitivity s )
+TQString ScalixBase::sensitivityToString( Sensitivity s )
{
switch( s ) {
case Private: return "private";
@@ -404,7 +404,7 @@ QString ScalixBase::sensitivityToString( Sensitivity s )
return "What what what???";
}
-ScalixBase::Sensitivity ScalixBase::stringToSensitivity( const QString& s )
+ScalixBase::Sensitivity ScalixBase::stringToSensitivity( const TQString& s )
{
if ( s == "private" )
return Private;
@@ -413,34 +413,34 @@ ScalixBase::Sensitivity ScalixBase::stringToSensitivity( const QString& s )
return Public;
}
-QString ScalixBase::colorToString( const QColor& color )
+TQString ScalixBase::colorToString( const TQColor& color )
{
// Color is in the format "#RRGGBB"
return color.name();
}
-QColor ScalixBase::stringToColor( const QString& s )
+TQColor ScalixBase::stringToColor( const TQString& s )
{
- return QColor( s );
+ return TQColor( s );
}
-void ScalixBase::writeString( QDomElement& element, const QString& tag,
- const QString& tagString )
+void ScalixBase::writeString( TQDomElement& element, const TQString& tag,
+ const TQString& tagString )
{
if ( !tagString.isEmpty() ) {
- QDomElement e = element.ownerDocument().createElement( tag );
- QDomText t = element.ownerDocument().createTextNode( tagString );
+ TQDomElement e = element.ownerDocument().createElement( tag );
+ TQDomText t = element.ownerDocument().createTextNode( tagString );
e.appendChild( t );
element.appendChild( e );
}
}
-QDateTime ScalixBase::localToUTC( const QDateTime& time ) const
+TQDateTime ScalixBase::localToUTC( const TQDateTime& time ) const
{
return KPimPrefs::localTimeToUtc( time, mTimeZoneId );
}
-QDateTime ScalixBase::utcToLocal( const QDateTime& time ) const
+TQDateTime ScalixBase::utcToLocal( const TQDateTime& time ) const
{
return KPimPrefs::utcToLocalTime( time, mTimeZoneId );
}
diff --git a/kresources/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h
index efed7e27a..739a2615c 100644
--- a/kresources/scalix/shared/scalixbase.h
+++ b/kresources/scalix/shared/scalixbase.h
@@ -33,9 +33,9 @@
#ifndef SCALIXBASE_H
#define SCALIXBASE_H
-#include <qdom.h>
-#include <qdatetime.h>
-#include <qcolor.h>
+#include <tqdom.h>
+#include <tqdatetime.h>
+#include <tqcolor.h>
class QFile;
@@ -53,38 +53,38 @@ class ScalixBase {
public:
struct Email {
public:
- Email( const QString& name = QString::null,
- const QString& email = QString::null )
+ Email( const TQString& name = TQString::null,
+ const TQString& email = TQString::null )
: displayName( name ), smtpAddress( email )
{
}
- QString displayName;
- QString smtpAddress;
+ TQString displayName;
+ TQString smtpAddress;
};
enum Sensitivity { Public = 0, Private = 1, Confidential = 2 };
- explicit ScalixBase( const QString& timezone = QString::null );
+ explicit ScalixBase( const TQString& timezone = TQString::null );
virtual ~ScalixBase();
// Return a string identifying this type
- virtual QString type() const = 0;
+ virtual TQString type() const = 0;
- virtual void setUid( const QString& uid );
- virtual QString uid() const;
+ virtual void setUid( const TQString& uid );
+ virtual TQString uid() const;
- virtual void setBody( const QString& body );
- virtual QString body() const;
+ virtual void setBody( const TQString& body );
+ virtual TQString body() const;
- virtual void setCategories( const QString& categories );
- virtual QString categories() const;
+ virtual void setCategories( const TQString& categories );
+ virtual TQString categories() const;
- virtual void setCreationDate( const QDateTime& date );
- virtual QDateTime creationDate() const;
+ virtual void setCreationDate( const TQDateTime& date );
+ virtual TQDateTime creationDate() const;
- virtual void setLastModified( const QDateTime& date );
- virtual QDateTime lastModified() const;
+ virtual void setLastModified( const TQDateTime& date );
+ virtual TQDateTime lastModified() const;
virtual void setSensitivity( Sensitivity sensitivity );
virtual Sensitivity sensitivity() const;
@@ -98,28 +98,28 @@ public:
virtual int pilotSyncStatus() const;
// String - Date conversion methods
- static QString dateTimeToString( const QDateTime& time );
- static QString dateToString( const QDate& date );
- static QDateTime stringToDateTime( const QString& time );
- static QDate stringToDate( const QString& date );
+ static TQString dateTimeToString( const TQDateTime& time );
+ static TQString dateToString( const TQDate& date );
+ static TQDateTime stringToDateTime( const TQString& time );
+ static TQDate stringToDate( const TQString& date );
// String - Sensitivity conversion methods
- static QString sensitivityToString( Sensitivity );
- static Sensitivity stringToSensitivity( const QString& );
+ static TQString sensitivityToString( Sensitivity );
+ static Sensitivity stringToSensitivity( const TQString& );
// String - Color conversion methods
- static QString colorToString( const QColor& );
- static QColor stringToColor( const QString& );
+ static TQString colorToString( const TQColor& );
+ static TQColor stringToColor( const TQString& );
// Load this object by reading the XML file
- bool load( const QString& xml );
- bool load( QFile& xml );
+ bool load( const TQString& xml );
+ bool load( TQFile& xml );
// Load this QDomDocument
- virtual bool loadXML( const QDomDocument& xml ) = 0;
+ virtual bool loadXML( const TQDomDocument& xml ) = 0;
// Serialize this object to an XML string
- virtual QString saveXML() const = 0;
+ virtual TQString saveXML() const = 0;
protected:
/// Read all known fields from this ical incidence
@@ -135,35 +135,35 @@ protected:
void saveTo( KABC::Addressee* ) const;
// This just makes the initial dom tree with version and doctype
- static QDomDocument domTree();
+ static TQDomDocument domTree();
- bool loadEmailAttribute( QDomElement& element, Email& email );
+ bool loadEmailAttribute( TQDomElement& element, Email& email );
- void saveEmailAttribute( QDomElement& element, const Email& email,
- const QString& tagName = "email" ) const;
+ void saveEmailAttribute( TQDomElement& element, const Email& email,
+ const TQString& tagName = "email" ) const;
// Load the attributes of this class
- virtual bool loadAttribute( QDomElement& );
+ virtual bool loadAttribute( TQDomElement& );
// Save the attributes of this class
- virtual bool saveAttributes( QDomElement& ) const;
+ virtual bool saveAttributes( TQDomElement& ) const;
// Return the product ID
- virtual QString productID() const = 0;
+ virtual TQString productID() const = 0;
// Write a string tag
- static void writeString( QDomElement&, const QString&, const QString& );
+ static void writeString( TQDomElement&, const TQString&, const TQString& );
- QDateTime localToUTC( const QDateTime& time ) const;
- QDateTime utcToLocal( const QDateTime& time ) const;
+ TQDateTime localToUTC( const TQDateTime& time ) const;
+ TQDateTime utcToLocal( const TQDateTime& time ) const;
- QString mUid;
- QString mBody;
- QString mCategories;
- QDateTime mCreationDate;
- QDateTime mLastModified;
+ TQString mUid;
+ TQString mBody;
+ TQString mCategories;
+ TQDateTime mCreationDate;
+ TQDateTime mLastModified;
Sensitivity mSensitivity;
- QString mTimeZoneId;
+ TQString mTimeZoneId;
// KPilot synchronization stuff
bool mHasPilotSyncId, mHasPilotSyncStatus;
diff --git a/kresources/scalix/shared/subresource.cpp b/kresources/scalix/shared/subresource.cpp
index 6653e0f06..0acfb0816 100644
--- a/kresources/scalix/shared/subresource.cpp
+++ b/kresources/scalix/shared/subresource.cpp
@@ -35,7 +35,7 @@
using namespace Scalix;
-SubResource::SubResource( bool active, bool writable, const QString& label,
+SubResource::SubResource( bool active, bool writable, const TQString& label,
int completionWeight )
: mActive( active ), mWritable( writable ), mLabel( label ),
mCompletionWeight( completionWeight )
@@ -66,12 +66,12 @@ bool SubResource::writable() const
return mWritable;
}
-void SubResource::setLabel( const QString& label )
+void SubResource::setLabel( const TQString& label )
{
mLabel = label;
}
-QString SubResource::label() const
+TQString SubResource::label() const
{
return mLabel;
}
@@ -86,7 +86,7 @@ int SubResource::completionWeight() const
return mCompletionWeight;
}
-StorageReference::StorageReference( const QString& resource, Q_UINT32 sernum )
+StorageReference::StorageReference( const TQString& resource, Q_UINT32 sernum )
: mResource( resource ), mSerialNumber( sernum )
{
}
@@ -95,12 +95,12 @@ StorageReference::~StorageReference()
{
}
-void StorageReference::setResource( const QString& resource )
+void StorageReference::setResource( const TQString& resource )
{
mResource = resource;
}
-QString StorageReference::resource() const
+TQString StorageReference::resource() const
{
return mResource;
}
diff --git a/kresources/scalix/shared/subresource.h b/kresources/scalix/shared/subresource.h
index 3cfc4429e..f7898c14f 100644
--- a/kresources/scalix/shared/subresource.h
+++ b/kresources/scalix/shared/subresource.h
@@ -34,8 +34,8 @@
#ifndef SUBRESOURCE_H
#define SUBRESOURCE_H
-#include <qstring.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqmap.h>
namespace Scalix {
@@ -49,7 +49,7 @@ public:
// This is just for QMap
SubResource() {}
- SubResource( bool active, bool writable, const QString& label,
+ SubResource( bool active, bool writable, const TQString& label,
int completionWeight = 100 );
virtual ~SubResource();
@@ -59,8 +59,8 @@ public:
virtual void setWritable( bool writable );
virtual bool writable() const;
- virtual void setLabel( const QString& label );
- virtual QString label() const;
+ virtual void setLabel( const TQString& label );
+ virtual TQString label() const;
virtual void setCompletionWeight( int completionWeight );
virtual int completionWeight() const;
@@ -68,7 +68,7 @@ public:
private:
bool mActive; // Controlled by the applications
bool mWritable; // Set if the KMail folder is writable
- QString mLabel; // The GUI name of this resource
+ TQString mLabel; // The GUI name of this resource
// This is just for the abc plugin. But as long as only this is here,
// it's just as cheap to have it in here as making a d-pointer that
@@ -77,7 +77,7 @@ private:
int mCompletionWeight;
};
-typedef QMap<QString, SubResource> ResourceMap;
+typedef TQMap<TQString, SubResource> ResourceMap;
/**
* This class is used to store a mapping from the XML UID to the KMail
@@ -89,21 +89,21 @@ public:
// Just for QMap
StorageReference() {}
- StorageReference( const QString& resource, Q_UINT32 sernum );
+ StorageReference( const TQString& resource, Q_UINT32 sernum );
virtual ~StorageReference();
- virtual void setResource( const QString& resource );
- virtual QString resource() const;
+ virtual void setResource( const TQString& resource );
+ virtual TQString resource() const;
virtual void setSerialNumber( Q_UINT32 serialNumber );
virtual Q_UINT32 serialNumber() const;
private:
- QString mResource;
+ TQString mResource;
Q_UINT32 mSerialNumber;
};
-typedef QMap<QString, StorageReference> UidMap;
+typedef TQMap<TQString, StorageReference> UidMap;
}
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index e6bf326c3..757bfae08 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qapplication.h>
+#include <tqapplication.h>
#include <kabc/picture.h>
#include <kconfig.h>
@@ -53,7 +53,7 @@ ResourceSlox::ResourceSlox( const KConfig *config )
}
ResourceSlox::ResourceSlox( const KURL &url,
- const QString &user, const QString &password )
+ const TQString &user, const TQString &password )
: ResourceCached( 0 ), SloxBase( this )
{
init();
@@ -184,16 +184,16 @@ bool ResourceSlox::asyncLoad()
url.setUser( mPrefs->user() );
url.setPass( mPrefs->password() );
- QString lastsync = "0";
+ TQString lastsync = "0";
if ( mPrefs->useLastSync() ) {
- QDateTime dt = mPrefs->lastSync();
+ TQDateTime dt = mPrefs->lastSync();
if ( dt.isValid() )
lastsync = WebdavHandler::qDateTimeToSlox( dt.addDays( -1 ) );
}
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
- QDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+ TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync );
WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->folderId() );
if ( type() == "ox" ) {
@@ -205,18 +205,18 @@ bool ResourceSlox::asyncLoad()
kdDebug() << "REQUEST CONTACTS: \n" << doc.toString( 2 ) << endl;
mDownloadJob = KIO::davPropFind( url, doc, "0", false );
- connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotResult( KIO::Job * ) ) );
- connect( mDownloadJob, SIGNAL( percent( KIO::Job *, unsigned long ) ),
- SLOT( slotProgress( KIO::Job *, unsigned long ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
+ TQT_SLOT( slotProgress( KIO::Job *, unsigned long ) ) );
mDownloadProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading contacts") );
connect( mDownloadProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelDownload() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelDownload() ) );
- mPrefs->setLastSync( QDateTime::currentDateTime() );
+ mPrefs->setLastSync( TQDateTime::currentDateTime() );
return true;
}
@@ -230,20 +230,20 @@ void ResourceSlox::slotResult( KIO::Job *job )
} else {
kdDebug() << "ResourceSlox::slotResult() success" << endl;
- QDomDocument doc = mDownloadJob->response();
+ TQDomDocument doc = mDownloadJob->response();
mWebdavHandler.log( doc.toString( 2 ) );
- QValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+ TQValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
bool changed = false;
- QValueList<SloxItem>::ConstIterator it;
+ TQValueList<SloxItem>::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
SloxItem item = *it;
- QString uid = "kresources_slox_kabc_" + item.sloxId;
+ TQString uid = "kresources_slox_kabc_" + item.sloxId;
if ( item.status == SloxItem::Delete ) {
- QMap<QString,Addressee>::Iterator it;
+ TQMap<TQString,Addressee>::Iterator it;
it = mAddrMap.find( uid );
if ( it != mAddrMap.end() ) {
mAddrMap.remove( it );
@@ -255,9 +255,9 @@ void ResourceSlox::slotResult( KIO::Job *job )
mWebdavHandler.clearSloxAttributeStatus();
- QDomNode n;
+ TQDomNode n;
for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
mWebdavHandler.parseSloxAttribute( e );
parseContactAttribute( e, a );
}
@@ -295,13 +295,13 @@ void ResourceSlox::slotUploadResult( KIO::Job *job )
} else {
kdDebug() << "ResourceSlox::slotUploadResult() success" << endl;
- QDomDocument doc = mUploadJob->response();
+ TQDomDocument doc = mUploadJob->response();
kdDebug() << k_funcinfo << "Upload result: " << endl;
kdDebug() << doc.toString() << endl;
- QValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+ TQValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
- QValueList<SloxItem>::ConstIterator it;
+ TQValueList<SloxItem>::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
SloxItem item = *it;
if ( !item.response.contains( "200" ) ) {
@@ -309,7 +309,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job )
continue;
}
if ( item.status == SloxItem::New ) {
- QMap<QString,Addressee>::Iterator search_res;
+ TQMap<TQString,Addressee>::Iterator search_res;
search_res = mAddrMap.find( item.clientId );
if ( search_res != mAddrMap.end() ) {
// use the id provided by the server
@@ -334,15 +334,15 @@ void ResourceSlox::slotUploadResult( KIO::Job *job )
uploadContacts();
}
-void ResourceSlox::parseContactAttribute( const QDomElement &e, Addressee &a )
+void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a )
{
- QString text = decodeText( e.text() );
+ TQString text = decodeText( e.text() );
if ( text.isEmpty() ) return;
- QString tag = e.tagName();
+ TQString tag = e.tagName();
int pnType = 0;
if ( tag == fieldName( Birthday ) ) {
- QDateTime dt = WebdavHandler::sloxToQDateTime( text );
+ TQDateTime dt = WebdavHandler::sloxToQDateTime( text );
a.setBirthday( dt.date() );
} else if ( tag == fieldName( Role ) ) {
a.setRole( text );
@@ -376,9 +376,9 @@ void ResourceSlox::parseContactAttribute( const QDomElement &e, Addressee &a )
} else if ( tag == fieldName( Url ) ) {
a.setUrl( text );
} else if ( tag == fieldName( Image ) ) {
- QByteArray decodedPicture;
+ TQByteArray decodedPicture;
KCodecs::base64Decode( text.utf8(), decodedPicture );
- a.setPhoto( Picture( QImage( decodedPicture ) ) );
+ a.setPhoto( Picture( TQImage( decodedPicture ) ) );
} else if ( tag == fieldName( NickName ) ) {
a.setNickName( text );
} else if ( tag == fieldName( InstantMsg ) ) {
@@ -394,10 +394,10 @@ void ResourceSlox::parseContactAttribute( const QDomElement &e, Addressee &a )
} else if ( tag == fieldName( SpousesName ) ) {
a.insertCustom( "KADDRESSBOOK", "X-SpousesName", text );
} else if ( tag == fieldName( Anniversary ) ) {
- QDateTime dt = WebdavHandler::sloxToQDateTime( text );
+ TQDateTime dt = WebdavHandler::sloxToQDateTime( text );
a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( Qt::ISODate ) );
} else if ( tag == fieldName( Categories ) ) {
- a.setCategories( QStringList::split( QRegExp(",\\s*"), text ) );
+ a.setCategories( TQStringList::split( TQRegExp(",\\s*"), text ) );
} else if ( type() == "ox" ) { // FIXME: Address reading is missing for SLOX
// read addresses
Address addr;
@@ -423,17 +423,17 @@ void ResourceSlox::parseContactAttribute( const QDomElement &e, Addressee &a )
}
}
-int ResourceSlox::phoneNumberType( const QString &fieldName ) const
+int ResourceSlox::phoneNumberType( const TQString &fieldName ) const
{
- QMap<int, QStringList> pnmap;
+ TQMap<int, TQStringList> pnmap;
if ( type() == "ox" )
pnmap = mPhoneNumberOxMap;
else
pnmap = mPhoneNumberSloxMap;
- QMap<int, QStringList>::ConstIterator it;
+ TQMap<int, TQStringList>::ConstIterator it;
for ( it = pnmap.begin(); it != pnmap.end(); ++it ) {
- QStringList l = it.data();
- QStringList::ConstIterator it2;
+ TQStringList l = it.data();
+ TQStringList::ConstIterator it2;
for ( it2 = l.begin(); it2 != l.end(); ++it2 )
if ( (*it2) == fieldName )
return it.key();
@@ -471,10 +471,10 @@ bool ResourceSlox::asyncSave( Ticket* )
void ResourceSlox::uploadContacts()
{
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "propertyupdate" );
- QDomElement set = WebdavHandler::addDavElement( doc, root, "set" );
- QDomElement prop = WebdavHandler::addDavElement( doc, set, "prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propertyupdate" );
+ TQDomElement set = WebdavHandler::addDavElement( doc, root, "set" );
+ TQDomElement prop = WebdavHandler::addDavElement( doc, set, "prop" );
bool isDelete = false;
@@ -501,7 +501,7 @@ void ResourceSlox::uploadContacts()
if ( !isDelete ) {
createAddresseeFields( doc, prop, mUploadAddressee );
} else {
- QString tmp_uid = mUploadAddressee.uid().remove( 0, sizeof("kresources_slox_kabc_") - 1); // remove prefix from uid
+ TQString tmp_uid = mUploadAddressee.uid().remove( 0, sizeof("kresources_slox_kabc_") - 1); // remove prefix from uid
WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectId ), tmp_uid );
WebdavHandler::addSloxElement( this, doc, prop, "method", "DELETE" );
}
@@ -514,19 +514,19 @@ void ResourceSlox::uploadContacts()
url.setPass( mPrefs->password() );
mUploadJob = KIO::davPropPatch( url, doc, false );
- connect( mUploadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotUploadResult( KIO::Job * ) ) );
- connect( mUploadJob, SIGNAL( percent( KIO::Job *, unsigned long ) ),
- SLOT( slotProgress( KIO::Job *, unsigned long ) ) );
+ connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotUploadResult( KIO::Job * ) ) );
+ connect( mUploadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
+ TQT_SLOT( slotProgress( KIO::Job *, unsigned long ) ) );
mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Uploading contacts") );
connect( mUploadProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelUpload() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelUpload() ) );
}
-void ResourceSlox::createAddresseeFields( QDomDocument &doc, QDomElement &prop,
+void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop,
const Addressee &a )
{
// choose addressbook
@@ -562,10 +562,10 @@ void ResourceSlox::createAddresseeFields( QDomDocument &doc, QDomElement &prop,
a.custom( "KADDRESSBOOK", "X-AssistantsName" ) );
WebdavHandler::addSloxElement( this, doc, prop, fieldName( SpousesName ),
a.custom( "KADDRESSBOOK", "X-SpousesName" ) );
- QString anniversary = a.custom( "KADDRESSBOOK", "X-Anniversary" );
+ TQString anniversary = a.custom( "KADDRESSBOOK", "X-Anniversary" );
if ( !anniversary.isEmpty() )
WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ),
- WebdavHandler::qDateTimeToSlox( QDateTime::fromString( anniversary, Qt::ISODate ).date() ) );
+ WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, Qt::ISODate ).date() ) );
else
WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ) );
}
@@ -575,8 +575,8 @@ void ResourceSlox::createAddresseeFields( QDomDocument &doc, QDomElement &prop,
WebdavHandler::addSloxElement( this, doc, prop, fieldName( Categories ), a.categories().join( ", " ) );
// emails
- QStringList email_list = a.emails();
- QStringList::const_iterator emails_it = email_list.begin();
+ TQStringList email_list = a.emails();
+ TQStringList::const_iterator emails_it = email_list.begin();
if ( emails_it != email_list.end() )
WebdavHandler::addSloxElement( this, doc, prop, fieldName( PrimaryEmail ), *(emails_it++) );
if ( emails_it != email_list.end() )
@@ -586,15 +586,15 @@ void ResourceSlox::createAddresseeFields( QDomDocument &doc, QDomElement &prop,
// phone numbers
PhoneNumber::List pnlist = a.phoneNumbers();
- QMap<int, QStringList> pnSaveMap;
+ TQMap<int, TQStringList> pnSaveMap;
if ( type() == "ox" )
pnSaveMap = mPhoneNumberOxMap;
else
pnSaveMap = mPhoneNumberSloxMap;
for ( PhoneNumber::List::ConstIterator it = pnlist.begin() ; it != pnlist.end(); ++it ) {
if ( pnSaveMap.contains( (*it).type() ) ) {
- QStringList l = pnSaveMap[(*it).type()];
- QString fn = l.first();
+ TQStringList l = pnSaveMap[(*it).type()];
+ TQString fn = l.first();
l.remove( l.begin() );
if ( !l.isEmpty() )
pnSaveMap[(*it).type()] = l;
@@ -606,9 +606,9 @@ void ResourceSlox::createAddresseeFields( QDomDocument &doc, QDomElement &prop,
}
// send empty fields for the remaining ohone number fields
// it's not possible to delete phone numbers otherwise
- for ( QMap<int, QStringList>::ConstIterator it = pnSaveMap.begin(); it != pnSaveMap.end(); ++it ) {
- QStringList l = it.data();
- for ( QStringList::ConstIterator it2 = l.begin(); it2 != l.end(); ++it2 )
+ for ( TQMap<int, TQStringList>::ConstIterator it = pnSaveMap.begin(); it != pnSaveMap.end(); ++it ) {
+ TQStringList l = it.data();
+ for ( TQStringList::ConstIterator it2 = l.begin(); it2 != l.end(); ++it2 )
WebdavHandler::addSloxElement( this, doc, prop, (*it2) );
}
@@ -620,8 +620,8 @@ void ResourceSlox::createAddresseeFields( QDomDocument &doc, QDomElement &prop,
}
}
-void KABC::ResourceSlox::createAddressFields( QDomDocument &doc, QDomElement &parent,
- const QString &prefix, const KABC::Address &addr )
+void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &parent,
+ const TQString &prefix, const KABC::Address &addr )
{
WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Street ), addr.street() );
WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( PostalCode ), addr.postalCode() );
diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h
index 066fdeaa4..5815acd4a 100644
--- a/kresources/slox/kabcresourceslox.h
+++ b/kresources/slox/kabcresourceslox.h
@@ -27,8 +27,8 @@
#include <kdepimmacros.h>
#include <kabc/addressee.h>
-#include <qmap.h>
-#include <qdom.h>
+#include <tqmap.h>
+#include <tqdom.h>
namespace KIO {
class DavJob;
@@ -51,7 +51,7 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
public:
ResourceSlox( const KConfig * );
ResourceSlox( const KURL &url,
- const QString &user, const QString &password );
+ const TQString &user, const TQString &password );
~ResourceSlox();
void readConfig( const KConfig * );
@@ -76,12 +76,12 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
protected:
void init();
- int phoneNumberType( const QString &fieldName ) const;
- void parseContactAttribute( const QDomElement &e, Addressee &a );
+ int phoneNumberType( const TQString &fieldName ) const;
+ void parseContactAttribute( const TQDomElement &e, Addressee &a );
- void createAddresseeFields( QDomDocument &doc, QDomElement &prop, const Addressee &a );
- void createAddressFields( QDomDocument &doc, QDomElement &parent,
- const QString &prefix, const KABC::Address &addr );
+ void createAddresseeFields( TQDomDocument &doc, TQDomElement &prop, const Addressee &a );
+ void createAddressFields( TQDomDocument &doc, TQDomElement &parent,
+ const TQString &prefix, const KABC::Address &addr );
void uploadContacts();
@@ -105,7 +105,7 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
KABC::Addressee mUploadAddressee;
- QMap<int, QStringList> mPhoneNumberSloxMap, mPhoneNumberOxMap;
+ TQMap<int, TQStringList> mPhoneNumberSloxMap, mPhoneNumberOxMap;
};
}
diff --git a/kresources/slox/kabcresourcesloxconfig.cpp b/kresources/slox/kabcresourcesloxconfig.cpp
index 3df5636be..abacaf718 100644
--- a/kresources/slox/kabcresourcesloxconfig.cpp
+++ b/kresources/slox/kabcresourcesloxconfig.cpp
@@ -33,43 +33,43 @@
#include <klineedit.h>
#include <kurlrequester.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
using namespace KABC;
-ResourceSloxConfig::ResourceSloxConfig( QWidget* parent, const char* name )
+ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name ), mRes( 0 )
{
- QGridLayout *mainLayout = new QGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "URL:" ), this );
+ TQLabel *label = new TQLabel( i18n( "URL:" ), this );
mURL = new KURLRequester( this );
mainLayout->addWidget( label, 0, 0 );
mainLayout->addWidget( mURL, 0, 1 );
- label = new QLabel( i18n( "User:" ), this );
+ label = new TQLabel( i18n( "User:" ), this );
mUser = new KLineEdit( this );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mUser, 1, 1 );
- label = new QLabel( i18n( "Password:" ), this );
+ label = new TQLabel( i18n( "Password:" ), this );
mPassword = new KLineEdit( this );
- mPassword->setEchoMode( QLineEdit::Password );
+ mPassword->setEchoMode( TQLineEdit::Password );
mainLayout->addWidget( label, 2, 0 );
mainLayout->addWidget( mPassword, 2, 1 );
- mLastSyncCheck = new QCheckBox( i18n("Only load data since last sync"),
+ mLastSyncCheck = new TQCheckBox( i18n("Only load data since last sync"),
this );
mainLayout->addMultiCellWidget( mLastSyncCheck, 3, 3, 0, 1 );
mFolderButton = new KPushButton( i18n("Select Folder..."), this );
mainLayout->addMultiCellWidget( mFolderButton, 4, 4, 0, 1 );
- connect( mFolderButton, SIGNAL( clicked() ), SLOT( selectAddressFolder() ) );
+ connect( mFolderButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectAddressFolder() ) );
}
@@ -114,7 +114,7 @@ void KABC::ResourceSloxConfig::selectAddressFolder( )
SloxFolderManager *manager = new SloxFolderManager( mRes, mURL->url() );
SloxFolderDialog *dialog = new SloxFolderDialog( manager, Contacts, this );
dialog->setSelectedFolder( mFolderId );
- if ( dialog->exec() == QDialog::Accepted )
+ if ( dialog->exec() == TQDialog::Accepted )
mFolderId = dialog->selectedFolder();
}
diff --git a/kresources/slox/kabcresourcesloxconfig.h b/kresources/slox/kabcresourcesloxconfig.h
index b55282a85..6aedf83b3 100644
--- a/kresources/slox/kabcresourcesloxconfig.h
+++ b/kresources/slox/kabcresourcesloxconfig.h
@@ -37,7 +37,7 @@ class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget
Q_OBJECT
public:
- ResourceSloxConfig( QWidget* parent = 0, const char* name = 0 );
+ ResourceSloxConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KRES::Resource* );
@@ -50,9 +50,9 @@ class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget
KURLRequester *mURL;
KLineEdit *mUser;
KLineEdit *mPassword;
- QCheckBox *mLastSyncCheck;
+ TQCheckBox *mLastSyncCheck;
KPushButton *mFolderButton;
- QString mFolderId;
+ TQString mFolderId;
SloxBase *mRes;
};
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index d446494f6..2fcb0baa3 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -22,11 +22,11 @@
#include <typeinfo>
#include <stdlib.h>
-#include <qdatetime.h>
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qfile.h>
-#include <qregexp.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
+#include <tqfile.h>
+#include <tqregexp.h>
#include <kdebug.h>
#include <kurl.h>
@@ -173,9 +173,9 @@ bool KCalResourceSlox::doLoad()
clearChanges();
- QString p = KURL( mPrefs->url() ).protocol();
+ TQString p = KURL( mPrefs->url() ).protocol();
if ( p != "http" && p != "https" && p != "webdav" && p != "webdavs" ) {
- QString err = i18n("Non-http protocol: '%1'").arg( p );
+ TQString err = i18n("Non-http protocol: '%1'").arg( p );
kdDebug() << "KCalResourceSlox::load(): " << err << endl;
loadError( err );
return false;
@@ -202,17 +202,17 @@ void KCalResourceSlox::requestEvents()
kdDebug() << "KCalResourceSlox::requestEvents(): " << url << endl;
- QString lastsync = "0";
+ TQString lastsync = "0";
if ( mPrefs->useLastSync() ) {
- QDateTime dt = mPrefs->lastEventSync();
+ TQDateTime dt = mPrefs->lastEventSync();
if ( dt.isValid() ) {
lastsync = WebdavHandler::qDateTimeToSlox( dt.addDays( -1 ) );
}
}
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
- QDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+ TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync );
WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->calendarFolderId() );
if ( type() == "ox" ) {
@@ -224,18 +224,18 @@ void KCalResourceSlox::requestEvents()
kdDebug() << "REQUEST CALENDAR: \n" << doc.toString( 2 ) << endl;
mLoadEventsJob = KIO::davPropFind( url, doc, "0", false );
- connect( mLoadEventsJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotLoadEventsResult( KIO::Job * ) ) );
- connect( mLoadEventsJob, SIGNAL( percent( KIO::Job *, unsigned long ) ),
- SLOT( slotEventsProgress( KIO::Job *, unsigned long ) ) );
+ connect( mLoadEventsJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotLoadEventsResult( KIO::Job * ) ) );
+ connect( mLoadEventsJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
+ TQT_SLOT( slotEventsProgress( KIO::Job *, unsigned long ) ) );
mLoadEventsProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading events") );
connect( mLoadEventsProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelLoadEvents() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelLoadEvents() ) );
- mPrefs->setLastEventSync( QDateTime::currentDateTime() );
+ mPrefs->setLastEventSync( TQDateTime::currentDateTime() );
}
void KCalResourceSlox::requestTodos()
@@ -247,17 +247,17 @@ void KCalResourceSlox::requestTodos()
kdDebug() << "KCalResourceSlox::requestTodos(): " << url << endl;
- QString lastsync = "0";
+ TQString lastsync = "0";
if ( mPrefs->useLastSync() ) {
- QDateTime dt = mPrefs->lastTodoSync();
+ TQDateTime dt = mPrefs->lastTodoSync();
if ( dt.isValid() ) {
lastsync = WebdavHandler::qDateTimeToSlox( dt.addDays( -1 ) );
}
}
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
- QDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+ TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastSync ), lastsync );
WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->taskFolderId() );
if ( type() == "ox" ) {
@@ -269,27 +269,27 @@ void KCalResourceSlox::requestTodos()
kdDebug() << "REQUEST TASKS: \n" << doc.toString( 2 ) << endl;
mLoadTodosJob = KIO::davPropFind( url, doc, "0", false );
- connect( mLoadTodosJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotLoadTodosResult( KIO::Job * ) ) );
- connect( mLoadTodosJob, SIGNAL( percent( KIO::Job *, unsigned long ) ),
- SLOT( slotTodosProgress( KIO::Job *, unsigned long ) ) );
+ connect( mLoadTodosJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotLoadTodosResult( KIO::Job * ) ) );
+ connect( mLoadTodosJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
+ TQT_SLOT( slotTodosProgress( KIO::Job *, unsigned long ) ) );
mLoadTodosProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading to-dos") );
connect( mLoadTodosProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelLoadTodos() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelLoadTodos() ) );
- mPrefs->setLastTodoSync( QDateTime::currentDateTime() );
+ mPrefs->setLastTodoSync( TQDateTime::currentDateTime() );
}
void KCalResourceSlox::uploadIncidences()
{
- QDomDocument doc;
- QDomElement ms = WebdavHandler::addDavElement( doc, doc, "multistatus" );
- QDomElement pu = WebdavHandler::addDavElement( doc, ms, "propertyupdate" );
- QDomElement set = WebdavHandler::addElement( doc, pu, "D:set" );
- QDomElement prop = WebdavHandler::addElement( doc, set, "D:prop" );
+ TQDomDocument doc;
+ TQDomElement ms = WebdavHandler::addDavElement( doc, doc, "multistatus" );
+ TQDomElement pu = WebdavHandler::addDavElement( doc, ms, "propertyupdate" );
+ TQDomElement set = WebdavHandler::addElement( doc, pu, "D:set" );
+ TQDomElement prop = WebdavHandler::addElement( doc, set, "D:prop" );
mUploadIsDelete = false;
Incidence::List added = addedIncidences();
@@ -320,7 +320,7 @@ void KCalResourceSlox::uploadIncidences()
KURL url = mPrefs->url();
- QString sloxId = mUploadedIncidence->customProperty( "SLOX", "ID" );
+ TQString sloxId = mUploadedIncidence->customProperty( "SLOX", "ID" );
if ( !sloxId.isEmpty() ) {
WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectId ), sloxId );
} else {
@@ -348,8 +348,8 @@ void KCalResourceSlox::uploadIncidences()
if ( type() == "ox" ) {
WebdavHandler::addSloxElement( this, doc, prop, "method", "DELETE" );
} else {
- QDomElement remove = WebdavHandler::addElement( doc, pu, "D:remove" );
- QDomElement prop = WebdavHandler::addElement( doc, remove, "D:prop" );
+ TQDomElement remove = WebdavHandler::addElement( doc, pu, "D:remove" );
+ TQDomElement prop = WebdavHandler::addElement( doc, remove, "D:prop" );
WebdavHandler::addSloxElement( this, doc, prop, "sloxid", sloxId );
}
} else {
@@ -378,20 +378,20 @@ void KCalResourceSlox::uploadIncidences()
kdDebug() << "UPLOAD: \n" << doc.toString( 2 ) << endl;
mUploadJob = KIO::davPropPatch( url, doc, false );
- connect( mUploadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotUploadResult( KIO::Job * ) ) );
- connect( mUploadJob, SIGNAL( percent( KIO::Job *, unsigned long ) ),
- SLOT( slotUploadProgress( KIO::Job *, unsigned long ) ) );
+ connect( mUploadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotUploadResult( KIO::Job * ) ) );
+ connect( mUploadJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ),
+ TQT_SLOT( slotUploadProgress( KIO::Job *, unsigned long ) ) );
mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Uploading incidence") );
connect( mUploadProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelUpload() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelUpload() ) );
}
-void KCalResourceSlox::createIncidenceAttributes( QDomDocument &doc,
- QDomElement &parent,
+void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc,
+ TQDomElement &parent,
Incidence *incidence )
{
WebdavHandler::addSloxElement( this, doc, parent, fieldName( IncidenceTitle ),
@@ -401,20 +401,20 @@ void KCalResourceSlox::createIncidenceAttributes( QDomDocument &doc,
incidence->description() );
if ( incidence->attendeeCount() > 0 ) {
- QDomElement members = WebdavHandler::addSloxElement( this, doc, parent,
+ TQDomElement members = WebdavHandler::addSloxElement( this, doc, parent,
fieldName( Participants ) );
Attendee::List attendees = incidence->attendees();
Attendee::List::ConstIterator it;
for( it = attendees.begin(); it != attendees.end(); ++it ) {
if ( mAccounts ) {
- QString userId = mAccounts->lookupId( (*it)->email() );
- QString status;
+ TQString userId = mAccounts->lookupId( (*it)->email() );
+ TQString status;
switch ( (*it)->status() ) {
case Attendee::Accepted: status = "accept"; break;
case Attendee::Declined: status = "decline"; break;
default: status = "none"; break;
}
- QDomElement el = WebdavHandler::addSloxElement( this, doc, members, fieldName( Participant ), userId );
+ TQDomElement el = WebdavHandler::addSloxElement( this, doc, members, fieldName( Participant ), userId );
el.setAttribute( "confirm", status );
} else {
kdError() << "KCalResourceSlox: No accounts set." << endl;
@@ -426,7 +426,7 @@ void KCalResourceSlox::createIncidenceAttributes( QDomDocument &doc,
// TODO OX support
if ( incidence->secrecy() == Incidence::SecrecyPublic && type() != "ox" )
{
- QDomElement rights = WebdavHandler::addSloxElement( this, doc, parent, "readrights" );
+ TQDomElement rights = WebdavHandler::addSloxElement( this, doc, parent, "readrights" );
WebdavHandler::addSloxElement( this, doc, rights, "group", "users" );
}
@@ -434,7 +434,7 @@ void KCalResourceSlox::createIncidenceAttributes( QDomDocument &doc,
KCal::Alarm::List alarms = incidence->alarms();
if ( !alarms.isEmpty() && alarms.first()->hasStartOffset() && alarms.first()->enabled() )
WebdavHandler::addSloxElement( this, doc, parent, fieldName( Reminder ),
- QString::number( (-1) * alarms.first()->startOffset().asSeconds() / 60 ) );
+ TQString::number( (-1) * alarms.first()->startOffset().asSeconds() / 60 ) );
else
WebdavHandler::addSloxElement( this, doc, parent, fieldName( Reminder ), "0" );
@@ -442,11 +442,11 @@ void KCalResourceSlox::createIncidenceAttributes( QDomDocument &doc,
WebdavHandler::addSloxElement( this, doc, parent, fieldName( Categories ), incidence->categories().join( ", " ) );
}
-void KCalResourceSlox::createEventAttributes( QDomDocument &doc,
- QDomElement &parent,
+void KCalResourceSlox::createEventAttributes( TQDomDocument &doc,
+ TQDomElement &parent,
Event *event )
{
- QString folderId = mPrefs->calendarFolderId();
+ TQString folderId = mPrefs->calendarFolderId();
if ( folderId.isEmpty() && type() == "ox" ) // SLOX and OX use diffrent default folders
folderId = "-1";
WebdavHandler::addSloxElement( this, doc, parent, fieldName( FolderId ), folderId );
@@ -466,11 +466,11 @@ void KCalResourceSlox::createEventAttributes( QDomDocument &doc,
}
}
-void KCalResourceSlox::createTodoAttributes( QDomDocument &doc,
- QDomElement &parent,
+void KCalResourceSlox::createTodoAttributes( TQDomDocument &doc,
+ TQDomElement &parent,
Todo *todo )
{
- QString folderId = mPrefs->taskFolderId();
+ TQString folderId = mPrefs->taskFolderId();
if ( folderId.isEmpty() && type() == "ox" ) // SLOX and OX use diffrent default folders
folderId = "-1";
WebdavHandler::addSloxElement( this, doc, parent, fieldName( FolderId ), folderId );
@@ -486,7 +486,7 @@ void KCalResourceSlox::createTodoAttributes( QDomDocument &doc,
}
int priority = todo->priority();
- QString txt;
+ TQString txt;
switch ( priority ) {
case 9:
case 8:
@@ -503,11 +503,11 @@ void KCalResourceSlox::createTodoAttributes( QDomDocument &doc,
WebdavHandler::addSloxElement( this, doc, parent, fieldName( Priority ), txt );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( PercentComplete ),
- QString::number( todo->percentComplete() ) );
+ TQString::number( todo->percentComplete() ) );
}
-void KCalResourceSlox::createRecurrenceAttributes( QDomDocument &doc,
- QDomElement &parent,
+void KCalResourceSlox::createRecurrenceAttributes( TQDomDocument &doc,
+ TQDomElement &parent,
KCal::Incidence *incidence )
{
if ( !incidence->doesRecur() ) {
@@ -521,12 +521,12 @@ void KCalResourceSlox::createRecurrenceAttributes( QDomDocument &doc,
case Recurrence::rDaily:
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "daily" );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceDailyFreq ),
- QString::number( r->frequency() ) );
+ TQString::number( r->frequency() ) );
break;
case Recurrence::rWeekly: {
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "weekly" );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceWeeklyFreq ),
- QString::number( r->frequency() ) );
+ TQString::number( r->frequency() ) );
// TODO: SLOX support
int oxDays = 0;
for ( int i = 0; i < 7; ++i ) {
@@ -534,33 +534,33 @@ void KCalResourceSlox::createRecurrenceAttributes( QDomDocument &doc,
oxDays += 1 << ( ( i + 1 ) % 7 );
}
if ( type() == "ox" )
- WebdavHandler::addSloxElement( this, doc, parent, "days", QString::number( oxDays ) );
+ WebdavHandler::addSloxElement( this, doc, parent, "days", TQString::number( oxDays ) );
break; }
case Recurrence::rMonthlyDay:
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "monthly" );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthlyFreq ),
- QString::number( r->frequency() ) );
+ TQString::number( r->frequency() ) );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthlyDay ),
- QString::number( r->monthDays().first() ) );
+ TQString::number( r->monthDays().first() ) );
break;
case Recurrence::rMonthlyPos: {
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ),
type() == "ox" ? "monthly" : "monthly2" );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Freq ),
- QString::number( r->frequency() ) );
+ TQString::number( r->frequency() ) );
RecurrenceRule::WDayPos wdp = r->monthPositions().first();
// TODO: SLOX support
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Day ),
- QString::number( 1 << wdp.day() ) );
+ TQString::number( 1 << wdp.day() ) );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceMonthly2Pos ),
- QString::number( wdp.pos() ) );
+ TQString::number( wdp.pos() ) );
break; }
case Recurrence::rYearlyMonth:
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceType ), "yearly" );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearlyDay ),
- QString::number( r->yearDates().first() ) );
+ TQString::number( r->yearDates().first() ) );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearlyMonth ),
- QString::number( r->yearMonths().first() + monthOffset ) );
+ TQString::number( r->yearMonths().first() + monthOffset ) );
if ( type() == "ox" )
WebdavHandler::addSloxElement( this, doc, parent, "interval", "1" );
break;
@@ -570,11 +570,11 @@ void KCalResourceSlox::createRecurrenceAttributes( QDomDocument &doc,
RecurrenceRule::WDayPos wdp = r->monthPositions().first();
// TODO: SLOX support
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Day ),
- QString::number( 1 << wdp.day() ) );
+ TQString::number( 1 << wdp.day() ) );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Pos ),
- QString::number( wdp.pos() ) );
+ TQString::number( wdp.pos() ) );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceYearly2Month ),
- QString::number( r->yearMonths().first() + monthOffset ) );
+ TQString::number( r->yearMonths().first() + monthOffset ) );
if ( type() == "ox" )
WebdavHandler::addSloxElement( this, doc, parent, "interval", "1" );
break; }
@@ -585,27 +585,27 @@ void KCalResourceSlox::createRecurrenceAttributes( QDomDocument &doc,
WebdavHandler::qDateTimeToSlox( r->endDateTime() ) );
// delete exceptions
DateList exlist = r->exDates();
- QStringList res;
+ TQStringList res;
for ( DateList::Iterator it = exlist.begin(); it != exlist.end(); ++it )
res.append( WebdavHandler::qDateTimeToSlox( *it ) );
WebdavHandler::addSloxElement( this, doc, parent, fieldName( RecurrenceDelEx ), res.join( "," ) );
}
-void KCalResourceSlox::parseMembersAttribute( const QDomElement &e,
+void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e,
Incidence *incidence )
{
incidence->clearAttendees();
- QDomNode n;
+ TQDomNode n;
for( n = e.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomElement memberElement = n.toElement();
+ TQDomElement memberElement = n.toElement();
if ( memberElement.tagName() == fieldName( Participant ) ) {
- QString member = memberElement.text();
+ TQString member = memberElement.text();
KABC::Addressee account;
if ( mAccounts ) account = mAccounts->lookupUser( member );
else kdError() << "KCalResourceSlox: no accounts set" << endl;
- QString name;
- QString email;
+ TQString name;
+ TQString email;
Attendee *a = incidence->attendeeByUid( member );
if ( account.isEmpty() ) {
if ( a ) continue;
@@ -624,7 +624,7 @@ void KCalResourceSlox::parseMembersAttribute( const QDomElement &e,
a->setUid( member );
incidence->addAttendee( a );
}
- QString status = memberElement.attribute( "confirm" );
+ TQString status = memberElement.attribute( "confirm" );
if ( !status.isEmpty() ) {
if ( status == "accept" ) {
a->setStatus( Attendee::Accepted );
@@ -641,25 +641,25 @@ void KCalResourceSlox::parseMembersAttribute( const QDomElement &e,
}
}
-void KCalResourceSlox::parseReadRightsAttribute( const QDomElement &e,
+void KCalResourceSlox::parseReadRightsAttribute( const TQDomElement &e,
Incidence *incidence )
{
- QDomNode n;
+ TQDomNode n;
for( n = e.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomElement rightElement = n.toElement();
+ TQDomElement rightElement = n.toElement();
if ( rightElement.tagName() == "group" ) {
- QString groupName = rightElement.text();
+ TQString groupName = rightElement.text();
if ( groupName == "users" )
incidence->setSecrecy( Incidence::SecrecyPublic );
}
}
}
-void KCalResourceSlox::parseIncidenceAttribute( const QDomElement &e,
+void KCalResourceSlox::parseIncidenceAttribute( const TQDomElement &e,
Incidence *incidence )
{
- QString tag = e.tagName();
- QString text = decodeText( e.text() );
+ TQString tag = e.tagName();
+ TQString text = decodeText( e.text() );
if ( text.isEmpty() ) return;
if ( tag == fieldName( IncidenceTitle ) ) {
@@ -693,19 +693,19 @@ void KCalResourceSlox::parseIncidenceAttribute( const QDomElement &e,
} else if ( tag == "readrights" ) {
parseReadRightsAttribute( e, incidence );
} else if ( tag == fieldName( Categories ) ) {
- incidence->setCategories( QStringList::split( QRegExp(",\\s*"), text ) );
+ incidence->setCategories( TQStringList::split( TQRegExp(",\\s*"), text ) );
}
}
-void KCalResourceSlox::parseEventAttribute( const QDomElement &e,
+void KCalResourceSlox::parseEventAttribute( const TQDomElement &e,
Event *event )
{
- QString tag = e.tagName();
- QString text = decodeText( e.text() );
+ TQString tag = e.tagName();
+ TQString text = decodeText( e.text() );
if ( text.isEmpty() ) return;
if ( tag == fieldName( EventBegin ) ) {
- QDateTime dt;
+ TQDateTime dt;
if ( event->doesFloat() ) {
if ( type() == "ox" )
dt = WebdavHandler::sloxToQDateTime( text, timeZoneId() );
@@ -715,7 +715,7 @@ void KCalResourceSlox::parseEventAttribute( const QDomElement &e,
dt = WebdavHandler::sloxToQDateTime( text, timeZoneId() );
event->setDtStart( dt );
} else if ( tag == fieldName( EventEnd ) ) {
- QDateTime dt;
+ TQDateTime dt;
if ( event->doesFloat() ) {
dt = WebdavHandler::sloxToQDateTime( text );
dt = dt.addSecs( -1 );
@@ -727,15 +727,15 @@ void KCalResourceSlox::parseEventAttribute( const QDomElement &e,
}
}
-void KCalResourceSlox::parseRecurrence( const QDomNode &node, Event *event )
+void KCalResourceSlox::parseRecurrence( const TQDomNode &node, Event *event )
{
- QString type;
+ TQString type;
int dailyValue = -1;
- QDateTime end;
+ TQDateTime end;
int weeklyValue = -1;
- QBitArray days( 7 ); // days, starting with monday
+ TQBitArray days( 7 ); // days, starting with monday
bool daysSet = false;
int monthlyValueDay = -1;
@@ -754,12 +754,12 @@ void KCalResourceSlox::parseRecurrence( const QDomNode &node, Event *event )
DateList deleteExceptions;
- QDomNode n;
+ TQDomNode n;
for( n = node.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomElement e = n.toElement();
- QString tag = e.tagName();
- QString text = decodeText( e.text() );
+ TQDomElement e = n.toElement();
+ TQString tag = e.tagName();
+ TQString text = decodeText( e.text() );
kdDebug() << k_funcinfo << tag << ": " << text << endl;
if ( tag == fieldName( RecurrenceType ) ) {
@@ -818,8 +818,8 @@ void KCalResourceSlox::parseRecurrence( const QDomNode &node, Event *event )
yearlyMonth = text.toInt() + 1; // starts at 0
yearly2Month = text.toInt() + 1;
} else if ( tag == fieldName( RecurrenceDelEx ) ) {
- QStringList exdates = QStringList::split( ",", text );
- QStringList::Iterator it;
+ TQStringList exdates = TQStringList::split( ",", text );
+ TQStringList::Iterator it;
for ( it = exdates.begin(); it != exdates.end(); ++it )
deleteExceptions.append( WebdavHandler::sloxToQDateTime( *it ).date() );
}
@@ -845,7 +845,7 @@ void KCalResourceSlox::parseRecurrence( const QDomNode &node, Event *event )
r->addYearlyMonth( yearlyMonth );
} else if ( type == "monthly2" ) {
r->setMonthly( monthly2ValueMonth );
- QBitArray _days( 7 );
+ TQBitArray _days( 7 );
if ( daysSet )
_days = days;
else
@@ -854,7 +854,7 @@ void KCalResourceSlox::parseRecurrence( const QDomNode &node, Event *event )
} else if ( type == "yearly2" ) {
r->setYearly( 1 );
r->addYearlyMonth( yearly2Month );
- QBitArray _days( 7 );
+ TQBitArray _days( 7 );
if ( daysSet )
_days = days;
else
@@ -865,21 +865,21 @@ void KCalResourceSlox::parseRecurrence( const QDomNode &node, Event *event )
r->setExDates( deleteExceptions );
}
-void KCalResourceSlox::parseTodoAttribute( const QDomElement &e,
+void KCalResourceSlox::parseTodoAttribute( const TQDomElement &e,
Todo *todo )
{
- QString tag = e.tagName();
- QString text = decodeText( e.text() );
+ TQString tag = e.tagName();
+ TQString text = decodeText( e.text() );
if ( text.isEmpty() ) return;
if ( tag == fieldName( TaskBegin ) ) {
- QDateTime dt = WebdavHandler::sloxToQDateTime( text );
+ TQDateTime dt = WebdavHandler::sloxToQDateTime( text );
if ( dt.isValid() ) {
todo->setDtStart( dt );
todo->setHasStartDate( true );
}
} else if ( tag == fieldName( TaskEnd ) ) {
- QDateTime dt = WebdavHandler::sloxToQDateTime( text );
+ TQDateTime dt = WebdavHandler::sloxToQDateTime( text );
if ( dt.isValid() ) {
todo->setDtDue( dt );
todo->setHasDueDate( true );
@@ -919,20 +919,20 @@ void KCalResourceSlox::slotLoadTodosResult( KIO::Job *job )
} else {
kdDebug() << "KCalResourceSlox::slotLoadTodosJobResult() success" << endl;
- QDomDocument doc = mLoadTodosJob->response();
+ TQDomDocument doc = mLoadTodosJob->response();
mWebdavHandler.log( doc.toString( 2 ) );
- QValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+ TQValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
bool changed = false;
disableChangeNotification();
- QValueList<SloxItem>::ConstIterator it;
+ TQValueList<SloxItem>::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
SloxItem item = *it;
- QString uid = sloxIdToTodoUid( item.sloxId );
+ TQString uid = sloxIdToTodoUid( item.sloxId );
if ( item.status == SloxItem::Delete ) {
Todo *todo = mCalendar.todo( uid );
if ( todo ) {
@@ -953,9 +953,9 @@ void KCalResourceSlox::slotLoadTodosResult( KIO::Job *job )
mWebdavHandler.clearSloxAttributeStatus();
- QDomNode n;
+ TQDomNode n;
for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
mWebdavHandler.parseSloxAttribute( e );
parseIncidenceAttribute( e, todo );
parseTodoAttribute( e, todo );
@@ -993,20 +993,20 @@ void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job )
} else {
kdDebug() << "KCalResourceSlox::slotLoadEventsResult() success" << endl;
- QDomDocument doc = mLoadEventsJob->response();
+ TQDomDocument doc = mLoadEventsJob->response();
mWebdavHandler.log( doc.toString( 2 ) );
- QValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
+ TQValueList<SloxItem> items = WebdavHandler::getSloxItems( this, doc );
bool changed = false;
disableChangeNotification();
- QValueList<SloxItem>::ConstIterator it;
+ TQValueList<SloxItem>::ConstIterator it;
for( it = items.begin(); it != items.end(); ++it ) {
SloxItem item = *it;
- QString uid = sloxIdToEventUid( item.sloxId );
+ TQString uid = sloxIdToEventUid( item.sloxId );
if ( item.status == SloxItem::Delete ) {
Event *event = mCalendar.event( uid );
if ( event ) {
@@ -1025,7 +1025,7 @@ void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job )
event->setCustomProperty( "SLOX", "ID", item.sloxId );
- QDomNode n = item.domNode.namedItem( fieldName( FullTime ) );
+ TQDomNode n = item.domNode.namedItem( fieldName( FullTime ) );
event->setFloats( n.toElement().text() == boolToStr( true ) );
bool doesRecur = false;
@@ -1033,7 +1033,7 @@ void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job )
mWebdavHandler.clearSloxAttributeStatus();
for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
mWebdavHandler.parseSloxAttribute( e );
parseIncidenceAttribute( e, event );
parseEventAttribute( e, event );
@@ -1089,69 +1089,69 @@ void KCalResourceSlox::slotUploadResult( KIO::Job *job )
return;
}
- QDomDocument doc = mUploadJob->response();
+ TQDomDocument doc = mUploadJob->response();
kdDebug() << "UPLOAD RESULT:" << endl;
kdDebug() << doc.toString( 2 ) << endl;
- QDomElement docElement = doc.documentElement();
+ TQDomElement docElement = doc.documentElement();
- QDomNode responseNode;
+ TQDomNode responseNode;
for( responseNode = docElement.firstChild(); !responseNode.isNull();
responseNode = responseNode.nextSibling() ) {
- QDomElement responseElement = responseNode.toElement();
+ TQDomElement responseElement = responseNode.toElement();
if ( responseElement.tagName() == "response" ) {
- QDomNode propstat = responseElement.namedItem( "propstat" );
+ TQDomNode propstat = responseElement.namedItem( "propstat" );
if ( propstat.isNull() ) {
kdError() << "Unable to find propstat tag." << endl;
continue;
}
- QDomNode status = propstat.namedItem( "status" );
+ TQDomNode status = propstat.namedItem( "status" );
if ( !status.isNull() ) {
- QDomElement statusElement = status.toElement();
- QString response = statusElement.text();
+ TQDomElement statusElement = status.toElement();
+ TQString response = statusElement.text();
if ( !response.contains( "200" ) ) {
- QString error = "'" + mUploadedIncidence->summary() + "'\n";
+ TQString error = "'" + mUploadedIncidence->summary() + "'\n";
error += response;
- QDomNode dn = propstat.namedItem( "responsedescription" );
- QString d = dn.toElement().text();
+ TQDomNode dn = propstat.namedItem( "responsedescription" );
+ TQString d = dn.toElement().text();
if ( !d.isEmpty() ) error += "\n" + d;
saveError( error );
continue;
}
}
- QDomNode prop = propstat.namedItem( "prop" );
+ TQDomNode prop = propstat.namedItem( "prop" );
if ( prop.isNull() ) {
kdError() << "Unable to find WebDAV property" << endl;
continue;
}
- QDomNode sloxIdNode = prop.namedItem( fieldName( ObjectId ) );
+ TQDomNode sloxIdNode = prop.namedItem( fieldName( ObjectId ) );
if ( sloxIdNode.isNull() ) {
kdError() << "Unable to find SLOX id." << endl;
continue;
}
- QDomElement sloxIdElement = sloxIdNode.toElement();
- QString sloxId = sloxIdElement.text();
+ TQDomElement sloxIdElement = sloxIdNode.toElement();
+ TQString sloxId = sloxIdElement.text();
kdDebug() << "SLOXID: " << sloxId << endl;
if ( mUploadIsDelete ) {
kdDebug() << "Incidence deleted" << endl;
} else {
- QDomNode clientIdNode = prop.namedItem( fieldName( ClientId ) );
+ TQDomNode clientIdNode = prop.namedItem( fieldName( ClientId ) );
if ( clientIdNode.isNull() ) {
kdError() << "Unable to find client id." << endl;
continue;
}
- QDomElement clientidElement = clientIdNode.toElement();
- QString clientId = clientidElement.text();
+ TQDomElement clientidElement = clientIdNode.toElement();
+ TQString clientId = clientidElement.text();
kdDebug() << "CLIENTID: " << clientId << endl;
Incidence *i = mUploadedIncidence->clone();
- QString uid;
+ TQString uid;
if ( i->type() == "Event" ) uid = sloxIdToEventUid( sloxId );
else if ( i->type() == "Todo" ) uid = sloxIdToTodoUid( sloxId );
else {
@@ -1228,7 +1228,7 @@ bool KCalResourceSlox::confirmSave()
dlg.addIncidences( deletedIncidences(), i18n("Deleted") );
int result = dlg.exec();
- return result == QDialog::Accepted;
+ return result == TQDialog::Accepted;
}
bool KCalResourceSlox::doSave()
@@ -1313,12 +1313,12 @@ void KCalResourceSlox::cancelUpload()
if ( mUploadProgress ) mUploadProgress->setComplete();
}
-QString KCalResourceSlox::sloxIdToEventUid( const QString &sloxId )
+TQString KCalResourceSlox::sloxIdToEventUid( const TQString &sloxId )
{
return "KResources_SLOX_Event_" + sloxId;
}
-QString KCalResourceSlox::sloxIdToTodoUid( const QString &sloxId )
+TQString KCalResourceSlox::sloxIdToTodoUid( const TQString &sloxId )
{
return "KResources_SLOX_Todo_" + sloxId;
}
diff --git a/kresources/slox/kcalresourceslox.h b/kresources/slox/kcalresourceslox.h
index 2d0022cc7..0f9b289dd 100644
--- a/kresources/slox/kcalresourceslox.h
+++ b/kresources/slox/kcalresourceslox.h
@@ -23,10 +23,10 @@
#include "sloxbase.h"
#include "webdavhandler.h"
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qdom.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
+#include <tqdom.h>
#include <kurl.h>
#include <kconfig.h>
@@ -113,33 +113,33 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
void uploadIncidences();
- void parseMembersAttribute( const QDomElement &e,
+ void parseMembersAttribute( const TQDomElement &e,
KCal::Incidence *incidence );
- void parseReadRightsAttribute( const QDomElement &e,
+ void parseReadRightsAttribute( const TQDomElement &e,
KCal::Incidence *incidence );
- void parseIncidenceAttribute( const QDomElement &e,
+ void parseIncidenceAttribute( const TQDomElement &e,
KCal::Incidence *incidence );
- void parseTodoAttribute( const QDomElement &e, KCal::Todo *todo );
- void parseEventAttribute( const QDomElement &e, KCal::Event *event );
- void parseRecurrence( const QDomNode &n, KCal::Event *event );
+ void parseTodoAttribute( const TQDomElement &e, KCal::Todo *todo );
+ void parseEventAttribute( const TQDomElement &e, KCal::Event *event );
+ void parseRecurrence( const TQDomNode &n, KCal::Event *event );
- void createIncidenceAttributes( QDomDocument &doc,
- QDomElement &parent,
+ void createIncidenceAttributes( TQDomDocument &doc,
+ TQDomElement &parent,
KCal::Incidence *incidence );
- void createEventAttributes( QDomDocument &doc,
- QDomElement &parent,
+ void createEventAttributes( TQDomDocument &doc,
+ TQDomElement &parent,
KCal::Event *event );
- void createTodoAttributes( QDomDocument &doc,
- QDomElement &parent,
+ void createTodoAttributes( TQDomDocument &doc,
+ TQDomElement &parent,
KCal::Todo *todo );
- void createRecurrenceAttributes( QDomDocument &doc,
- QDomElement &parent,
+ void createRecurrenceAttributes( TQDomDocument &doc,
+ TQDomElement &parent,
KCal::Incidence *incidence );
bool confirmSave();
- QString sloxIdToEventUid( const QString &sloxId );
- QString sloxIdToTodoUid( const QString &sloxId );
+ TQString sloxIdToEventUid( const TQString &sloxId );
+ TQString sloxIdToTodoUid( const TQString &sloxId );
private:
void init();
diff --git a/kresources/slox/kcalresourcesloxconfig.cpp b/kresources/slox/kcalresourcesloxconfig.cpp
index 403a5e518..441ea5336 100644
--- a/kresources/slox/kcalresourcesloxconfig.cpp
+++ b/kresources/slox/kcalresourcesloxconfig.cpp
@@ -20,9 +20,9 @@
#include <typeinfo>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
#include <klocale.h>
#include <kdebug.h>
@@ -40,43 +40,43 @@
#include "kcalresourcesloxconfig.h"
-KCalResourceSloxConfig::KCalResourceSloxConfig( QWidget* parent, const char* name ) :
+KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent, const char* name ) :
KRES::ConfigWidget( parent, name ), mRes( 0 )
{
resize( 245, 115 );
- QGridLayout *mainLayout = new QGridLayout( this, 6, 2, KDialog::spacingHint(), KDialog::spacingHint() );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 6, 2, KDialog::spacingHint(), KDialog::spacingHint() );
- QLabel *label = new QLabel( i18n( "Download from:" ), this );
+ TQLabel *label = new TQLabel( i18n( "Download from:" ), this );
mDownloadUrl = new KURLRequester( this );
mDownloadUrl->setMode( KFile::File );
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mDownloadUrl, 1, 1 );
- label = new QLabel( i18n("User:"), this );
+ label = new TQLabel( i18n("User:"), this );
mainLayout->addWidget( label, 2, 0 );
mUserEdit = new KLineEdit( this );
mainLayout->addWidget( mUserEdit, 2, 1 );
- label = new QLabel( i18n("Password:"), this );
+ label = new TQLabel( i18n("Password:"), this );
mainLayout->addWidget( label, 3, 0 );
mPasswordEdit = new KLineEdit( this );
mainLayout->addWidget( mPasswordEdit, 3, 1 );
mPasswordEdit->setEchoMode( KLineEdit::Password );
- mLastSyncCheck = new QCheckBox( i18n("Only load data since last sync"),
+ mLastSyncCheck = new TQCheckBox( i18n("Only load data since last sync"),
this );
mainLayout->addMultiCellWidget( mLastSyncCheck, 4, 4, 0, 1 );
mCalButton = new KPushButton( i18n("Calendar Folder..."), this );
mainLayout->addWidget( mCalButton, 5, 0 );
- connect( mCalButton, SIGNAL( clicked() ), SLOT( selectCalendarFolder() ) );
+ connect( mCalButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCalendarFolder() ) );
mTaskButton = new KPushButton( i18n("Task Folder..."), this );
mainLayout->addWidget( mTaskButton, 5, 1 );
- connect( mTaskButton, SIGNAL( clicked() ), SLOT( selectTaskFolder() ) );
+ connect( mTaskButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectTaskFolder() ) );
mReloadConfig = new KCal::ResourceCachedReloadConfig( this );
mainLayout->addMultiCellWidget( mReloadConfig, 6, 6, 0, 1 );
@@ -129,7 +129,7 @@ void KCalResourceSloxConfig::selectCalendarFolder()
SloxFolderManager *manager = new SloxFolderManager( mRes, mDownloadUrl->url() );
SloxFolderDialog *dialog = new SloxFolderDialog( manager, ::Calendar, this );
dialog->setSelectedFolder( mCalendarFolderId );
- if ( dialog->exec() == QDialog::Accepted )
+ if ( dialog->exec() == TQDialog::Accepted )
mCalendarFolderId = dialog->selectedFolder();
}
@@ -138,7 +138,7 @@ void KCalResourceSloxConfig::selectTaskFolder( )
SloxFolderManager *manager = new SloxFolderManager( mRes, mDownloadUrl->url() );
SloxFolderDialog *dialog = new SloxFolderDialog( manager, Tasks, this );
dialog->setSelectedFolder( mTaskFolderId );
- if ( dialog->exec() == QDialog::Accepted )
+ if ( dialog->exec() == TQDialog::Accepted )
mTaskFolderId = dialog->selectedFolder();
}
diff --git a/kresources/slox/kcalresourcesloxconfig.h b/kresources/slox/kcalresourcesloxconfig.h
index a656478d2..370948c08 100644
--- a/kresources/slox/kcalresourcesloxconfig.h
+++ b/kresources/slox/kcalresourcesloxconfig.h
@@ -46,7 +46,7 @@ class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget
{
Q_OBJECT
public:
- KCalResourceSloxConfig( QWidget *parent = 0, const char *name = 0 );
+ KCalResourceSloxConfig( TQWidget *parent = 0, const char *name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource );
@@ -60,11 +60,11 @@ class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget
KURLRequester *mDownloadUrl;
KLineEdit *mUserEdit;
KLineEdit *mPasswordEdit;
- QCheckBox *mLastSyncCheck;
+ TQCheckBox *mLastSyncCheck;
KPushButton *mCalButton;
KPushButton *mTaskButton;
- QString mCalendarFolderId;
- QString mTaskFolderId;
+ TQString mCalendarFolderId;
+ TQString mTaskFolderId;
KCal::ResourceCachedReloadConfig *mReloadConfig;
KCal::ResourceCachedSaveConfig *mSaveConfig;
diff --git a/kresources/slox/sloxaccounts.cpp b/kresources/slox/sloxaccounts.cpp
index 35203b06f..a32df5fa2 100644
--- a/kresources/slox/sloxaccounts.cpp
+++ b/kresources/slox/sloxaccounts.cpp
@@ -33,9 +33,9 @@
#include <kstringhandler.h>
#include <kconfig.h>
-#include <qfile.h>
-#include <qdom.h>
-#include <qstring.h>
+#include <tqfile.h>
+#include <tqdom.h>
+#include <tqstring.h>
SloxAccounts::SloxAccounts( SloxBase *res, const KURL &baseUrl )
: mBaseUrl( baseUrl ), mRes( res )
@@ -44,9 +44,9 @@ SloxAccounts::SloxAccounts( SloxBase *res, const KURL &baseUrl )
mDownloadJob = 0;
- QString server = mBaseUrl.host();
+ TQString server = mBaseUrl.host();
- QStringList l = QStringList::split( '.', server );
+ TQStringList l = TQStringList::split( '.', server );
if ( l.count() < 2 ) mDomain = server;
else mDomain = l[ l.count() - 2 ] + "." + l[ l.count() - 1 ];
@@ -61,23 +61,23 @@ SloxAccounts::~SloxAccounts()
if ( mDownloadJob ) mDownloadJob->kill();
}
-void SloxAccounts::insertUser( const QString &id, const KABC::Addressee &a )
+void SloxAccounts::insertUser( const TQString &id, const KABC::Addressee &a )
{
kdDebug() << "SloxAccount::insertUser() " << id << endl;
mUsers.replace( id, a );
- QString email = a.preferredEmail();
+ TQString email = a.preferredEmail();
- QString url = "http://" + mBaseUrl.host() + "/servlet/webdav.freebusy?username=";
+ TQString url = "http://" + mBaseUrl.host() + "/servlet/webdav.freebusy?username=";
url += id + "&server=" + mDomain;
KCal::FreeBusyUrlStore::self()->writeUrl( email, url );
}
-KABC::Addressee SloxAccounts::lookupUser( const QString &id )
+KABC::Addressee SloxAccounts::lookupUser( const TQString &id )
{
- QMap<QString, KABC::Addressee>::ConstIterator it;
+ TQMap<TQString, KABC::Addressee>::ConstIterator it;
it = mUsers.find( id );
if ( it == mUsers.end() ) {
requestAccounts();
@@ -87,11 +87,11 @@ KABC::Addressee SloxAccounts::lookupUser( const QString &id )
}
}
-QString SloxAccounts::lookupId( const QString &email )
+TQString SloxAccounts::lookupId( const TQString &email )
{
kdDebug() << "SloxAccounts::lookupId() " << email << endl;
- QMap<QString, KABC::Addressee>::ConstIterator it;
+ TQMap<TQString, KABC::Addressee>::ConstIterator it;
for( it = mUsers.begin(); it != mUsers.end(); ++it ) {
kdDebug() << "PREF: " << (*it).preferredEmail() << endl;
kdDebug() << "KEY: " << it.key() << endl;
@@ -126,9 +126,9 @@ void SloxAccounts::requestAccounts()
KURL url = mBaseUrl;
url.setPath( "/servlet/webdav.groupuser/" );
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
- QDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+ TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
WebdavHandler::addSloxElement( mRes, doc, prop, "user", "*" );
WebdavHandler::addSloxElement( mRes, doc, prop, "group", "*" );
WebdavHandler::addSloxElement( mRes, doc, prop, "resource", "*" );
@@ -139,8 +139,8 @@ void SloxAccounts::requestAccounts()
mDownloadJob = KIO::davPropFind( url, doc, "0", false );
}
- connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotResult( KIO::Job * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotResult( KIO::Job * ) ) );
}
void SloxAccounts::slotResult( KIO::Job *job )
@@ -151,12 +151,12 @@ void SloxAccounts::slotResult( KIO::Job *job )
job->showErrorDialog( 0 );
} else {
if ( mRes->resType() == "ox" ) {
- QFile f( cacheFile() );
+ TQFile f( cacheFile() );
if ( !f.open( IO_WriteOnly ) ) {
kdWarning() << "Unable to open '" << cacheFile() << "'" << endl;
return;
}
- QTextStream stream ( &f );
+ TQTextStream stream ( &f );
stream << static_cast<KIO::DavJob*>( mDownloadJob )->response();
f.close();
}
@@ -166,11 +166,11 @@ void SloxAccounts::slotResult( KIO::Job *job )
mDownloadJob = 0;
}
-QString SloxAccounts::cacheFile() const
+TQString SloxAccounts::cacheFile() const
{
- QString host = mBaseUrl.host();
+ TQString host = mBaseUrl.host();
- QString file = locateLocal( "cache", "slox/accounts_" + host );
+ TQString file = locateLocal( "cache", "slox/accounts_" + host );
kdDebug() << "SloxAccounts::cacheFile(): " << file << endl;
@@ -181,34 +181,34 @@ void SloxAccounts::readAccounts()
{
kdDebug() << "SloxAccounts::readAccounts()" << endl;
- QFile f( cacheFile() );
+ TQFile f( cacheFile() );
if ( !f.open( IO_ReadOnly ) ) {
kdDebug() << "Unable to open '" << cacheFile() << "'" << endl;
requestAccounts();
return;
}
- QDomDocument doc;
+ TQDomDocument doc;
doc.setContent( &f );
// kdDebug() << "SLOX ACCOUNTS: " << doc.toString( 2 ) << endl;
- QDomElement docElement = doc.documentElement();
+ TQDomElement docElement = doc.documentElement();
mUsers.clear();
- QDomNodeList nodes = doc.elementsByTagName( mRes->resType() == "ox" ? "ox:user" : "user" );
+ TQDomNodeList nodes = doc.elementsByTagName( mRes->resType() == "ox" ? "ox:user" : "user" );
for( uint i = 0; i < nodes.count(); ++i ) {
- QDomElement element = nodes.item(i).toElement();
- QString id;
+ TQDomElement element = nodes.item(i).toElement();
+ TQString id;
KABC::Addressee a;
- QDomNode n;
+ TQDomNode n;
for( n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomElement e = n.toElement();
- QString tag = e.tagName();
+ TQDomElement e = n.toElement();
+ TQString tag = e.tagName();
// remove XML namespace
tag = tag.right( tag.length() - ( tag.find( ':' ) + 1 ) );
- QString value = e.text();
+ TQString value = e.text();
if ( tag == "uid" ) id = value;
else if ( tag == "mail" ) a.insertEmail( value, true );
else if ( tag == "forename" ) a.setGivenName( value );
diff --git a/kresources/slox/sloxaccounts.h b/kresources/slox/sloxaccounts.h
index ea3e664e2..bda5c4492 100644
--- a/kresources/slox/sloxaccounts.h
+++ b/kresources/slox/sloxaccounts.h
@@ -22,7 +22,7 @@
#include <kabc/addressee.h>
#include <kdepimmacros.h>
-#include <qobject.h>
+#include <tqobject.h>
namespace KIO {
class Job;
@@ -37,27 +37,27 @@ class KDE_EXPORT SloxAccounts : public QObject
SloxAccounts( SloxBase *res, const KURL &baseUrl );
~SloxAccounts();
- void insertUser( const QString &id, const KABC::Addressee &a );
+ void insertUser( const TQString &id, const KABC::Addressee &a );
- KABC::Addressee lookupUser( const QString &id );
+ KABC::Addressee lookupUser( const TQString &id );
- QString lookupId( const QString &email );
+ TQString lookupId( const TQString &email );
protected:
void requestAccounts();
void readAccounts();
- QString cacheFile() const;
+ TQString cacheFile() const;
protected slots:
void slotResult( KIO::Job * );
private:
- QString mDomain;
+ TQString mDomain;
KIO::Job *mDownloadJob;
- QMap<QString, KABC::Addressee> mUsers; // map users ids to addressees.
+ TQMap<TQString, KABC::Addressee> mUsers; // map users ids to addressees.
KURL mBaseUrl;
SloxBase *mRes;
diff --git a/kresources/slox/sloxbase.cpp b/kresources/slox/sloxbase.cpp
index c58990593..3871a2c7a 100644
--- a/kresources/slox/sloxbase.cpp
+++ b/kresources/slox/sloxbase.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <kresources/resource.h>
-static QString mFieldNameMap[][2] =
+static TQString mFieldNameMap[][2] =
{
// SLOX, OX
{"sloxid", "object_id"}, // system fields
@@ -106,14 +106,14 @@ SloxBase::SloxBase( KRES::Resource * res ) :
{
}
-QString SloxBase::decodeText( const QString & text )
+TQString SloxBase::decodeText( const TQString & text )
{
if ( mRes->type() == "ox" )
return text;
- return QString::fromUtf8( text.latin1() );
+ return TQString::fromUtf8( text.latin1() );
}
-QString SloxBase::fieldName( Field f )
+TQString SloxBase::fieldName( Field f )
{
int t = 0;
if ( mRes->type() == "ox" )
@@ -121,12 +121,12 @@ QString SloxBase::fieldName( Field f )
return mFieldNameMap[f][t];
}
-QString SloxBase::resType( ) const
+TQString SloxBase::resType( ) const
{
return mRes->type();
}
-QString SloxBase::boolToStr( bool b )
+TQString SloxBase::boolToStr( bool b )
{
if ( mRes->type() == "ox" ) {
if ( b )
diff --git a/kresources/slox/sloxbase.h b/kresources/slox/sloxbase.h
index 90afb16fa..7047ed28d 100644
--- a/kresources/slox/sloxbase.h
+++ b/kresources/slox/sloxbase.h
@@ -20,7 +20,7 @@
#ifndef SLOXUTILS_H
#define SLOXUTILS_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kdepimmacros.h>
namespace KRES {
@@ -103,10 +103,10 @@ class KDE_EXPORT SloxBase {
SloxBase( KRES::Resource *res );
- QString decodeText( const QString &text );
- QString fieldName( Field f );
- QString resType() const;
- QString boolToStr( bool b );
+ TQString decodeText( const TQString &text );
+ TQString fieldName( Field f );
+ TQString resType() const;
+ TQString boolToStr( bool b );
private:
KRES::Resource *mRes;
diff --git a/kresources/slox/sloxfolder.cpp b/kresources/slox/sloxfolder.cpp
index 157463149..fbfb9f051 100644
--- a/kresources/slox/sloxfolder.cpp
+++ b/kresources/slox/sloxfolder.cpp
@@ -21,7 +21,7 @@
#include "sloxfolder.h"
-SloxFolder::SloxFolder( const QString &id, const QString &parentId, const QString &type, const QString &name, bool def ) :
+SloxFolder::SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def ) :
item( 0 ),
mId( id ),
mParentId( parentId ),
@@ -38,7 +38,7 @@ SloxFolder::SloxFolder( const QString &id, const QString &parentId, const QStrin
mType = Unbound;
}
-QString SloxFolder::name( ) const
+TQString SloxFolder::name( ) const
{
// special cases for system folders
if ( mName == "system_global" )
diff --git a/kresources/slox/sloxfolder.h b/kresources/slox/sloxfolder.h
index bda529ba4..e27399a66 100644
--- a/kresources/slox/sloxfolder.h
+++ b/kresources/slox/sloxfolder.h
@@ -20,7 +20,7 @@
#ifndef SLOXFOLDER_H
#define SLOXFOLDER_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kdepimmacros.h>
class KListViewItem;
@@ -35,20 +35,20 @@ enum FolderType {
class KDE_EXPORT SloxFolder
{
public:
- SloxFolder( const QString &id, const QString &parentId, const QString &type, const QString &name, bool def = false );
+ SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def = false );
- QString id() const { return mId; }
- QString parentId() const { return mParentId; }
+ TQString id() const { return mId; }
+ TQString parentId() const { return mParentId; }
FolderType type() const { return mType; }
- QString name() const;
+ TQString name() const;
bool isDefault() const { return mDefault; }
KListViewItem *item;
private:
- QString mId, mParentId;
+ TQString mId, mParentId;
FolderType mType;
- QString mName;
+ TQString mName;
bool mDefault;
};
diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp
index b188fb2fa..4f17ea893 100644
--- a/kresources/slox/sloxfolderdialog.cpp
+++ b/kresources/slox/sloxfolderdialog.cpp
@@ -25,7 +25,7 @@
#include "sloxfolderdialog.h"
#include "sloxfoldermanager.h"
-SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, QWidget *parent, const char *name ) :
+SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget *parent, const char *name ) :
KDialogBase( parent, name, true, i18n("Select Folder"), Ok|Cancel|User1, Ok, false, KGuiItem( i18n("Reload"), "reload" ) ),
mManager( manager ),
mFolderType( type )
@@ -37,23 +37,23 @@ SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type,
mListView->addColumn( i18n("Folder ID"), 0 );
setMainWidget( mListView );
updateFolderView();
- connect( manager, SIGNAL( foldersUpdated() ), SLOT( updateFolderView() ) );
+ connect( manager, TQT_SIGNAL( foldersUpdated() ), TQT_SLOT( updateFolderView() ) );
}
SloxFolderDialog::~SloxFolderDialog()
{
- QMap<QString, SloxFolder*> folders = mManager->folders();
- QMap<QString, SloxFolder*>::Iterator it;
+ TQMap<TQString, SloxFolder*> folders = mManager->folders();
+ TQMap<TQString, SloxFolder*>::Iterator it;
for ( it = folders.begin(); it != folders.end(); ++it )
(*it)->item = 0;
}
void SloxFolderDialog::updateFolderView()
{
- QString selected = selectedFolder();
+ TQString selected = selectedFolder();
mListView->clear();
- QMap<QString, SloxFolder*> folders = mManager->folders();
- QMap<QString, SloxFolder*>::Iterator it;
+ TQMap<TQString, SloxFolder*> folders = mManager->folders();
+ TQMap<TQString, SloxFolder*>::Iterator it;
for ( it = folders.begin(); it != folders.end(); ++it )
createFolderViewItem( *it );
setSelectedFolder( selected );
@@ -99,18 +99,18 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder )
}
}
-QString SloxFolderDialog::selectedFolder() const
+TQString SloxFolderDialog::selectedFolder() const
{
- QListViewItem *item = mListView->selectedItem();
+ TQListViewItem *item = mListView->selectedItem();
if ( item )
return item->text( 1 );
return "-1"; // OX default folder
}
-void SloxFolderDialog::setSelectedFolder( const QString &id )
+void SloxFolderDialog::setSelectedFolder( const TQString &id )
{
- QMap<QString, SloxFolder*> folders = mManager->folders();
- QMap<QString, SloxFolder*>::Iterator it;
+ TQMap<TQString, SloxFolder*> folders = mManager->folders();
+ TQMap<TQString, SloxFolder*>::Iterator it;
for ( it = folders.begin(); it != folders.end(); ++it ) {
if ( !(*it)->item )
continue;
diff --git a/kresources/slox/sloxfolderdialog.h b/kresources/slox/sloxfolderdialog.h
index 37287d1b1..6432a6495 100644
--- a/kresources/slox/sloxfolderdialog.h
+++ b/kresources/slox/sloxfolderdialog.h
@@ -19,7 +19,7 @@
#ifndef SLOXFOLDERDIALOG_H
#define SLOXFOLDERDIALOG_H
-#include <qstring.h>
+#include <tqstring.h>
#include <kdialogbase.h>
#include "sloxfolder.h"
@@ -32,11 +32,11 @@ class SloxFolderDialog : public KDialogBase
{
Q_OBJECT
public:
- SloxFolderDialog( SloxFolderManager *manager, FolderType type, QWidget* parent = 0, const char *name = 0 );
+ SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = 0, const char *name = 0 );
~SloxFolderDialog();
- QString selectedFolder() const;
- void setSelectedFolder( const QString &id );
+ TQString selectedFolder() const;
+ void setSelectedFolder( const TQString &id );
protected slots:
virtual void slotUser1();
@@ -48,7 +48,7 @@ class SloxFolderDialog : public KDialogBase
private:
KListView *mListView;
SloxFolderManager *mManager;
- QString mFolderId;
+ TQString mFolderId;
FolderType mFolderType;
};
diff --git a/kresources/slox/sloxfoldermanager.cpp b/kresources/slox/sloxfoldermanager.cpp
index b693767ca..41864caf8 100644
--- a/kresources/slox/sloxfoldermanager.cpp
+++ b/kresources/slox/sloxfoldermanager.cpp
@@ -17,9 +17,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <qfile.h>
-#include <qdom.h>
-#include <qstring.h>
+#include <tqfile.h>
+#include <tqdom.h>
+#include <tqstring.h>
#include <kdebug.h>
#include <kio/job.h>
@@ -46,7 +46,7 @@ SloxFolderManager::~SloxFolderManager()
{
if ( mDownloadJob )
mDownloadJob->kill();
- QMap<QString, SloxFolder*>::Iterator it;
+ TQMap<TQString, SloxFolder*>::Iterator it;
for ( it = mFolders.begin(); it != mFolders.end(); ++it )
delete *it;
mFolders.clear();
@@ -64,9 +64,9 @@ void SloxFolderManager::requestFolders()
KURL url = mBaseUrl;
url.setPath( "/servlet/webdav.folders/file.xml" );
- QDomDocument doc;
- QDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
- QDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
+ TQDomDocument doc;
+ TQDomElement root = WebdavHandler::addDavElement( doc, doc, "propfind" );
+ TQDomElement prop = WebdavHandler::addDavElement( doc, root, "prop" );
WebdavHandler::addSloxElement( mRes, doc, prop, "objectmode", "NEW_AND_MODIFIED" );
WebdavHandler::addSloxElement( mRes, doc, prop, "lastsync", "0" );
WebdavHandler::addSloxElement( mRes, doc, prop, "foldertype", "PRIVATE" );
@@ -79,8 +79,8 @@ void SloxFolderManager::requestFolders()
mDownloadJob = KIO::davPropFind( url, doc, "0", false );
- connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotResult( KIO::Job * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotResult( KIO::Job * ) ) );
}
void SloxFolderManager::slotResult( KIO::Job *job )
@@ -91,12 +91,12 @@ void SloxFolderManager::slotResult( KIO::Job *job )
job->showErrorDialog( 0 );
} else {
kdDebug() << k_funcinfo << " success, writing to " << cacheFile() << endl;
- QFile f( cacheFile() );
+ TQFile f( cacheFile() );
if ( !f.open( IO_WriteOnly ) ) {
kdDebug() << "Unable to open '" << cacheFile() << "'" << endl;
return;
}
- QTextStream stream ( &f );
+ TQTextStream stream ( &f );
stream << mDownloadJob->response();
f.close();
readFolders();
@@ -106,11 +106,11 @@ void SloxFolderManager::slotResult( KIO::Job *job )
emit foldersUpdated();
}
-QString SloxFolderManager::cacheFile() const
+TQString SloxFolderManager::cacheFile() const
{
- QString host = mBaseUrl.host();
+ TQString host = mBaseUrl.host();
- QString file = locateLocal( "cache", "slox/folders_" + host );
+ TQString file = locateLocal( "cache", "slox/folders_" + host );
kdDebug() << k_funcinfo << file << endl;
@@ -121,29 +121,29 @@ void SloxFolderManager::readFolders()
{
kdDebug() << k_funcinfo << endl;
- QFile f( cacheFile() );
+ TQFile f( cacheFile() );
if ( !f.open( IO_ReadOnly ) ) {
kdDebug() << "Unable to open '" << cacheFile() << "'" << endl;
requestFolders();
return;
}
- QDomDocument doc;
+ TQDomDocument doc;
doc.setContent( &f );
mFolders.clear();
- QDomNodeList nodes = doc.elementsByTagName( "D:prop" );
+ TQDomNodeList nodes = doc.elementsByTagName( "D:prop" );
for( uint i = 0; i < nodes.count(); ++i ) {
- QDomElement element = nodes.item(i).toElement();
- QString id = "-1", parentId = "-1"; // OX default folder
+ TQDomElement element = nodes.item(i).toElement();
+ TQString id = "-1", parentId = "-1"; // OX default folder
bool def = false;
- QString name, type;
- QDomNode n;
+ TQString name, type;
+ TQDomNode n;
for( n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomElement e = n.toElement();
- QString tag = e.tagName();
- QString value = e.text();
+ TQDomElement e = n.toElement();
+ TQString tag = e.tagName();
+ TQString value = e.text();
if ( tag == "ox:object_id" ) id = value;
else if ( tag == "ox:folder_id" ) parentId = value;
else if ( tag == "ox:title" ) name = value;
diff --git a/kresources/slox/sloxfoldermanager.h b/kresources/slox/sloxfoldermanager.h
index 3adac2061..832c70675 100644
--- a/kresources/slox/sloxfoldermanager.h
+++ b/kresources/slox/sloxfoldermanager.h
@@ -20,8 +20,8 @@
#ifndef SLOXFOLDERMANAGER_H
#define SLOXFOLDERMANAGER_H
-#include <qmap.h>
-#include <qobject.h>
+#include <tqmap.h>
+#include <tqobject.h>
#include <kurl.h>
@@ -42,7 +42,7 @@ class KDE_EXPORT SloxFolderManager : public QObject
SloxFolderManager( SloxBase *res, const KURL &baseUrl );
~SloxFolderManager();
- QMap<QString, SloxFolder*> folders() const { return mFolders; }
+ TQMap<TQString, SloxFolder*> folders() const { return mFolders; }
void requestFolders();
signals:
@@ -51,7 +51,7 @@ class KDE_EXPORT SloxFolderManager : public QObject
protected:
void readFolders();
- QString cacheFile() const;
+ TQString cacheFile() const;
protected slots:
void slotResult( KIO::Job * );
@@ -59,7 +59,7 @@ class KDE_EXPORT SloxFolderManager : public QObject
private:
KIO::DavJob *mDownloadJob;
KURL mBaseUrl;
- QMap<QString, SloxFolder*> mFolders;
+ TQMap<TQString, SloxFolder*> mFolders;
SloxBase *mRes;
};
diff --git a/kresources/slox/testsloxaccounts.cpp b/kresources/slox/testsloxaccounts.cpp
index c1cc75d3e..6ad10c1b1 100644
--- a/kresources/slox/testsloxaccounts.cpp
+++ b/kresources/slox/testsloxaccounts.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <kcmdlineargs.h>
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
static const KCmdLineOptions options[] =
{
@@ -48,14 +48,14 @@ int main(int argc,char **argv)
bool verbose = false;
if ( args->isSet( "verbose" ) ) verbose = true;
- QPushButton button( "Close", 0 );
+ TQPushButton button( "Close", 0 );
SloxAccounts::setServer( "f85.suse.de" );
SloxAccounts::self();
app.setMainWidget( &button );
button.show();
- QObject::connect( &button, SIGNAL( clicked() ), &app, SLOT( quit() ) );
+ TQObject::connect( &button, TQT_SIGNAL( clicked() ), &app, TQT_SLOT( quit() ) );
app.exec();
}
diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp
index 511373d51..3f1b6be86 100644
--- a/kresources/slox/webdavhandler.cpp
+++ b/kresources/slox/webdavhandler.cpp
@@ -39,7 +39,7 @@
#include <kdebug.h>
#include <kconfig.h>
-#include <qfile.h>
+#include <tqfile.h>
SloxItem::SloxItem()
: status( Invalid )
@@ -57,81 +57,81 @@ WebdavHandler::WebdavHandler()
kdDebug() << "LOG FILE: " << mLogFile << endl;
}
-void WebdavHandler::setUserId( const QString &id )
+void WebdavHandler::setUserId( const TQString &id )
{
mUserId = id;
}
-QString WebdavHandler::userId() const
+TQString WebdavHandler::userId() const
{
return mUserId;
}
-void WebdavHandler::log( const QString &text )
+void WebdavHandler::log( const TQString &text )
{
if ( mLogFile.isEmpty() ) return;
- QString filename = mLogFile + "-" + QString::number( mLogCount );
- QFile file( filename );
+ TQString filename = mLogFile + "-" + TQString::number( mLogCount );
+ TQFile file( filename );
if ( !file.open( IO_WriteOnly ) ) {
kdWarning() << "Unable to open log file '" << filename << "'" << endl;
return;
}
- QCString textUtf8 = text.utf8();
+ TQCString textUtf8 = text.utf8();
file.writeBlock( textUtf8.data(), textUtf8.size() - 1 );
if ( ++mLogCount > 5 ) mLogCount = 0;
}
-QValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const QDomDocument &doc )
+TQValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const TQDomDocument &doc )
{
kdDebug() << "getSloxItems" << endl;
- QValueList<SloxItem> items;
+ TQValueList<SloxItem> items;
- QDomElement docElement = doc.documentElement();
+ TQDomElement docElement = doc.documentElement();
- QDomNode responseNode;
+ TQDomNode responseNode;
for( responseNode = docElement.firstChild(); !responseNode.isNull();
responseNode = responseNode.nextSibling() ) {
- QDomElement responseElement = responseNode.toElement();
+ TQDomElement responseElement = responseNode.toElement();
if ( responseElement.tagName() == "response" ) {
SloxItem item;
- QDomNode propstat = responseElement.namedItem( "propstat" );
+ TQDomNode propstat = responseElement.namedItem( "propstat" );
if ( propstat.isNull() ) {
kdError() << "Unable to find propstat tag." << endl;
continue;
}
- QDomNode prop = propstat.namedItem( "prop" );
+ TQDomNode prop = propstat.namedItem( "prop" );
if ( prop.isNull() ) {
kdError() << "Unable to find WebDAV property" << endl;
continue;
}
item.domNode = prop;
- QDomNode sloxIdNode = prop.namedItem( res->fieldName( SloxBase::ObjectId ) );
+ TQDomNode sloxIdNode = prop.namedItem( res->fieldName( SloxBase::ObjectId ) );
if ( sloxIdNode.isNull() ) {
kdError() << "Unable to find SLOX id." << endl;
continue;
}
- QDomElement sloxIdElement = sloxIdNode.toElement();
+ TQDomElement sloxIdElement = sloxIdNode.toElement();
item.sloxId = sloxIdElement.text();
- QDomNode clientIdNode = prop.namedItem( res->fieldName( SloxBase::ClientId ) );
+ TQDomNode clientIdNode = prop.namedItem( res->fieldName( SloxBase::ClientId ) );
if ( !clientIdNode.isNull() ) {
- QDomElement clientIdElement = clientIdNode.toElement();
+ TQDomElement clientIdElement = clientIdNode.toElement();
item.clientId = clientIdElement.text();
if ( item.clientId != item.sloxId )
item.status = SloxItem::New;
}
- QDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjectStatus ) );
+ TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjectStatus ) );
if ( !sloxStatus.isNull() ) {
- QDomElement sloxStatusElement = sloxStatus.toElement();
+ TQDomElement sloxStatusElement = sloxStatus.toElement();
if ( sloxStatusElement.text() == "DELETE" ) {
item.status = SloxItem::Delete;
} else if ( sloxStatusElement.text() == "CREATE" ) {
@@ -139,14 +139,14 @@ QValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const QDomDocum
}
}
- QDomNode status = propstat.namedItem( "status" );
+ TQDomNode status = propstat.namedItem( "status" );
if ( status.isNull() ) {
kdError() << "Unable to find WebDAV status" << endl;
continue;
}
item.response = status.toElement().text();
- QDomNode desc = propstat.namedItem( "responsedescription" );
+ TQDomNode desc = propstat.namedItem( "responsedescription" );
if ( desc.isNull() ) {
kdError() << "Unable to find WebDAV responsedescription" << endl;
continue;
@@ -160,22 +160,22 @@ QValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const QDomDocum
return items;
}
-QString WebdavHandler::qDateTimeToSlox( const QDateTime &dt )
+TQString WebdavHandler::qDateTimeToSlox( const TQDateTime &dt )
{
- uint ticks = -dt.secsTo( QDateTime( QDate( 1970, 1, 1 ), QTime( 0, 0 ) ) );
+ uint ticks = -dt.secsTo( TQDateTime( TQDate( 1970, 1, 1 ), TQTime( 0, 0 ) ) );
- return QString::number( ticks ) + "000";
+ return TQString::number( ticks ) + "000";
}
-QString WebdavHandler::qDateTimeToSlox( const QDateTime &dt,
- const QString &timeZoneId )
+TQString WebdavHandler::qDateTimeToSlox( const TQDateTime &dt,
+ const TQString &timeZoneId )
{
- QDateTime utc = KPimPrefs::localTimeToUtc( dt, timeZoneId );
+ TQDateTime utc = KPimPrefs::localTimeToUtc( dt, timeZoneId );
// secsTo and toTime_t etc also perform a timezone conversion using the system timezone,
// but we want to use the calendar timezone, so we have to convert ourself and spoof the tz to UTC before
// converting to ticks to prevent this
- QCString origTz = getenv("TZ");
+ TQCString origTz = getenv("TZ");
setenv( "TZ", "UTC", 1 );
uint ticks = utc.toTime_t();
if ( origTz.isNull() )
@@ -183,12 +183,12 @@ QString WebdavHandler::qDateTimeToSlox( const QDateTime &dt,
else
setenv( "TZ", origTz, 1 );
- return QString::number( ticks ) + "000";
+ return TQString::number( ticks ) + "000";
}
-QDateTime WebdavHandler::sloxToQDateTime( const QString &str )
+TQDateTime WebdavHandler::sloxToQDateTime( const TQString &str )
{
- QString s = str.mid( 0, str.length() - 3 );
+ TQString s = str.mid( 0, str.length() - 3 );
bool preEpoch = s.startsWith("-");
if (preEpoch)
@@ -196,7 +196,7 @@ QDateTime WebdavHandler::sloxToQDateTime( const QString &str )
unsigned long ticks = s.toULong();
- QDateTime dt;
+ TQDateTime dt;
if (preEpoch) {
dt.setTime_t( 0, Qt::UTC );
@@ -214,60 +214,60 @@ QDateTime WebdavHandler::sloxToQDateTime( const QString &str )
return dt;
}
-QDateTime WebdavHandler::sloxToQDateTime( const QString &str,
- const QString &timeZoneId )
+TQDateTime WebdavHandler::sloxToQDateTime( const TQString &str,
+ const TQString &timeZoneId )
{
return KPimPrefs::utcToLocalTime( sloxToQDateTime(str), timeZoneId );
}
-QDomElement WebdavHandler::addElement( QDomDocument &doc, QDomNode &node,
- const QString &tag )
+TQDomElement WebdavHandler::addElement( TQDomDocument &doc, TQDomNode &node,
+ const TQString &tag )
{
- QDomElement el = doc.createElement( tag );
+ TQDomElement el = doc.createElement( tag );
node.appendChild( el );
return el;
}
-QDomElement WebdavHandler::addDavElement( QDomDocument &doc, QDomNode &node,
- const QString &tag )
+TQDomElement WebdavHandler::addDavElement( TQDomDocument &doc, TQDomNode &node,
+ const TQString &tag )
{
- QDomElement el = doc.createElementNS( "DAV:", "D:" + tag );
+ TQDomElement el = doc.createElementNS( "DAV:", "D:" + tag );
node.appendChild( el );
return el;
}
-QDomElement WebdavHandler::addSloxElement( SloxBase *res,
- QDomDocument &doc, QDomNode &node,
- const QString &tag,
- const QString &text )
+TQDomElement WebdavHandler::addSloxElement( SloxBase *res,
+ TQDomDocument &doc, TQDomNode &node,
+ const TQString &tag,
+ const TQString &text )
{
- QDomElement el;
+ TQDomElement el;
if ( res->resType() == "ox" )
el = doc.createElementNS( "http://www.open-xchange.org", "ox:" + tag );
else
el = doc.createElementNS( "SLOX", "S:" + tag );
if ( !text.isEmpty() ) {
- QDomText textnode = doc.createTextNode( text );
+ TQDomText textnode = doc.createTextNode( text );
el.appendChild( textnode );
}
node.appendChild( el );
return el;
}
-void WebdavHandler::parseSloxAttribute( const QDomElement &e )
+void WebdavHandler::parseSloxAttribute( const TQDomElement &e )
{
// kdDebug() << "parseSloxAttribute" << endl;
- QString tag = e.tagName();
- QString text = QString::fromUtf8( e.text().latin1() );
+ TQString tag = e.tagName();
+ TQString text = TQString::fromUtf8( e.text().latin1() );
if ( text.isEmpty() ) return;
if ( tag == "owner" ) {
if ( text == mUserId ) mWritable = true;
} else if ( tag == "writerights" ) {
- QDomNode n;
+ TQDomNode n;
for( n = e.firstChild(); !n.isNull(); n = n.nextSibling() ) {
- QDomElement e2 = n.toElement();
+ TQDomElement e2 = n.toElement();
if ( e2.tagName() == "member" ) {
if ( e2.text() == mUserId ) mWritable = true;
}
diff --git a/kresources/slox/webdavhandler.h b/kresources/slox/webdavhandler.h
index b41499a4a..2d4286193 100644
--- a/kresources/slox/webdavhandler.h
+++ b/kresources/slox/webdavhandler.h
@@ -20,10 +20,10 @@
#ifndef WEBDAVHANDLER_H
#define WEBDAVHANDLER_H
-#include <qvaluelist.h>
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qdom.h>
+#include <tqvaluelist.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
+#include <tqdom.h>
#include <kdepimmacros.h>
#include <kabc/addressee.h>
@@ -41,12 +41,12 @@ class KDE_EXPORT SloxItem
SloxItem();
- QDomNode domNode;
- QString sloxId;
- QString clientId;
+ TQDomNode domNode;
+ TQString sloxId;
+ TQString clientId;
Status status;
- QString response;
- QString responseDescription;
+ TQString response;
+ TQString responseDescription;
};
class KDE_EXPORT WebdavHandler
@@ -54,41 +54,41 @@ class KDE_EXPORT WebdavHandler
public:
WebdavHandler();
- void setUserId( const QString & );
- QString userId() const;
+ void setUserId( const TQString & );
+ TQString userId() const;
void setResource( SloxBase *res ) { mRes = res; }
- void log( const QString & );
+ void log( const TQString & );
- static QDomElement addElement( QDomDocument &, QDomNode &,
- const QString &tag );
- static QDomElement addDavElement( QDomDocument &, QDomNode &,
- const QString &tag );
- static QDomElement addSloxElement( SloxBase *res,
- QDomDocument &, QDomNode &,
- const QString &tag,
- const QString &text = QString::null );
+ static TQDomElement addElement( TQDomDocument &, TQDomNode &,
+ const TQString &tag );
+ static TQDomElement addDavElement( TQDomDocument &, TQDomNode &,
+ const TQString &tag );
+ static TQDomElement addSloxElement( SloxBase *res,
+ TQDomDocument &, TQDomNode &,
+ const TQString &tag,
+ const TQString &text = TQString::null );
- static QDateTime sloxToQDateTime( const QString &str );
- static QDateTime sloxToQDateTime( const QString &str,
- const QString &timeZoneId );
- static QString qDateTimeToSlox( const QDateTime &dt );
- static QString qDateTimeToSlox( const QDateTime &dt,
- const QString &timeZoneId );
+ static TQDateTime sloxToQDateTime( const TQString &str );
+ static TQDateTime sloxToQDateTime( const TQString &str,
+ const TQString &timeZoneId );
+ static TQString qDateTimeToSlox( const TQDateTime &dt );
+ static TQString qDateTimeToSlox( const TQDateTime &dt,
+ const TQString &timeZoneId );
- static QValueList<SloxItem> getSloxItems( SloxBase *res, const QDomDocument &doc );
+ static TQValueList<SloxItem> getSloxItems( SloxBase *res, const TQDomDocument &doc );
void clearSloxAttributeStatus();
- void parseSloxAttribute( const QDomElement & );
+ void parseSloxAttribute( const TQDomElement & );
void setSloxAttributes( KCal::Incidence * );
void setSloxAttributes( KABC::Addressee & );
private:
- QString mLogFile;
+ TQString mLogFile;
int mLogCount;
SloxBase *mRes;
- QString mUserId;
+ TQString mUserId;
bool mWritable;
};
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp
index 51cfa5d22..83ae49bb9 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@@ -30,13 +30,13 @@
#include <libkdepim/kpimprefs.h>
-#include <qapplication.h>
-#include <qdom.h>
-#include <qdatetime.h>
-#include <qptrlist.h>
-#include <qregexp.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <tqapplication.h>
+#include <tqdom.h>
+#include <tqdatetime.h>
+#include <tqptrlist.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
#include <kabc/locknull.h>
#include <karchive.h>
@@ -93,8 +93,8 @@ void ResourceTVAnytime::init()
//setReadOnly( true );
- connect( &mResourceChangedTimer, SIGNAL( timeout() ),
- this, SLOT( slotEmitResourceChanged() ) );
+ connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
+ this, TQT_SLOT( slotEmitResourceChanged() ) );
}
TVAnytimePrefsBase *ResourceTVAnytime::prefs()
@@ -110,7 +110,7 @@ void ResourceTVAnytime::readConfig( const KConfig *config )
ResourceCached::readConfig( config );
- QStringList defaultActive;
+ TQStringList defaultActive;
defaultActive << "BBCOne" << "BBCTwo" << "BBCThree" << "BBCROne" << "BBCRTwo" << "BBCRThree" << "BBCRFour";
mActiveServices = config->readListEntry( "ActiveServices", defaultActive );
@@ -125,7 +125,7 @@ void ResourceTVAnytime::writeConfig( KConfig *config )
mPrefs->writeConfig();
ResourceCached::writeConfig( config );
- QStringList activeServices;
+ TQStringList activeServices;
ServiceMap::ConstIterator it;
for ( it = mServiceMap.begin(); it != mServiceMap.end(); ++it )
if ( it.data().active() )
@@ -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 = KIO::file_copy( url, destination, -1, true );
- connect( mDownloadJob, SIGNAL( result( KIO::Job * ) ),
- SLOT( slotJobResult( KIO::Job * ) ) );
+ connect( mDownloadJob, TQT_SIGNAL( result( KIO::Job * ) ),
+ TQT_SLOT( slotJobResult( KIO::Job * ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading program schedule") );
connect( mProgress,
- SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- SLOT( cancelLoad() ) );
+ TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQT_SLOT( cancelLoad() ) );
return true;
}
@@ -228,9 +228,9 @@ void ResourceTVAnytime::slotJobResult( KIO::Job *job )
mDestination = 0;
}
-QDomDocument ResourceTVAnytime::archiveFileXml( const QString & name )
+TQDomDocument ResourceTVAnytime::archiveFileXml( const TQString & name )
{
- QDomDocument result;
+ TQDomDocument result;
const KArchiveDirectory *dir = mScheduleArchive->directory();
const KArchiveEntry * entry = dir->entry( name );
if ( entry && entry->isFile() )
@@ -243,11 +243,11 @@ QDomDocument ResourceTVAnytime::archiveFileXml( const QString & name )
bool ResourceTVAnytime::readSchedule()
{
- QString uncompress = "application/x-gzip";
+ TQString uncompress = "application/x-gzip";
mScheduleArchive = new KTar( mDestination->name(), uncompress );
mScheduleArchive->open( IO_ReadOnly );
- QDomDocument serviceInfo = archiveFileXml( "ServiceInformation.xml" );
+ TQDomDocument serviceInfo = archiveFileXml( "ServiceInformation.xml" );
if ( !serviceInfo.isNull() )
readServiceInformation( serviceInfo );
@@ -261,7 +261,7 @@ bool ResourceTVAnytime::readSchedule()
readService( it.key() );
}
#else
- QString serviceId = "BBCOne";
+ TQString serviceId = "BBCOne";
Service s = mServiceMap[ serviceId ];
if ( s.active() )
readService( serviceId );
@@ -271,22 +271,22 @@ bool ResourceTVAnytime::readSchedule()
return true;
}
-bool ResourceTVAnytime::readServiceInformation( const QDomDocument & serviceInfo )
+bool ResourceTVAnytime::readServiceInformation( const TQDomDocument & serviceInfo )
{
kdDebug() << k_funcinfo << endl;
- QDomElement docElem = serviceInfo.documentElement();
+ TQDomElement docElem = serviceInfo.documentElement();
- QDomNode n = docElem.firstChild();
+ TQDomNode n = docElem.firstChild();
while( !n.isNull() ) {
- QDomElement e = n.toElement(); // try to convert the node to an element.
+ TQDomElement e = n.toElement(); // try to convert the node to an element.
if( !e.isNull() && e.tagName() == "ProgramDescription" ) {
- QDomNode n2 = e.firstChild();
- QDomElement e2 = n2.toElement();
+ TQDomNode n2 = e.firstChild();
+ TQDomElement e2 = n2.toElement();
if( !e2.isNull() && e2.tagName() == "ServiceInformationTable" ) {
- QDomNode n3 = e2.firstChild();
+ TQDomNode n3 = e2.firstChild();
while ( !n3.isNull() ) {
Service s;
- QDomElement e3 = n3.toElement();
+ TQDomElement e3 = n3.toElement();
if (s.loadXML( e3 ) ) {
s.setActive( mActiveServices.contains( s.id() ) );
bool newService = !mServiceMap.contains( s.id() );
@@ -311,24 +311,24 @@ bool ResourceTVAnytime::readServiceInformation( const QDomDocument & serviceInfo
return true;
}
-bool ResourceTVAnytime::readService( const QString & serviceId )
+bool ResourceTVAnytime::readService( const TQString & serviceId )
{
kdDebug() << k_funcinfo << endl;
// open programme information table
Service service = mServiceMap[ serviceId ];
- QStringList entries = mScheduleArchive->directory()->entries();
- QRegExp re( "^(\\d{8})" + serviceId );
- QStringList dates;
- QString todaysDate = QDate::currentDate().toString( "yyyyMMdd" );
- for( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
+ TQStringList entries = mScheduleArchive->directory()->entries();
+ TQRegExp re( "^(\\d{8})" + serviceId );
+ TQStringList dates;
+ TQString todaysDate = TQDate::currentDate().toString( "yyyyMMdd" );
+ for( TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
{
if ( re.search( *it ) != -1 ) // this entry belongs to the requested service
{
- QString entry = re.cap( 1 );
+ TQString entry = re.cap( 1 );
// handle this date according to user preferences
- QDate entryDate( entry.left( 4 ).toInt(), entry.mid( 4, 2 ).toInt(), entry.right( 2 ).toInt() );
- if ( entryDate < QDate::currentDate() || ( entryDate > QDate::currentDate().addDays( prefs()->days() - 1 ) ) )
+ TQDate entryDate( entry.left( 4 ).toInt(), entry.mid( 4, 2 ).toInt(), entry.right( 2 ).toInt() );
+ if ( entryDate < TQDate::currentDate() || ( entryDate > TQDate::currentDate().addDays( prefs()->days() - 1 ) ) )
continue;
if ( !dates.contains( re.cap( 1 ) ) )
@@ -338,23 +338,23 @@ bool ResourceTVAnytime::readService( const QString & serviceId )
kdDebug() << "reading schedule for " << serviceId << " on " << dates << endl;
- for( QStringList::Iterator it = dates.begin(); it != dates.end(); ++it )
+ for( TQStringList::Iterator it = dates.begin(); it != dates.end(); ++it )
{
ProgramInformationMap progInfoMap = service.programmeInformation();
- QString programInfoFileName = QString( *it + serviceId + "_pi.xml" );
- QDomDocument programInfo = archiveFileXml( programInfoFileName );
+ TQString programInfoFileName = TQString( *it + serviceId + "_pi.xml" );
+ TQDomDocument programInfo = archiveFileXml( programInfoFileName );
if ( !programInfo.isNull() ) {
- QDomElement docElem = programInfo.documentElement();
- QDomNode n = docElem.firstChild();
+ TQDomElement docElem = programInfo.documentElement();
+ TQDomNode n = docElem.firstChild();
while( !n.isNull() ) {
- QDomElement e = n.toElement(); // try to convert the node to an element.
+ TQDomElement e = n.toElement(); // try to convert the node to an element.
if( !e.isNull() && e.tagName() == "ProgramDescription" ) {
- QDomNode n2 = e.firstChild();
- QDomElement e2 = n2.toElement();
+ TQDomNode n2 = e.firstChild();
+ TQDomElement e2 = n2.toElement();
if( !e2.isNull() && e2.tagName() == "ProgramInformationTable" ) {
- QDomNode n3 = e2.firstChild();
+ TQDomNode n3 = e2.firstChild();
while ( !n3.isNull() ) {
- QDomElement e3 = n3.toElement();
+ TQDomElement e3 = n3.toElement();
ProgramInformation pi;
if ( pi.loadXML( e3 ) ) {
//kdDebug() << "Found programme: " << pi.id() << "," << pi.title() << "," << pi.synopsis() << endl;
@@ -372,25 +372,25 @@ bool ResourceTVAnytime::readService( const QString & serviceId )
kdDebug() << "Service file: " << programInfoFileName << " not found in archive" << endl;
// open programme location table, iterate and create incidences
- QString programLocationFileName = QString( *it + serviceId + "_pl.xml" );
- QDomDocument programLocation = archiveFileXml( programLocationFileName );
+ TQString programLocationFileName = TQString( *it + serviceId + "_pl.xml" );
+ TQDomDocument programLocation = archiveFileXml( programLocationFileName );
if ( !programLocation.isNull() ) {
- QDomElement docElem = programLocation.documentElement();
- QDomNode n = docElem.firstChild();
+ TQDomElement docElem = programLocation.documentElement();
+ TQDomNode n = docElem.firstChild();
while( !n.isNull() ) {
- QDomElement e = n.toElement(); // try to convert the node to an element.
+ TQDomElement e = n.toElement(); // try to convert the node to an element.
if( !e.isNull() && e.tagName() == "ProgramDescription" ) {
- QDomNode n2 = e.firstChild();
- QDomElement e2 = n2.toElement();
+ TQDomNode n2 = e.firstChild();
+ TQDomElement e2 = n2.toElement();
if( !e2.isNull() && e2.tagName() == "ProgramLocationTable" ) {
- QDomNode n3 = e2.firstChild();
- QDomElement e3 = n3.toElement();
+ TQDomNode n3 = e2.firstChild();
+ TQDomElement e3 = n3.toElement();
if( !e3.isNull() && e3.tagName() == "Schedule" ) {
- QString foundServiceId = e3.attribute( "serviceIDRef" );
+ TQString foundServiceId = e3.attribute( "serviceIDRef" );
if ( serviceId == foundServiceId ) {
- QDomNode n4 = e3.firstChild();
+ TQDomNode n4 = e3.firstChild();
while ( !n4.isNull() ) {
- QDomElement e4 = n4.toElement();
+ TQDomElement e4 = n4.toElement();
ScheduleEvent se;
if ( se.loadXML( e4 ) ) {
ProgramInformation pi = progInfoMap[ se.crid() ];
@@ -428,31 +428,31 @@ bool ResourceTVAnytime::readService( const QString & serviceId )
return true;
}
-QStringList ResourceTVAnytime::subresources() const
+TQStringList ResourceTVAnytime::subresources() const
{
//const_cast<ResourceTVAnytime*>( this )->doLoad();
return mServiceMap.keys();
}
const QString
-ResourceTVAnytime::labelForSubresource( const QString& subresource ) const
+ResourceTVAnytime::labelForSubresource( const TQString& subresource ) const
{
Service s = mServiceMap[ subresource ];
return s.name();
}
-QString ResourceTVAnytime::subresourceIdentifier( Incidence *incidence )
+TQString ResourceTVAnytime::subresourceIdentifier( Incidence *incidence )
{
return incidence->customProperty( "TVANYWHERE", "SERVICEID" );
}
-bool ResourceTVAnytime::subresourceActive( const QString & subresource ) const
+bool ResourceTVAnytime::subresourceActive( const TQString & subresource ) const
{
Service s = mServiceMap[ subresource ];
return s.active();
}
-void ResourceTVAnytime::setSubresourceActive( const QString & subresource, bool active )
+void ResourceTVAnytime::setSubresourceActive( const TQString & subresource, bool active )
{
if ( mServiceMap.contains( subresource ) )
{
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.h b/kresources/tvanytime/kcal_resourcetvanytime.h
index 227ff4f10..bad3f2206 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.h
+++ b/kresources/tvanytime/kcal_resourcetvanytime.h
@@ -21,7 +21,7 @@
#ifndef KCAL_RESOURCETVANYTIME_H
#define KCAL_RESOURCETVANYTIME_H
-#include <qtimer.h>
+#include <tqtimer.h>
#include <libkdepim/progressmanager.h>
@@ -38,8 +38,8 @@ class QDomDocument;
class KTar;
class KTempFile;
-typedef QMap< QString, Service > ServiceMap;
-typedef QMap< QString, QString > UidMap;
+typedef TQMap< TQString, Service > ServiceMap;
+typedef TQMap< TQString, TQString > UidMap;
namespace KCal {
@@ -63,13 +63,13 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached
TVAnytimePrefsBase *prefs();
- QStringList subresources() const;
- const QString labelForSubresource( const QString& subresource ) const;
- QString subresourceIdentifier( Incidence *incidence );
+ TQStringList subresources() const;
+ const TQString labelForSubresource( const TQString& subresource ) const;
+ TQString subresourceIdentifier( Incidence *incidence );
/** Is this subresource active? */
- bool subresourceActive( const QString& ) const;
+ bool subresourceActive( const TQString& ) const;
/** (De)activate the subresource */
- virtual void setSubresourceActive( const QString &, bool );
+ virtual void setSubresourceActive( const TQString &, bool );
bool doOpen();
void doClose();
@@ -84,7 +84,7 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached
/**
* Extract the XML from the given filename within the schedule archive
*/
- QDomDocument archiveFileXml( const QString & name );
+ TQDomDocument archiveFileXml( const TQString & name );
/**
* Read the tv schedule from the tarball downloaded to mDestination
@@ -94,10 +94,10 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached
/**
* Read the service information map from the supplied xml
*/
- bool readServiceInformation( const QDomDocument & );
+ bool readServiceInformation( const TQDomDocument & );
bool readServices() { return true; }
- bool readService( const QString & serviceId );
- bool readProgrammeInformation( const QDomDocument & );
+ bool readService( const TQString & serviceId );
+ bool readProgrammeInformation( const TQDomDocument & );
protected slots:
void slotJobResult( KIO::Job * );
@@ -113,14 +113,14 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached
bool mIsShowingError;
- QTimer mResourceChangedTimer;
+ TQTimer mResourceChangedTimer;
KTempFile * mDestination;
KTar * mScheduleArchive;
ServiceMap mServiceMap;
UidMap mUidMap;
//TODO: read this from subresource config
- QStringList mActiveServices;
+ TQStringList mActiveServices;
};
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
index a910a4f60..47d62d376 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
@@ -20,10 +20,10 @@
#include <typeinfo>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qwhatsthis.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
+#include <tqwhatsthis.h>
#include <kconfigskeleton.h>
#include <klocale.h>
@@ -40,19 +40,19 @@
using namespace KCal;
-ResourceTVAnytimeConfig::ResourceTVAnytimeConfig( QWidget* parent, const char* name )
+ResourceTVAnytimeConfig::ResourceTVAnytimeConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
resize( 245, 115 );
- QGridLayout *mainLayout = new QGridLayout( this, 2, 2 );
+ TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
- QLabel *label = new QLabel( i18n( "Schedule tarball URL:" ), this );
+ TQLabel *label = new TQLabel( i18n( "Schedule tarball URL:" ), this );
mainLayout->addWidget( label, 1, 0 );
mUrl = new KLineEdit( this );
mainLayout->addWidget( mUrl, 1, 1 );
- label = new QLabel( i18n( "Retrieve how many days?" ), this );
+ label = new TQLabel( i18n( "Retrieve how many days?" ), this );
mainLayout->addWidget( label, 2, 0 );
- mDays = new QSpinBox( this );
+ mDays = new TQSpinBox( this );
mainLayout->addWidget( mDays, 2, 1 );
mReloadConfig = new KCal::ResourceCachedReloadConfig( this );
mainLayout->addMultiCellWidget( mReloadConfig, 3, 3, 0, 1 );
@@ -73,7 +73,7 @@ void ResourceTVAnytimeConfig::loadSettings( KRES::Resource *resource )
KConfigSkeleton::ItemInt * daysItem = res->prefs()->daysItem();
mDays->setMinValue( daysItem->minValue().toInt() );
mDays->setMaxValue( daysItem->maxValue().toInt() );
- QWhatsThis::add( mDays, daysItem->whatsThis() );
+ TQWhatsThis::add( mDays, daysItem->whatsThis() );
mUrl->setText( res->prefs()->url() );
mDays->setValue( res->prefs()->days() );
mReloadConfig->loadSettings( res );
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
index 248b386d5..cd3701858 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -42,7 +42,7 @@ class KDE_EXPORT ResourceTVAnytimeConfig : public KRES::ConfigWidget
{
Q_OBJECT
public:
- ResourceTVAnytimeConfig( QWidget *parent = 0, const char *name = 0 );
+ ResourceTVAnytimeConfig( TQWidget *parent = 0, const char *name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource );
@@ -50,7 +50,7 @@ Q_OBJECT
private:
KLineEdit *mUrl;
- QSpinBox *mDays;
+ TQSpinBox *mDays;
ResourceCachedReloadConfig *mReloadConfig;
ResourceCachedSaveConfig *mSaveConfig;
ResourceTVAnytime *mResource;
diff --git a/kresources/tvanytime/kcal_tvanytimeprefs.cpp b/kresources/tvanytime/kcal_tvanytimeprefs.cpp
index a6b503c05..26f3f7ef3 100644
--- a/kresources/tvanytime/kcal_tvanytimeprefs.cpp
+++ b/kresources/tvanytime/kcal_tvanytimeprefs.cpp
@@ -27,7 +27,7 @@ TVAnytimePrefs::TVAnytimePrefs()
{
}
-QString TVAnytimePrefs::scheduleUrl() const
+TQString TVAnytimePrefs::scheduleUrl() const
{
return url();
}
diff --git a/kresources/tvanytime/kcal_tvanytimeprefs.h b/kresources/tvanytime/kcal_tvanytimeprefs.h
index 52bb31152..2ab10802e 100644
--- a/kresources/tvanytime/kcal_tvanytimeprefs.h
+++ b/kresources/tvanytime/kcal_tvanytimeprefs.h
@@ -29,7 +29,7 @@ class TVAnytimePrefs : public TVAnytimePrefsBase
public:
TVAnytimePrefs();
- QString scheduleUrl() const;
+ TQString scheduleUrl() const;
};
}
diff --git a/kresources/tvanytime/service.cpp b/kresources/tvanytime/service.cpp
index 9c92f4f2b..ecf34fc44 100644
--- a/kresources/tvanytime/service.cpp
+++ b/kresources/tvanytime/service.cpp
@@ -25,7 +25,7 @@ Service::Service() : mActive( true )
}
-Service::Service( bool active, const QString & name, const QString & owner, const KURL & serviceUrl, const KURL & logo, const QStringList & genres )
+Service::Service( bool active, const TQString & name, const TQString & owner, const KURL & serviceUrl, const KURL & logo, const TQStringList & genres )
: mActive( active ), mName( name ), mOwner( owner ), mServiceUrl( serviceUrl ), mLogo( logo ), mGenres( genres )
{
}
@@ -35,7 +35,7 @@ void Service::setActive( bool active )
mActive = active;
}
-void Service::setName( const QString & name )
+void Service::setName( const TQString & name )
{
mName = name;
}
@@ -50,12 +50,12 @@ bool Service::active() const
return mActive;
}
-QString Service::name() const
+TQString Service::name() const
{
return mName;
}
-bool Service::loadXML( const QDomElement & top )
+bool Service::loadXML( const TQDomElement & top )
{
if ( top.tagName() != "ServiceInformation" ) {
qWarning( "XML error: Top tag was %s instead of the expected service information",
@@ -65,11 +65,11 @@ bool Service::loadXML( const QDomElement & top )
setId( top.attribute( "serviceId" ) );
- for ( QDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
loadAttribute( e );
} else
qWarning( "Node is not a comment or an element???" );
@@ -77,22 +77,22 @@ bool Service::loadXML( const QDomElement & top )
return true;
}
-bool Service::loadAttribute( const QDomElement& element )
+bool Service::loadAttribute( const TQDomElement& element )
{
- QString tagName = element.tagName();
+ TQString tagName = element.tagName();
if ( tagName == "Name" ) {
- QDomNode cn = element.firstChild();
- QDomText t = cn.toText();
+ TQDomNode cn = element.firstChild();
+ TQDomText t = cn.toText();
mName = t.data();
}
else if ( tagName == "Owner" ) {
- QDomNode cn = element.firstChild();
- QDomText t = cn.toText();
+ TQDomNode cn = element.firstChild();
+ TQDomText t = cn.toText();
mOwner = t.data();
}
else if ( tagName == "ServiceURL" ) {
- QDomNode cn = element.firstChild();
- QDomText t = cn.toText();
+ TQDomNode cn = element.firstChild();
+ TQDomText t = cn.toText();
mServiceUrl = t.data();
}
// TODO: parse logo data
@@ -100,9 +100,9 @@ bool Service::loadAttribute( const QDomElement& element )
return true;
}
-QRegExp ScheduleEvent::sRegExp( "PT(\\d{2})H(\\d{2})M(\\d{2})S" );
+TQRegExp ScheduleEvent::sRegExp( "PT(\\d{2})H(\\d{2})M(\\d{2})S" );
-bool ScheduleEvent::loadXML( const QDomElement & top )
+bool ScheduleEvent::loadXML( const TQDomElement & top )
{
if ( top.tagName() != "ScheduleEvent" ) {
qWarning( "XML error: Top tag was %s instead of the expected event",
@@ -112,11 +112,11 @@ bool ScheduleEvent::loadXML( const QDomElement & top )
mCrid = top.attribute( "serviceId" );
- for ( QDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
loadAttribute( e );
} else
qWarning( "Node is not a comment or an element???" );
@@ -124,26 +124,26 @@ bool ScheduleEvent::loadXML( const QDomElement & top )
return true;
}
-bool ScheduleEvent::loadAttribute( const QDomElement& element )
+bool ScheduleEvent::loadAttribute( const TQDomElement& element )
{
- QString tagName = element.tagName();
+ TQString tagName = element.tagName();
if ( tagName == "ProgramURL" ) {
- QDomNode cn = element.firstChild();
- QDomText t = cn.toText();
+ TQDomNode cn = element.firstChild();
+ TQDomText t = cn.toText();
mUrl = t.data();
}
else if ( tagName == "Program" ) {
mCrid = element.attribute( "crid" );
}
else if ( tagName == "PublishedStartTime" ) {
- QDomNode cn = element.firstChild();
- QDomText t = cn.toText();
- mStartTime = QDateTime::fromString( t.data(), Qt::ISODate );
+ TQDomNode cn = element.firstChild();
+ TQDomText t = cn.toText();
+ mStartTime = TQDateTime::fromString( t.data(), Qt::ISODate );
}
else if ( tagName == "PublishedDuration" ) {
- QDomNode cn = element.firstChild();
- QDomText t = cn.toText();
- QString duration = t.data();
+ TQDomNode cn = element.firstChild();
+ TQDomText t = cn.toText();
+ TQString duration = t.data();
if ( sRegExp.search( duration ) != -1 )
{
mDuration = 0;
@@ -160,13 +160,13 @@ ProgramInformationMap Service::programmeInformation() const
return mProgInfo;
}
-ProgramInformation::ProgramInformation( const QString & title, const QString &synopsis )
+ProgramInformation::ProgramInformation( const TQString & title, const TQString &synopsis )
: mTitle( title ), mSynopsis( synopsis )
{
}
-bool ProgramInformation::loadXML( const QDomElement & top )
+bool ProgramInformation::loadXML( const TQDomElement & top )
{
if ( top.tagName() != "ProgramInformation" ) {
qWarning( "XML error: Top tag was %s instead of the expected program information",
@@ -176,18 +176,18 @@ bool ProgramInformation::loadXML( const QDomElement & top )
setId( top.attribute( "programId" ) );
- for ( QDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = top.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
if ( e.tagName() == "BasicDescription" )
{
- for ( QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ for ( TQDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling() ) {
if ( n.isComment() )
continue;
if ( n.isElement() ) {
- QDomElement e = n.toElement();
+ TQDomElement e = n.toElement();
loadAttribute( e );
}
}
@@ -198,25 +198,25 @@ bool ProgramInformation::loadXML( const QDomElement & top )
return true;
}
-bool ProgramInformation::loadAttribute( const QDomElement& element )
+bool ProgramInformation::loadAttribute( const TQDomElement& element )
{
- QString tagName = element.tagName();
+ TQString tagName = element.tagName();
if ( tagName == "Title" ) {
- QDomNode cn = element.firstChild();
- QDomText t = cn.toText();
+ TQDomNode cn = element.firstChild();
+ TQDomText t = cn.toText();
mTitle = t.data();
}
else if ( tagName == "Synopsis" ) {
- QDomNode cn = element.firstChild();
- QDomText t = cn.toText();
+ TQDomNode cn = element.firstChild();
+ TQDomText t = cn.toText();
mSynopsis = t.data();
}
else if ( tagName == "Genre" ) {
- QDomNode name = element.firstChild();
- QDomElement nameElem = name.toElement();
+ TQDomNode name = element.firstChild();
+ TQDomElement nameElem = name.toElement();
if ( nameElem.tagName() == "Name" ) {
- QDomNode cn = nameElem.firstChild();
- QDomText t = cn.toText();
+ TQDomNode cn = nameElem.firstChild();
+ TQDomText t = cn.toText();
mGenres.append( t.data() );
}
}
diff --git a/kresources/tvanytime/service.h b/kresources/tvanytime/service.h
index 4df8841da..78570fe1f 100644
--- a/kresources/tvanytime/service.h
+++ b/kresources/tvanytime/service.h
@@ -21,90 +21,90 @@
#ifndef SERVICE_H
#define SERVICE_H
-#include <qdatetime.h>
-#include <qdom.h>
-#include <qmap.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqdatetime.h>
+#include <tqdom.h>
+#include <tqmap.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kurl.h>
class ProgramInformation {
public:
ProgramInformation() {}
- ProgramInformation( const QString & title, const QString &synopsis );
+ ProgramInformation( const TQString & title, const TQString &synopsis );
virtual ~ProgramInformation() {}
- QString id() const { return mId; }
- QString title() const { return mTitle; }
- QString synopsis() const { return mSynopsis; }
- QStringList genres() const { return mGenres; }
+ TQString id() const { return mId; }
+ TQString title() const { return mTitle; }
+ TQString synopsis() const { return mSynopsis; }
+ TQStringList genres() const { return mGenres; }
- void setId ( const QString & id ) { mId = id; }
- void setGenres( const QStringList & genres ) { mGenres = genres; }
- bool loadXML( const QDomElement & );
- bool loadAttribute( const QDomElement& element );
+ void setId ( const TQString & id ) { mId = id; }
+ void setGenres( const TQStringList & genres ) { mGenres = genres; }
+ bool loadXML( const TQDomElement & );
+ bool loadAttribute( const TQDomElement& element );
private:
- QString mId;
- QString mTitle;
- QString mSynopsis;
- QStringList mGenres;
+ TQString mId;
+ TQString mTitle;
+ TQString mSynopsis;
+ TQStringList mGenres;
};
-typedef QMap< QString, ProgramInformation > ProgramInformationMap;
+typedef TQMap< TQString, ProgramInformation > ProgramInformationMap;
class ScheduleEvent {
public:
ScheduleEvent() {}
virtual ~ScheduleEvent() {}
- QString crid() const { return mCrid; }
- QDateTime startTime() const { return mStartTime; }
+ TQString crid() const { return mCrid; }
+ TQDateTime startTime() const { return mStartTime; }
uint duration() const { return mDuration; }
- QString programUrl() const { return mUrl; }
+ TQString programUrl() const { return mUrl; }
- bool loadXML( const QDomElement & );
- bool loadAttribute( const QDomElement& element );
+ bool loadXML( const TQDomElement & );
+ bool loadAttribute( const TQDomElement& element );
private:
- QString mCrid;
- QString mUrl;
- QDateTime mStartTime;
+ TQString mCrid;
+ TQString mUrl;
+ TQDateTime mStartTime;
uint mDuration;
- static QRegExp sRegExp;
+ static TQRegExp sRegExp;
};
class Service {
public:
Service();
- Service( bool active, const QString & name, const QString & owner, const KURL & serviceUrl, const KURL & logo, const QStringList & genres );
+ Service( bool active, const TQString & name, const TQString & owner, const KURL & serviceUrl, const KURL & logo, const TQStringList & genres );
virtual ~Service() {}
- void setId( const QString & id ) { mId = id; }
+ void setId( const TQString & id ) { mId = id; }
void setActive( bool active );
- void setName( const QString& name );
+ void setName( const TQString& name );
void setProgramInformation( const ProgramInformationMap & map );
- QString id() const { return mId; }
+ TQString id() const { return mId; }
bool active() const;
- QString name() const;
+ TQString name() const;
ProgramInformationMap programmeInformation() const;
- bool loadXML( const QDomElement & );
- bool loadDescription( const QDomElement & );
- bool loadAttribute( const QDomElement& element );
+ bool loadXML( const TQDomElement & );
+ bool loadDescription( const TQDomElement & );
+ bool loadAttribute( const TQDomElement& element );
private:
- QString mId;
+ TQString mId;
bool mActive;
- QString mName;
- QString mOwner;
+ TQString mName;
+ TQString mOwner;
KURL mServiceUrl;
KURL mLogo;
- QStringList mGenres;
+ TQStringList mGenres;
ProgramInformationMap mProgInfo;
};