From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kalarm/kalarmd/adcalendar.cpp | 2 +- kalarm/kalarmd/adconfigdata.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kalarm/kalarmd') diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp index 2752a3689..e1f0823ae 100644 --- a/kalarm/kalarmd/adcalendar.cpp +++ b/kalarm/kalarmd/adcalendar.cpp @@ -51,7 +51,7 @@ ADCalendar::ADCalendar(const TQString& url, const TQCString& appname) kdError(5900) << "ADCalendar::ADCalendar(" << url << "): calendar already exists" << endl; assert(0); } - mUrlIndex = mCalendarUrls.findIndex(url); // get unique index for this URL + mUrlIndex = mCalendarUrls.tqfindIndex(url); // get unique index for this URL if (mUrlIndex < 0) { mUrlIndex = static_cast(mCalendarUrls.count()); diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp index 68344fa28..9f471e4da 100644 --- a/kalarm/kalarmd/adconfigdata.cpp +++ b/kalarm/kalarmd/adconfigdata.cpp @@ -104,7 +104,7 @@ void ADConfigData::writeClient(const TQCString& appName, const ClientInfo* cinfo KConfig* config = KGlobal::config(); config->setGroup(CLIENT_GROUP + TQString::fromLocal8Bit(appName)); config->writeEntry(TITLE_KEY, cinfo->title()); - config->writeEntry(DCOP_OBJECT_KEY, TQString::fromLocal8Bit(cinfo->dcopObject())); + config->writeEntry(DCOP_OBJECT_KEY, TQString(TQString::fromLocal8Bit(cinfo->dcopObject()))); config->writeEntry(START_CLIENT_KEY, cinfo->startClient()); config->writePathEntry(CALENDAR_KEY, cinfo->calendar()->urlString()); config->sync(); -- cgit v1.2.1