summaryrefslogtreecommitdiffstats
path: root/libkcal
diff options
context:
space:
mode:
Diffstat (limited to 'libkcal')
-rw-r--r--libkcal/calendar.h2
-rw-r--r--libkcal/calendarresources.cpp20
-rw-r--r--libkcal/calendarresources.h2
-rw-r--r--libkcal/calhelper.cpp2
-rw-r--r--libkcal/calselectdialog.cpp8
-rw-r--r--libkcal/icalformatimpl.cpp15
-rw-r--r--libkcal/incidenceformatter.cpp2
-rw-r--r--libkcal/resourcecached.cpp4
-rw-r--r--libkcal/resourcecached.h2
-rw-r--r--libkcal/resourcecachedconfig.cpp12
-rw-r--r--libkcal/resourcecachedconfig.h4
-rw-r--r--libkcal/resourcecalendar.h2
-rw-r--r--libkcal/resourcelocal.cpp12
-rw-r--r--libkcal/resourcelocal.h2
-rw-r--r--libkcal/resourcelocalconfig.cpp2
-rw-r--r--libkcal/resourcelocalconfig.h2
-rw-r--r--libkcal/resourcelocaldir.cpp12
-rw-r--r--libkcal/resourcelocaldir.h2
-rw-r--r--libkcal/resourcelocaldirconfig.h2
-rw-r--r--libkcal/tests/testresource.h2
20 files changed, 51 insertions, 60 deletions
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index eeccff92..2c76832e 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -169,7 +169,7 @@ enum JournalSortField
class LIBKCAL_EXPORT Calendar : public TQObject, public CustomProperties,
public IncidenceBase::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp
index bfc493ba..2787a89c 100644
--- a/libkcal/calendarresources.cpp
+++ b/libkcal/calendarresources.cpp
@@ -131,8 +131,8 @@ void CalendarResources::init( const TQString &family )
mDestinationPolicy = mStandardPolicy;
mPendingDeleteFromResourceMap = false;
- connect( this, TQT_SIGNAL(batchAddingBegins()), this, TQT_SLOT(beginAddingIncidences()) );
- connect( this, TQT_SIGNAL(batchAddingEnds()), this, TQT_SLOT(endAddingIncidences()) );
+ connect( this, TQ_SIGNAL(batchAddingBegins()), this, TQ_SLOT(beginAddingIncidences()) );
+ connect( this, TQ_SIGNAL(batchAddingEnds()), this, TQ_SLOT(endAddingIncidences()) );
}
CalendarResources::~CalendarResources()
@@ -756,17 +756,17 @@ Journal::List CalendarResources::rawJournalsForDate( const TQDate &date )
void CalendarResources::connectResource( ResourceCalendar *resource )
{
- connect( resource, TQT_SIGNAL( resourceChanged( ResourceCalendar * ) ),
- TQT_SIGNAL( calendarChanged() ) );
- connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ),
- TQT_SIGNAL( calendarSaved() ) );
+ connect( resource, TQ_SIGNAL( resourceChanged( ResourceCalendar * ) ),
+ TQ_SIGNAL( calendarChanged() ) );
+ connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ),
+ TQ_SIGNAL( calendarSaved() ) );
- connect( resource, TQT_SIGNAL( resourceLoadError( ResourceCalendar *,
+ connect( resource, TQ_SIGNAL( resourceLoadError( ResourceCalendar *,
const TQString & ) ),
- TQT_SLOT( slotLoadError( ResourceCalendar *, const TQString & ) ) );
- connect( resource, TQT_SIGNAL( resourceSaveError( ResourceCalendar *,
+ TQ_SLOT( slotLoadError( ResourceCalendar *, const TQString & ) ) );
+ connect( resource, TQ_SIGNAL( resourceSaveError( ResourceCalendar *,
const TQString & ) ),
- TQT_SLOT( slotSaveError( ResourceCalendar *, const TQString & ) ) );
+ TQ_SLOT( slotSaveError( ResourceCalendar *, const TQString & ) ) );
}
ResourceCalendar *CalendarResources::resource( Incidence *incidence )
diff --git a/libkcal/calendarresources.h b/libkcal/calendarresources.h
index bb756f85..20d5850c 100644
--- a/libkcal/calendarresources.h
+++ b/libkcal/calendarresources.h
@@ -65,7 +65,7 @@ class LIBKCAL_EXPORT CalendarResources :
public Calendar,
public KRES::ManagerObserver<ResourceCalendar>
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/libkcal/calhelper.cpp b/libkcal/calhelper.cpp
index 89a67fb3..b7816675 100644
--- a/libkcal/calhelper.cpp
+++ b/libkcal/calhelper.cpp
@@ -162,6 +162,6 @@ TQPair<ResourceCalendar *, TQString> CalHelper::incSubResourceCalendar( Calendar
if ( res && res->canHaveSubresources() ) {
subRes = res->subresourceIdentifier( incidence );
}
- p = tqMakePair( res, subRes );
+ p = qMakePair( res, subRes );
return p;
}
diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp
index b72a1627..c2a7f897 100644
--- a/libkcal/calselectdialog.cpp
+++ b/libkcal/calselectdialog.cpp
@@ -65,10 +65,10 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label
mListBox->ensureCurrentVisible();
layout->addWidget( mListBox, 10 );
- connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),
- TQT_SLOT(slotOk()) );
- connect( mListBox, TQT_SIGNAL(returnPressed(TQListBoxItem *)),
- TQT_SLOT(slotOk()) );
+ connect( mListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem *)),
+ TQ_SLOT(slotOk()) );
+ connect( mListBox, TQ_SIGNAL(returnPressed(TQListBoxItem *)),
+ TQ_SLOT(slotOk()) );
mListBox->setFocus();
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index e4296bce..d8fe62df 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -69,15 +69,6 @@ static void _dumpIcaltime( const icaltimetype& t)
}
*/
-static TQString quoteForParam( const TQString &text )
-{
- TQString tmp = text;
- tmp.remove( '"' );
- if ( tmp.contains( ';' ) || tmp.contains( ':' ) || tmp.contains( ',' ) )
- return tmp; // libical quotes in this case already, see icalparameter_as_ical_string()
- return TQString::fromLatin1( "\"" ) + tmp + TQString::fromLatin1( "\"" );
-}
-
const int gSecondsPerMinute = 60;
const int gSecondsPerHour = gSecondsPerMinute * 60;
const int gSecondsPerDay = gSecondsPerHour * 24;
@@ -576,7 +567,7 @@ icalproperty *ICalFormatImpl::writeOrganizer( const Person &organizer )
icalproperty *p = icalproperty_new_organizer("MAILTO:" + organizer.email().utf8());
if (!organizer.name().isEmpty()) {
- icalproperty_add_parameter( p, icalparameter_new_cn(quoteForParam(organizer.name()).utf8()) );
+ icalproperty_add_parameter( p, icalparameter_new_cn(organizer.name().utf8()) );
}
// TODO: Write dir, sent-by and language
@@ -589,7 +580,7 @@ icalproperty *ICalFormatImpl::writeAttendee(Attendee *attendee)
icalproperty *p = icalproperty_new_attendee("mailto:" + attendee->email().utf8());
if (!attendee->name().isEmpty()) {
- icalproperty_add_parameter(p,icalparameter_new_cn(quoteForParam(attendee->name()).utf8()));
+ icalproperty_add_parameter(p,icalparameter_new_cn(attendee->name().utf8()));
}
@@ -869,7 +860,7 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm)
for (TQValueList<Person>::Iterator ad = addresses.begin(); ad != addresses.end(); ++ad) {
icalproperty *p = icalproperty_new_attendee("MAILTO:" + (*ad).email().utf8());
if (!(*ad).name().isEmpty()) {
- icalproperty_add_parameter(p,icalparameter_new_cn(quoteForParam((*ad).name()).utf8()));
+ icalproperty_add_parameter(p,icalparameter_new_cn((*ad).name().utf8()));
}
icalcomponent_add_property(a,p);
}
diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp
index da3a7aae..785a681b 100644
--- a/libkcal/incidenceformatter.cpp
+++ b/libkcal/incidenceformatter.cpp
@@ -2837,7 +2837,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef )
ICalFormat calFormat;
Event* event = new Event();
- if( parser.openDevice( &TQT_TQIODEVICE_OBJECT(buf) ) ) {
+ if( parser.openDevice( &buf ) ) {
KTNEFMessage* tnefMsg = parser.message();
//TQMap<int,KTNEFProperty*> props = parser.message()->properties();
diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp
index 38110431..dcd161ce 100644
--- a/libkcal/resourcecached.cpp
+++ b/libkcal/resourcecached.cpp
@@ -55,8 +55,8 @@ ResourceCached::ResourceCached( const TDEConfig* config )
mSavePolicy( SaveNever ), mSaveInterval( 10 ),
mSaveTimer( 0, "mSaveTimer" ), mIdMapper( "kcal/uidmaps/" )
{
- connect( &mReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotReload() ) );
- connect( &mSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSave() ) );
+ connect( &mReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotReload() ) );
+ connect( &mSaveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSave() ) );
}
ResourceCached::~ResourceCached()
diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h
index f890d265..6fc30a1c 100644
--- a/libkcal/resourcecached.h
+++ b/libkcal/resourcecached.h
@@ -45,7 +45,7 @@ namespace KCal {
class KDE_EXPORT ResourceCached : public ResourceCalendar,
public KCal::Calendar::Observer
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp
index ee43f711..6d6ada34 100644
--- a/libkcal/resourcecachedconfig.cpp
+++ b/libkcal/resourcecachedconfig.cpp
@@ -41,15 +41,15 @@ ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *parent,
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- mGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Reload"), this );
+ mGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Reload"), this );
topLayout->addWidget( mGroup );
new TQRadioButton( i18n("Never"), mGroup );
new TQRadioButton( i18n("On startup"), mGroup );
TQRadioButton *intervalRadio = new TQRadioButton( i18n("Regular interval"),
mGroup );
- connect( intervalRadio, TQT_SIGNAL( stateChanged( int ) ),
- TQT_SLOT( slotIntervalStateChanged( int ) ) );
+ connect( intervalRadio, TQ_SIGNAL( stateChanged( int ) ),
+ TQ_SLOT( slotIntervalStateChanged( int ) ) );
TQHBox *intervalBox = new TQHBox( mGroup );
new TQLabel( i18n("Interval in minutes"), intervalBox );
mIntervalSpin = new TQSpinBox( 1,900, 1,intervalBox );
@@ -81,15 +81,15 @@ ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *parent,
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
- mGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Save"), this );
+ mGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Save"), this );
topLayout->addWidget( mGroup );
new TQRadioButton( i18n("Never"), mGroup );
new TQRadioButton( i18n("On exit"), mGroup );
TQRadioButton *intervalRadio = new TQRadioButton( i18n("Regular interval"),
mGroup );
- connect( intervalRadio, TQT_SIGNAL( stateChanged( int ) ),
- TQT_SLOT( slotIntervalStateChanged( int ) ) );
+ connect( intervalRadio, TQ_SIGNAL( stateChanged( int ) ),
+ TQ_SLOT( slotIntervalStateChanged( int ) ) );
TQHBox *intervalBox = new TQHBox( mGroup );
new TQLabel( i18n("Interval in minutes"), intervalBox );
mIntervalSpin = new TQSpinBox( 1,900, 1,intervalBox );
diff --git a/libkcal/resourcecachedconfig.h b/libkcal/resourcecachedconfig.h
index de63c2b6..81e4ee8e 100644
--- a/libkcal/resourcecachedconfig.h
+++ b/libkcal/resourcecachedconfig.h
@@ -38,7 +38,7 @@ class ResourceCached;
*/
class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceCachedReloadConfig( TQWidget *parent = 0, const char *name = 0 );
@@ -65,7 +65,7 @@ class KDE_EXPORT ResourceCachedReloadConfig : public TQWidget
*/
class KDE_EXPORT ResourceCachedSaveConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceCachedSaveConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index ebb6a8b9..e4c97b5c 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -56,7 +56,7 @@ class CalFormat;
*/
class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceCalendar( const TDEConfig * );
diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp
index a193b0b7..7651daf5 100644
--- a/libkcal/resourcelocal.cpp
+++ b/libkcal/resourcelocal.cpp
@@ -111,12 +111,12 @@ void ResourceLocal::init()
setSavePolicy( SaveDelayed );
- connect( &mDirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
- TQT_SLOT( reload() ) );
- connect( &mDirWatch, TQT_SIGNAL( created( const TQString & ) ),
- TQT_SLOT( reload() ) );
- connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ),
- TQT_SLOT( reload() ) );
+ connect( &mDirWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+ TQ_SLOT( reload() ) );
+ connect( &mDirWatch, TQ_SIGNAL( created( const TQString & ) ),
+ TQ_SLOT( reload() ) );
+ connect( &mDirWatch, TQ_SIGNAL( deleted( const TQString & ) ),
+ TQ_SLOT( reload() ) );
mLock = new TDEABC::Lock( mURL.path() );
diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h
index 5b47d5ea..1ef4cf01 100644
--- a/libkcal/resourcelocal.h
+++ b/libkcal/resourcelocal.h
@@ -44,7 +44,7 @@ class CalFormat;
*/
class LIBKCAL_EXPORT ResourceLocal : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
friend class ResourceLocalConfig;
diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp
index ccba0328..0999aaae 100644
--- a/libkcal/resourcelocalconfig.cpp
+++ b/libkcal/resourcelocalconfig.cpp
@@ -51,7 +51,7 @@ ResourceLocalConfig::ResourceLocalConfig( TQWidget* parent, const char* name )
mainLayout->addWidget( label, 1, 0 );
mainLayout->addWidget( mURL, 1, 1 );
- formatGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Calendar Format" ), this );
+ formatGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Calendar Format" ), this );
icalButton = new TQRadioButton( i18n("iCalendar"), formatGroup );
vcalButton = new TQRadioButton( i18n("vCalendar"), formatGroup );
diff --git a/libkcal/resourcelocalconfig.h b/libkcal/resourcelocalconfig.h
index d8b0c6c1..2bb732ee 100644
--- a/libkcal/resourcelocalconfig.h
+++ b/libkcal/resourcelocalconfig.h
@@ -41,7 +41,7 @@ namespace KCal {
*/
class LIBKCAL_EXPORT ResourceLocalConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceLocalConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp
index 33fa42f7..0c22cae5 100644
--- a/libkcal/resourcelocaldir.cpp
+++ b/libkcal/resourcelocaldir.cpp
@@ -92,12 +92,12 @@ void ResourceLocalDir::init()
setSavePolicy( SaveDelayed );
- connect( &mDirWatch, TQT_SIGNAL( dirty( const TQString & ) ),
- TQT_SLOT( reload( const TQString & ) ) );
- connect( &mDirWatch, TQT_SIGNAL( created( const TQString & ) ),
- TQT_SLOT( reload( const TQString & ) ) );
- connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ),
- TQT_SLOT( reload( const TQString & ) ) );
+ connect( &mDirWatch, TQ_SIGNAL( dirty( const TQString & ) ),
+ TQ_SLOT( reload( const TQString & ) ) );
+ connect( &mDirWatch, TQ_SIGNAL( created( const TQString & ) ),
+ TQ_SLOT( reload( const TQString & ) ) );
+ connect( &mDirWatch, TQ_SIGNAL( deleted( const TQString & ) ),
+ TQ_SLOT( reload( const TQString & ) ) );
mLock = new TDEABC::Lock( mURL.path() );
diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h
index 2f1bbec3..de7d35b2 100644
--- a/libkcal/resourcelocaldir.h
+++ b/libkcal/resourcelocaldir.h
@@ -44,7 +44,7 @@ class Incidence;
*/
class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached
{
- Q_OBJECT
+ TQ_OBJECT
friend class ResourceLocalDirConfig;
diff --git a/libkcal/resourcelocaldirconfig.h b/libkcal/resourcelocaldirconfig.h
index 46994ef4..a6538acd 100644
--- a/libkcal/resourcelocaldirconfig.h
+++ b/libkcal/resourcelocaldirconfig.h
@@ -43,7 +43,7 @@ namespace KCal {
*/
class LIBKCAL_EXPORT ResourceLocalDirConfig : public KRES::ConfigWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ResourceLocalDirConfig( TQWidget *parent = 0, const char *name = 0 );
diff --git a/libkcal/tests/testresource.h b/libkcal/tests/testresource.h
index 4d17c7b4..8e5cb04c 100644
--- a/libkcal/tests/testresource.h
+++ b/libkcal/tests/testresource.h
@@ -28,7 +28,7 @@ namespace KCal {
class TestResource : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 03:38:59 +0000