From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kalarm/calendarcompat.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kalarm/calendarcompat.cpp') diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp index f0a34919..134436a2 100644 --- a/kalarm/calendarcompat.cpp +++ b/kalarm/calendarcompat.cpp @@ -76,31 +76,31 @@ void CalendarCompat::fix(KCal::Calendar& calendar, const TQString& localFile) */ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVersion) { - subVersion = TQString::null; + subVersion = TQString(); const TQString& prodid = calendar.productId(); // Find the KAlarm identifier TQString progname = TQString::tqfromLatin1(" KAlarm "); - int i = prodid.find(progname, 0, false); + int i = prodid.tqfind(progname, 0, false); if (i < 0) { // Older versions used KAlarm's translated name in the product ID, which // could have created problems using a calendar in different locales. progname = TQString(" ") + kapp->aboutData()->programName() + ' '; - i = prodid.find(progname, 0, false); + i = prodid.tqfind(progname, 0, false); if (i < 0) return 0; // calendar wasn't created by KAlarm } // Extract the KAlarm version string TQString ver = prodid.mid(i + progname.length()).stripWhiteSpace(); - i = ver.find('/'); - int j = ver.find(' '); + i = ver.tqfind('/'); + int j = ver.tqfind(' '); if (j >= 0 && j < i) i = j; if (i <= 0) return 0; // missing version string - ver = ver.left(i); // ver now tqcontains the KAlarm version string + ver = ver.left(i); // ver now contains the KAlarm version string if (ver == KAlarm::currentCalendarVersionString()) return 0; // the calendar is in the current KAlarm format return KAlarm::getVersionNumber(ver, &subVersion); @@ -114,7 +114,7 @@ int CalendarCompat::readKAlarmVersion(KCal::Calendar& calendar, TQString& subVer */ bool CalendarCompat::isUTC(const TQString& localFile) { - // Read the calendar file into a QString + // Read the calendar file into a TQString TQFile file(localFile); if (!file.open(IO_ReadOnly)) return false; -- cgit v1.2.3