diff options
Diffstat (limited to 'kresources/caldav')
-rw-r--r-- | kresources/caldav/config.cpp | 4 | ||||
-rw-r--r-- | kresources/caldav/config.h | 3 | ||||
-rw-r--r-- | kresources/caldav/configwidgets.cpp | 12 | ||||
-rw-r--r-- | kresources/caldav/configwidgets.h | 14 | ||||
-rw-r--r-- | kresources/caldav/job.cpp | 4 | ||||
-rw-r--r-- | kresources/caldav/job.h | 6 | ||||
-rw-r--r-- | kresources/caldav/preferences.cpp | 18 | ||||
-rw-r--r-- | kresources/caldav/resource.cpp | 10 | ||||
-rw-r--r-- | kresources/caldav/resource.h | 1 |
9 files changed, 38 insertions, 34 deletions
diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp index d6b9fdc7b..c86cdd1ab 100644 --- a/kresources/caldav/config.cpp +++ b/kresources/caldav/config.cpp @@ -70,8 +70,8 @@ CalDavPrefs* ResourceCalDavConfig::getPrefs(ResourceCalDav* res) { | CONSTRUCTOR / DESTRUCTOR ========================================================================*/ -ResourceCalDavConfig::ResourceCalDavConfig( TQWidget *parent ) - : KRES::ConfigWidget( parent ) +ResourceCalDavConfig::ResourceCalDavConfig( TQWidget *tqparent ) + : KRES::ConfigWidget( tqparent ) { setupUI(); } diff --git a/kresources/caldav/config.h b/kresources/caldav/config.h index 780674281..ccda9234b 100644 --- a/kresources/caldav/config.h +++ b/kresources/caldav/config.h @@ -40,10 +40,11 @@ class CalDavSaveConfig; class KDE_EXPORT ResourceCalDavConfig : public KRES::ConfigWidget { Q_OBJECT + TQ_OBJECT public: - ResourceCalDavConfig(TQWidget *parent = 0); + ResourceCalDavConfig(TQWidget *tqparent = 0); public slots: diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp index 4a7072b5f..e986c3380 100644 --- a/kresources/caldav/configwidgets.cpp +++ b/kresources/caldav/configwidgets.cpp @@ -74,8 +74,8 @@ class CalDavSaveConfig::Private }; //@endcond -CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) - : TQWidget( parent ), d( new KCal::CalDavReloadConfig::Private() ) +CalDavReloadConfig::CalDavReloadConfig( TQWidget *tqparent ) + : TQWidget( tqparent ), d( new KCal::CalDavReloadConfig::Private() ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -113,7 +113,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setRange( 1, 900 ); d->mIntervalSpin->setEnabled( false ); - groupBox->setColumnLayout(1, Qt::Vertical); + groupBox->setColumnLayout(1, TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); @@ -148,8 +148,8 @@ void CalDavReloadConfig::slotIntervalToggled( bool checked ) } } -CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) - : TQWidget( parent ), d( new KCal::CalDavSaveConfig::Private() ) +CalDavSaveConfig::CalDavSaveConfig( TQWidget *tqparent ) + : TQWidget( tqparent ), d( new KCal::CalDavSaveConfig::Private() ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -206,7 +206,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) intervalRadio->hide(); intervalBox->hide(); - groupBox->setColumnLayout(1, Qt::Vertical); + groupBox->setColumnLayout(1, TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout()); vbox->addWidget(delay); vbox->addWidget(every); diff --git a/kresources/caldav/configwidgets.h b/kresources/caldav/configwidgets.h index 64ae78323..2c9dcb6dc 100644 --- a/kresources/caldav/configwidgets.h +++ b/kresources/caldav/configwidgets.h @@ -47,11 +47,12 @@ class ResourceCached; @see ResourceCached */ -class KDE_EXPORT CalDavReloadConfig : public QWidget +class KDE_EXPORT CalDavReloadConfig : public TQWidget { Q_OBJECT + TQ_OBJECT public: - explicit CalDavReloadConfig( TQWidget *parent = 0 ); + explicit CalDavReloadConfig( TQWidget *tqparent = 0 ); ~CalDavReloadConfig(); public slots: void loadSettings( ResourceCached *resource ); @@ -62,7 +63,7 @@ class KDE_EXPORT CalDavReloadConfig : public QWidget private: //@cond PRIVATE - //Q_DISABLE_COPY( CalDavReloadConfig ) + //TQ_DISABLE_COPY( CalDavReloadConfig ) class Private; Private *const d; //@endcond @@ -73,11 +74,12 @@ class KDE_EXPORT CalDavReloadConfig : public QWidget @see ResourceCached */ -class KDE_EXPORT CalDavSaveConfig : public QWidget +class KDE_EXPORT CalDavSaveConfig : public TQWidget { Q_OBJECT + TQ_OBJECT public: - explicit CalDavSaveConfig( TQWidget *parent = 0 ); + explicit CalDavSaveConfig( TQWidget *tqparent = 0 ); ~CalDavSaveConfig(); public slots: @@ -89,7 +91,7 @@ class KDE_EXPORT CalDavSaveConfig : public QWidget private: //@cond PRIVATE - //Q_DISABLE_COPY( CalDavSaveConfig ) + //TQ_DISABLE_COPY( CalDavSaveConfig ) class Private; Private *const d; //@endcond diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp index 8e49041f6..f32864f63 100644 --- a/kresources/caldav/job.cpp +++ b/kresources/caldav/job.cpp @@ -166,8 +166,8 @@ void CalDavJob::run() { // Signal done // 1000 is read, 1001 is write - 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) ) ); + if (type() == 0) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1000) ) ); + if (type() == 1) TQApplication::postEvent ( tqparent(), new TQEvent( static_cast<TQEvent::Type>(1001) ) ); } // EOF ======================================================================== diff --git a/kresources/caldav/job.h b/kresources/caldav/job.h index 7d312d90b..c19f2bf24 100644 --- a/kresources/caldav/job.h +++ b/kresources/caldav/job.h @@ -68,7 +68,7 @@ public: } /** - * Sets the parent qobject. + * Sets the tqparent qobject. */ virtual void setParent(TQObject *s) { mParent = s; @@ -103,9 +103,9 @@ public: } /** - * @return parent object + * @return tqparent object */ - virtual TQObject *parent() { + virtual TQObject *tqparent() { return mParent; } diff --git a/kresources/caldav/preferences.cpp b/kresources/caldav/preferences.cpp index 5259d9877..11de07e98 100644 --- a/kresources/caldav/preferences.cpp +++ b/kresources/caldav/preferences.cpp @@ -218,9 +218,9 @@ TQString CalDavPrefs::getFullUrl() { safeURL = t.toString(); - firstAt = safeURL.find("@") + 1; - while (safeURL.find("@", firstAt) != -1) { - safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40"); + firstAt = safeURL.tqfind("@") + 1; + while (safeURL.tqfind("@", firstAt) != -1) { + safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40"); } // Unencode the username, as Zimbra stupidly rejects the %40 @@ -245,9 +245,9 @@ TQString CalDavPrefs::getFullTasksUrl() { safeURL = t.toString(); - firstAt = safeURL.find("@") + 1; - while (safeURL.find("@", firstAt) != -1) { - safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40"); + firstAt = safeURL.tqfind("@") + 1; + while (safeURL.tqfind("@", firstAt) != -1) { + safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40"); } // Unencode the username, as Zimbra stupidly rejects the %40 @@ -272,9 +272,9 @@ TQString CalDavPrefs::getFullJournalsUrl() { safeURL = t.toString(); - firstAt = safeURL.find("@") + 1; - while (safeURL.find("@", firstAt) != -1) { - safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40"); + firstAt = safeURL.tqfind("@") + 1; + while (safeURL.tqfind("@", firstAt) != -1) { + safeURL.tqreplace(safeURL.tqfind("@", firstAt), 1, "%40"); } // Unencode the username, as Zimbra stupidly rejects the %40 diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp index ea391139f..7d7e2a484 100644 --- a/kresources/caldav/resource.cpp +++ b/kresources/caldav/resource.cpp @@ -246,8 +246,8 @@ void ResourceCalDav::init() { mWriter = new CalDavWriter; // creating jobs - // Qt4 handles this quite differently, as shown below, - // whereas Qt3 needs events (see ::event()) + // TQt4 handles this quite differently, as shown below, + // whereas TQt3 needs events (see ::event()) // connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished())); // connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished())); @@ -726,7 +726,7 @@ TQString ResourceCalDav::getICalString(const Incidence::List& inc) { // Get the iCal header and footer header = ical.toString(&loc); - int location = header.find("END:VCALENDAR", 0, true); + int location = header.tqfind("END:VCALENDAR", 0, true); footer = header.mid(location, 0xffffffff); header.remove("END:VCALENDAR"); @@ -740,8 +740,8 @@ TQString ResourceCalDav::getICalString(const Incidence::List& inc) { data = data + footer; // Remove any line feeds/carriage returns/white spaces from the UID field as they WILL break libcaldav - int uidPos = data.find("UID:", 0) + 4; - int nextPos = data.findRev("\n", data.find(":", uidPos)); + int uidPos = data.tqfind("UID:", 0) + 4; + int nextPos = data.findRev("\n", data.tqfind(":", uidPos)); TQString uidField = data.mid(uidPos, nextPos-uidPos); data.remove(uidPos, nextPos-uidPos); uidField.tqreplace("\n", ""); diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h index 033a19ce4..66eb21d04 100644 --- a/kresources/caldav/resource.h +++ b/kresources/caldav/resource.h @@ -44,6 +44,7 @@ class CalDavWriter; class KDE_EXPORT ResourceCalDav : public ResourceCached { Q_OBJECT + TQ_OBJECT public: |