From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kalarm/dcophandler.cpp | 282 ++++++++++++++++++++++++------------------------- 1 file changed, 141 insertions(+), 141 deletions(-) (limited to 'kalarm/dcophandler.cpp') diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp index ab4105fe6..8c37ffd88 100644 --- a/kalarm/dcophandler.cpp +++ b/kalarm/dcophandler.cpp @@ -46,25 +46,25 @@ static const char* DCOP_OLD_OBJECT_NAME = "display"; =============================================================================*/ DcopHandler::DcopHandler() : DCOPObject(DCOP_OBJECT_NAME), - QWidget() + TQWidget() { kdDebug(5950) << "DcopHandler::DcopHandler()\n"; } -bool DcopHandler::cancelEvent(const QString& url,const QString& eventId) +bool DcopHandler::cancelEvent(const TQString& url,const TQString& eventId) { return theApp()->deleteEvent(url, eventId); } -bool DcopHandler::triggerEvent(const QString& url,const QString& eventId) +bool DcopHandler::triggerEvent(const TQString& url,const TQString& eventId) { return theApp()->triggerEvent(url, eventId); } -bool DcopHandler::scheduleMessage(const QString& message, const QString& startDateTime, int lateCancel, unsigned flags, - const QString& bgColor, const QString& fgColor, const QString& font, - const KURL& audioFile, int reminderMins, const QString& recurrence, +bool DcopHandler::scheduleMessage(const TQString& message, const TQString& startDateTime, int lateCancel, unsigned flags, + const TQString& bgColor, const TQString& fgColor, const TQString& font, + const KURL& audioFile, int reminderMins, const TQString& recurrence, int subRepeatInterval, int subRepeatCount) { DateTime start; @@ -74,8 +74,8 @@ bool DcopHandler::scheduleMessage(const QString& message, const QString& startDa return scheduleMessage(message, start, lateCancel, flags, bgColor, fgColor, font, audioFile, reminderMins, recur, subRepeatInterval, subRepeatCount); } -bool DcopHandler::scheduleMessage(const QString& message, const QString& startDateTime, int lateCancel, unsigned flags, - const QString& bgColor, const QString& fgColor, const QString& font, +bool DcopHandler::scheduleMessage(const TQString& message, const TQString& startDateTime, int lateCancel, unsigned flags, + const TQString& bgColor, const TQString& fgColor, const TQString& font, const KURL& audioFile, int reminderMins, int recurType, int recurInterval, int recurCount) { @@ -86,10 +86,10 @@ bool DcopHandler::scheduleMessage(const QString& message, const QString& startDa return scheduleMessage(message, start, lateCancel, flags, bgColor, fgColor, font, audioFile, reminderMins, recur); } -bool DcopHandler::scheduleMessage(const QString& message, const QString& startDateTime, int lateCancel, unsigned flags, - const QString& bgColor, const QString& fgColor, const QString& font, +bool DcopHandler::scheduleMessage(const TQString& message, const TQString& startDateTime, int lateCancel, unsigned flags, + const TQString& bgColor, const TQString& fgColor, const TQString& font, const KURL& audioFile, int reminderMins, - int recurType, int recurInterval, const QString& endDateTime) + int recurType, int recurInterval, const TQString& endDateTime) { DateTime start; KARecurrence recur; @@ -98,8 +98,8 @@ bool DcopHandler::scheduleMessage(const QString& message, const QString& startDa return scheduleMessage(message, start, lateCancel, flags, bgColor, fgColor, font, audioFile, reminderMins, recur); } -bool DcopHandler::scheduleFile(const KURL& file, const QString& startDateTime, int lateCancel, unsigned flags, const QString& bgColor, - const KURL& audioFile, int reminderMins, const QString& recurrence, +bool DcopHandler::scheduleFile(const KURL& file, const TQString& startDateTime, int lateCancel, unsigned flags, const TQString& bgColor, + const KURL& audioFile, int reminderMins, const TQString& recurrence, int subRepeatInterval, int subRepeatCount) { DateTime start; @@ -109,7 +109,7 @@ bool DcopHandler::scheduleFile(const KURL& file, const QString& startDateTime, i return scheduleFile(file, start, lateCancel, flags, bgColor, audioFile, reminderMins, recur, subRepeatInterval, subRepeatCount); } -bool DcopHandler::scheduleFile(const KURL& file, const QString& startDateTime, int lateCancel, unsigned flags, const QString& bgColor, +bool DcopHandler::scheduleFile(const KURL& file, const TQString& startDateTime, int lateCancel, unsigned flags, const TQString& bgColor, const KURL& audioFile, int reminderMins, int recurType, int recurInterval, int recurCount) { DateTime start; @@ -119,8 +119,8 @@ bool DcopHandler::scheduleFile(const KURL& file, const QString& startDateTime, i return scheduleFile(file, start, lateCancel, flags, bgColor, audioFile, reminderMins, recur); } -bool DcopHandler::scheduleFile(const KURL& file, const QString& startDateTime, int lateCancel, unsigned flags, const QString& bgColor, - const KURL& audioFile, int reminderMins, int recurType, int recurInterval, const QString& endDateTime) +bool DcopHandler::scheduleFile(const KURL& file, const TQString& startDateTime, int lateCancel, unsigned flags, const TQString& bgColor, + const KURL& audioFile, int reminderMins, int recurType, int recurInterval, const TQString& endDateTime) { DateTime start; KARecurrence recur; @@ -129,8 +129,8 @@ bool DcopHandler::scheduleFile(const KURL& file, const QString& startDateTime, i return scheduleFile(file, start, lateCancel, flags, bgColor, audioFile, reminderMins, recur); } -bool DcopHandler::scheduleCommand(const QString& commandLine, const QString& startDateTime, int lateCancel, unsigned flags, - const QString& recurrence, int subRepeatInterval, int subRepeatCount) +bool DcopHandler::scheduleCommand(const TQString& commandLine, const TQString& startDateTime, int lateCancel, unsigned flags, + const TQString& recurrence, int subRepeatInterval, int subRepeatCount) { DateTime start; KARecurrence recur; @@ -139,7 +139,7 @@ bool DcopHandler::scheduleCommand(const QString& commandLine, const QString& sta return scheduleCommand(commandLine, start, lateCancel, flags, recur, subRepeatInterval, subRepeatCount); } -bool DcopHandler::scheduleCommand(const QString& commandLine, const QString& startDateTime, int lateCancel, unsigned flags, +bool DcopHandler::scheduleCommand(const TQString& commandLine, const TQString& startDateTime, int lateCancel, unsigned flags, int recurType, int recurInterval, int recurCount) { DateTime start = convertStartDateTime(startDateTime); @@ -151,8 +151,8 @@ bool DcopHandler::scheduleCommand(const QString& commandLine, const QString& sta return scheduleCommand(commandLine, start, lateCancel, flags, recur); } -bool DcopHandler::scheduleCommand(const QString& commandLine, const QString& startDateTime, int lateCancel, unsigned flags, - int recurType, int recurInterval, const QString& endDateTime) +bool DcopHandler::scheduleCommand(const TQString& commandLine, const TQString& startDateTime, int lateCancel, unsigned flags, + int recurType, int recurInterval, const TQString& endDateTime) { DateTime start; KARecurrence recur; @@ -161,9 +161,9 @@ bool DcopHandler::scheduleCommand(const QString& commandLine, const QString& sta return scheduleCommand(commandLine, start, lateCancel, flags, recur); } -bool DcopHandler::scheduleEmail(const QString& fromID, const QString& addresses, const QString& subject, const QString& message, - const QString& attachments, const QString& startDateTime, int lateCancel, unsigned flags, - const QString& recurrence, int subRepeatInterval, int subRepeatCount) +bool DcopHandler::scheduleEmail(const TQString& fromID, const TQString& addresses, const TQString& subject, const TQString& message, + const TQString& attachments, const TQString& startDateTime, int lateCancel, unsigned flags, + const TQString& recurrence, int subRepeatInterval, int subRepeatCount) { DateTime start; KARecurrence recur; @@ -172,8 +172,8 @@ bool DcopHandler::scheduleEmail(const QString& fromID, const QString& addresses, return scheduleEmail(fromID, addresses, subject, message, attachments, start, lateCancel, flags, recur, subRepeatInterval, subRepeatCount); } -bool DcopHandler::scheduleEmail(const QString& fromID, const QString& addresses, const QString& subject, const QString& message, - const QString& attachments, const QString& startDateTime, int lateCancel, unsigned flags, +bool DcopHandler::scheduleEmail(const TQString& fromID, const TQString& addresses, const TQString& subject, const TQString& message, + const TQString& attachments, const TQString& startDateTime, int lateCancel, unsigned flags, int recurType, int recurInterval, int recurCount) { DateTime start; @@ -183,9 +183,9 @@ bool DcopHandler::scheduleEmail(const QString& fromID, const QString& addresses, return scheduleEmail(fromID, addresses, subject, message, attachments, start, lateCancel, flags, recur); } -bool DcopHandler::scheduleEmail(const QString& fromID, const QString& addresses, const QString& subject, const QString& message, - const QString& attachments, const QString& startDateTime, int lateCancel, unsigned flags, - int recurType, int recurInterval, const QString& endDateTime) +bool DcopHandler::scheduleEmail(const TQString& fromID, const TQString& addresses, const TQString& subject, const TQString& message, + const TQString& attachments, const TQString& startDateTime, int lateCancel, unsigned flags, + int recurType, int recurInterval, const TQString& endDateTime) { DateTime start; KARecurrence recur; @@ -194,12 +194,12 @@ bool DcopHandler::scheduleEmail(const QString& fromID, const QString& addresses, return scheduleEmail(fromID, addresses, subject, message, attachments, start, lateCancel, flags, recur); } -bool DcopHandler::edit(const QString& eventID) +bool DcopHandler::edit(const TQString& eventID) { return KAlarm::edit(eventID); } -bool DcopHandler::editNew(const QString& templateName) +bool DcopHandler::editNew(const TQString& templateName) { return KAlarm::editNew(templateName); } @@ -208,16 +208,16 @@ bool DcopHandler::editNew(const QString& templateName) /****************************************************************************** * Schedule a message alarm, after converting the parameters from strings. */ -bool DcopHandler::scheduleMessage(const QString& message, const DateTime& start, int lateCancel, unsigned flags, - const QString& bgColor, const QString& fgColor, const QString& fontStr, +bool DcopHandler::scheduleMessage(const TQString& message, const DateTime& start, int lateCancel, unsigned flags, + const TQString& bgColor, const TQString& fgColor, const TQString& fontStr, const KURL& audioFile, int reminderMins, const KARecurrence& recurrence, int subRepeatInterval, int subRepeatCount) { unsigned kaEventFlags = convertStartFlags(start, flags); - QColor bg = convertBgColour(bgColor); + TQColor bg = convertBgColour(bgColor); if (!bg.isValid()) return false; - QColor fg; + TQColor fg; if (fgColor.isEmpty()) fg = Preferences::defaultFgColour(); else @@ -229,7 +229,7 @@ bool DcopHandler::scheduleMessage(const QString& message, const DateTime& start, return false; } } - QFont font; + TQFont font; if (fontStr.isEmpty()) kaEventFlags |= KAEvent::DEFAULT_FONT; else @@ -248,35 +248,35 @@ bool DcopHandler::scheduleMessage(const QString& message, const DateTime& start, * Schedule a file alarm, after converting the parameters from strings. */ bool DcopHandler::scheduleFile(const KURL& file, - const DateTime& start, int lateCancel, unsigned flags, const QString& bgColor, + const DateTime& start, int lateCancel, unsigned flags, const TQString& bgColor, const KURL& audioFile, int reminderMins, const KARecurrence& recurrence, int subRepeatInterval, int subRepeatCount) { unsigned kaEventFlags = convertStartFlags(start, flags); - QColor bg = convertBgColour(bgColor); + TQColor bg = convertBgColour(bgColor); if (!bg.isValid()) return false; - return theApp()->scheduleEvent(KAEvent::FILE, file.url(), start.dateTime(), lateCancel, kaEventFlags, bg, Qt::black, QFont(), + return theApp()->scheduleEvent(KAEvent::FILE, file.url(), start.dateTime(), lateCancel, kaEventFlags, bg, Qt::black, TQFont(), audioFile.url(), -1, reminderMins, recurrence, subRepeatInterval, subRepeatCount); } /****************************************************************************** * Schedule a command alarm, after converting the parameters from strings. */ -bool DcopHandler::scheduleCommand(const QString& commandLine, +bool DcopHandler::scheduleCommand(const TQString& commandLine, const DateTime& start, int lateCancel, unsigned flags, const KARecurrence& recurrence, int subRepeatInterval, int subRepeatCount) { unsigned kaEventFlags = convertStartFlags(start, flags); - return theApp()->scheduleEvent(KAEvent::COMMAND, commandLine, start.dateTime(), lateCancel, kaEventFlags, Qt::black, Qt::black, QFont(), - QString::null, -1, 0, recurrence, subRepeatInterval, subRepeatCount); + return theApp()->scheduleEvent(KAEvent::COMMAND, commandLine, start.dateTime(), lateCancel, kaEventFlags, Qt::black, Qt::black, TQFont(), + TQString::null, -1, 0, recurrence, subRepeatInterval, subRepeatCount); } /****************************************************************************** * Schedule an email alarm, after validating the addresses and attachments. */ -bool DcopHandler::scheduleEmail(const QString& fromID, const QString& addresses, const QString& subject, - const QString& message, const QString& attachments, +bool DcopHandler::scheduleEmail(const TQString& fromID, const TQString& addresses, const TQString& subject, + const TQString& message, const TQString& attachments, const DateTime& start, int lateCancel, unsigned flags, const KARecurrence& recurrence, int subRepeatInterval, int subRepeatCount) { @@ -292,7 +292,7 @@ bool DcopHandler::scheduleEmail(const QString& fromID, const QString& addresses, } } EmailAddressList addrs; - QString bad = KAMail::convertAddresses(addresses, addrs); + TQString bad = KAMail::convertAddresses(addresses, addrs); if (!bad.isEmpty()) { kdError(5950) << "DCOP call scheduleEmail(): invalid email addresses: " << bad << endl; @@ -303,15 +303,15 @@ bool DcopHandler::scheduleEmail(const QString& fromID, const QString& addresses, kdError(5950) << "DCOP call scheduleEmail(): no email address\n"; return false; } - QStringList atts; + TQStringList atts; bad = KAMail::convertAttachments(attachments, atts); if (!bad.isEmpty()) { kdError(5950) << "DCOP call scheduleEmail(): invalid email attachment: " << bad << endl; return false; } - return theApp()->scheduleEvent(KAEvent::EMAIL, message, start.dateTime(), lateCancel, kaEventFlags, Qt::black, Qt::black, QFont(), - QString::null, -1, 0, recurrence, subRepeatInterval, subRepeatCount, senderId, addrs, subject, atts); + return theApp()->scheduleEvent(KAEvent::EMAIL, message, start.dateTime(), lateCancel, kaEventFlags, Qt::black, Qt::black, TQFont(), + TQString::null, -1, 0, recurrence, subRepeatInterval, subRepeatCount, senderId, addrs, subject, atts); } @@ -319,18 +319,18 @@ bool DcopHandler::scheduleEmail(const QString& fromID, const QString& addresses, * Convert the start date/time string to a DateTime. The date/time string is in * the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS] */ -DateTime DcopHandler::convertStartDateTime(const QString& startDateTime) +DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime) { DateTime start; if (startDateTime.length() > 10) { // Both a date and a time are specified - start = QDateTime::fromString(startDateTime, Qt::ISODate); + start = TQDateTime::fromString(startDateTime, Qt::ISODate); } else { // Check whether a time is specified - QString t; + TQString t; if (startDateTime[0] == 'T') t = startDateTime.mid(1); // it's a time: remove the leading 'T' else if (!startDateTime[2].isDigit()) @@ -339,12 +339,12 @@ DateTime DcopHandler::convertStartDateTime(const QString& startDateTime) if (t.isEmpty()) { // It's a date - start = QDate::fromString(startDateTime, Qt::ISODate); + start = TQDate::fromString(startDateTime, Qt::ISODate); } else { // It's a time, so use today as the date - start.set(QDate::currentDate(), QTime::fromString(t, Qt::ISODate)); + start.set(TQDate::currentDate(), TQTime::fromString(t, Qt::ISODate)); } } if (!start.isValid()) @@ -374,20 +374,20 @@ unsigned DcopHandler::convertStartFlags(const DateTime& start, unsigned flags) } /****************************************************************************** -* Convert the background colour string to a QColor. +* Convert the background colour string to a TQColor. */ -QColor DcopHandler::convertBgColour(const QString& bgColor) +TQColor DcopHandler::convertBgColour(const TQString& bgColor) { if (bgColor.isEmpty()) return Preferences::defaultBgColour(); - QColor bg(bgColor); + TQColor bg(bgColor); if (!bg.isValid()) kdError(5950) << "DCOP call: invalid background color: " << bgColor << endl; return bg; } bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, - const QString& startDateTime, const QString& icalRecurrence, + const TQString& startDateTime, const TQString& icalRecurrence, int& subRepeatInterval) { start = convertStartDateTime(startDateTime); @@ -403,22 +403,22 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, return true; } -bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, const QString& startDateTime, +bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, const TQString& startDateTime, int recurType, int recurInterval, int recurCount) { start = convertStartDateTime(startDateTime); if (!start.isValid()) return false; - return convertRecurrence(recurrence, start, recurType, recurInterval, recurCount, QDateTime()); + return convertRecurrence(recurrence, start, recurType, recurInterval, recurCount, TQDateTime()); } -bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, const QString& startDateTime, - int recurType, int recurInterval, const QString& endDateTime) +bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, const TQString& startDateTime, + int recurType, int recurInterval, const TQString& endDateTime) { start = convertStartDateTime(startDateTime); if (!start.isValid()) return false; - QDateTime end; + TQDateTime end; if (endDateTime.find('T') < 0) { if (!start.isDateOnly()) @@ -426,7 +426,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c kdError(5950) << "DCOP call: alarm is date-only, but recurrence end is date/time" << endl; return false; } - end.setDate(QDate::fromString(endDateTime, Qt::ISODate)); + end.setDate(TQDate::fromString(endDateTime, Qt::ISODate)); } else { @@ -435,7 +435,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c kdError(5950) << "DCOP call: alarm is timed, but recurrence end is date-only" << endl; return false; } - end = QDateTime::fromString(endDateTime, Qt::ISODate); + end = TQDateTime::fromString(endDateTime, Qt::ISODate); } if (!end.isValid()) { @@ -446,7 +446,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c } bool DcopHandler::convertRecurrence(KARecurrence& recurrence, const DateTime& start, int recurType, - int recurInterval, int recurCount, const QDateTime& end) + int recurInterval, int recurCount, const TQDateTime& end) { KARecurrence::Type type; switch (recurType) @@ -472,7 +472,7 @@ bool DcopHandler::convertRecurrence(KARecurrence& recurrence, const DateTime& st = This class's function is simply to act as a receiver for DCOP requests. =============================================================================*/ DcopHandlerOld::DcopHandlerOld() - : QWidget(), + : TQWidget(), DCOPObject(DCOP_OLD_OBJECT_NAME) { kdDebug(5950) << "DcopHandlerOld::DcopHandlerOld()\n"; @@ -481,7 +481,7 @@ DcopHandlerOld::DcopHandlerOld() /****************************************************************************** * Process a DCOP request. */ -bool DcopHandlerOld::process(const QCString& func, const QByteArray& data, QCString& replyType, QByteArray&) +bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQCString& replyType, TQByteArray&) { kdDebug(5950) << "DcopHandlerOld::process(): " << func << endl; enum @@ -505,127 +505,127 @@ bool DcopHandlerOld::process(const QCString& func, const QByteArray& data, QCStr }; replyType = "void"; int function; - if (func == "handleEvent(const QString&,const QString&)" - || func == "handleEvent(QString,QString)") + if (func == "handleEvent(const TQString&,const TQString&)" + || func == "handleEvent(TQString,TQString)") function = HANDLE; - else if (func == "cancelEvent(const QString&,const QString&)" - || func == "cancelEvent(QString,QString)") + else if (func == "cancelEvent(const TQString&,const TQString&)" + || func == "cancelEvent(TQString,TQString)") function = CANCEL; - else if (func == "triggerEvent(const QString&,const QString&)" - || func == "triggerEvent(QString,QString)") + else if (func == "triggerEvent(const TQString&,const TQString&)" + || func == "triggerEvent(TQString,TQString)") function = TRIGGER; // scheduleMessage(message, dateTime, colour, colourfg, flags, audioURL, reminder, recurrence) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,const QColor&,Q_UINT32,const QString&,Q_INT32,const QString&)" - || func == "scheduleMessage(QString,QDateTime,QColor,QColor,Q_UINT32,QString,Q_UINT32,QString)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,const TQString&)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,Q_UINT32,TQString,Q_UINT32,TQString)") function = SCHEDULE | MESSAGE; // scheduleMessage(message, dateTime, colour, colourfg, font, flags, audioURL, reminder, recurrence) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,const QColor&,const QFont&,Q_UINT32,const QString&,Q_INT32,const QString&)" - || func == "scheduleMessage(QString,QDateTime,QColor,QColor,QFont,Q_UINT32,QString,Q_UINT32,QString)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,const TQFont&,Q_UINT32,const TQString&,Q_INT32,const TQString&)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,TQFont,Q_UINT32,TQString,Q_UINT32,TQString)") function = SCHEDULE | MESSAGE | FONT; // scheduleFile(URL, dateTime, colour, flags, audioURL, reminder, recurrence) - else if (func == "scheduleFile(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,const QString&)" - || func == "scheduleFile(QString,QDateTime,QColor,Q_UINT32,QString,Q_UINT32,QString)") + else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,const TQString&)" + || func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_UINT32,TQString)") function = SCHEDULE | FILE; // scheduleCommand(commandLine, dateTime, flags, recurrence) - else if (func == "scheduleCommand(const QString&,const QDateTime&,Q_UINT32,const QString&)" - || func == "scheduleCommand(QString,QDateTime,Q_UINT32,QString)") + else if (func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,const TQString&)" + || func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,TQString)") function = SCHEDULE | COMMAND; // scheduleEmail(addresses, subject, message, attachments, dateTime, flags, recurrence) - else if (func == "scheduleEmail(const QString&,const QString&,const QString&,const QString&,const QDateTime&,Q_UINT32,const QString&)" - || func == "scheduleEmail(QString,QString,QString,QString,QDateTime,Q_UINT32,QString)") + else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,Q_UINT32,const TQString&)" + || func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,Q_UINT32,TQString)") function = SCHEDULE | EMAIL; // scheduleMessage(message, dateTime, colour, colourfg, flags, audioURL, reminder, recurType, interval, recurCount) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)" - || func == "scheduleMessage(QString,QDateTime,QColor,QColor,Q_UINT32,QString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)") function = SCHEDULE | MESSAGE | REP_COUNT; // scheduleFile(URL, dateTime, colour, flags, audioURL, reminder, recurType, interval, recurCount) - else if (func == "scheduleFile(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)" - || func == "scheduleFile(QString,QDateTime,QColor,Q_UINT32,QString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)") + else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)" + || func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)") function = SCHEDULE | FILE | REP_COUNT; // scheduleCommand(commandLine, dateTime, flags, recurType, interval, recurCount) - else if (func == "scheduleCommand(const QString&,const QDateTime&,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)" - || func == "scheduleCommand(QString,QDateTime,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)") + else if (func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)" + || func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)") function = SCHEDULE | COMMAND | REP_COUNT; // scheduleEmail(addresses, subject, message, attachments, dateTime, flags, recurType, interval, recurCount) - else if (func == "scheduleEmail(const QString&,const QString&,const QString&,const QString&,const QDateTime&,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)" - || func == "scheduleEmail(QString,QString,QString,QString,QDateTime,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)") + else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)" + || func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,Q_INT32)") function = SCHEDULE | EMAIL | REP_COUNT; // scheduleMessage(message, dateTime, colour, colourfg, flags, audioURL, reminder, recurType, interval, endTime) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,Q_INT32,const QDateTime&)" - || func == "scheduleMessage(QString,QDateTime,QColor,QColor,Q_UINT32,QString,Q_INT32,Q_INT32,Q_INT32,QDateTime)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,const TQDateTime&)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,TQDateTime)") function = SCHEDULE | MESSAGE | REP_END; // scheduleFile(URL, dateTime, colour, flags, audioURL, reminder, recurType, interval, endTime) - else if (func == "scheduleFile(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,Q_INT32,const QDateTime&)" - || func == "scheduleFile(QString,QDateTime,QColor,Q_UINT32,QString,Q_INT32,Q_INT32,Q_INT32,QDateTime)") + else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,const TQDateTime&)" + || func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,TQDateTime)") function = SCHEDULE | FILE | REP_END; // scheduleCommand(commandLine, dateTime, flags, recurType, interval, endTime) - else if (func == "scheduleCommand(const QString&,const QDateTime&,Q_UINT32,Q_INT32,Q_INT32,const QDateTime&)" - || func == "scheduleCommand(QString,QDateTime,Q_UINT32,Q_INT32,Q_INT32,QDateTime)") + else if (func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,const TQDateTime&)" + || func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,TQDateTime)") function = SCHEDULE | COMMAND | REP_END; // scheduleEmail(addresses, subject, message, attachments, dateTime, flags, recurType, interval, endTime) - else if (func == "scheduleEmail(const QString&,const QString&,const QString&,const QString&,const QDateTime&,Q_UINT32,Q_INT32,Q_INT32,const QDateTime&)" - || func == "scheduleEmail(QString,QString,QString,QString,QDateTime,Q_UINT32,Q_INT32,Q_INT32,QDateTime)") + else if (func == "scheduleEmail(const TQString&,const TQString&,const TQString&,const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32,const TQDateTime&)" + || func == "scheduleEmail(TQString,TQString,TQString,TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32,TQDateTime)") function = SCHEDULE | EMAIL | REP_END; // Deprecated methods: backwards compatibility with KAlarm pre-0.9.6 // scheduleMessage(message, dateTime, colour, flags, audioURL, reminder, recurrence) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&,Q_INT32,const QString&)" - || func == "scheduleMessage(QString,QDateTime,QColor,Q_UINT32,QString,Q_UINT32,QString)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,const TQString&)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_UINT32,TQString)") function = SCHEDULE | MESSAGE | PRE_096; // scheduleMessage(message, dateTime, colour, font, flags, audioURL, reminder, recurrence) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,const QFont&,Q_UINT32,const QString&,Q_INT32,const QString&)" - || func == "scheduleMessage(QString,QDateTime,QColor,QFont,Q_UINT32,QString,Q_UINT32,QString)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,const TQFont&,Q_UINT32,const TQString&,Q_INT32,const TQString&)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,TQFont,Q_UINT32,TQString,Q_UINT32,TQString)") function = SCHEDULE | MESSAGE | FONT | PRE_096; // scheduleMessage(message, dateTime, colour, flags, audioURL, reminder, recurType, interval, recurCount) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)" - || func == "scheduleMessage(QString,QDateTime,QColor,Q_UINT32,QString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,Q_INT32)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,Q_INT32)") function = SCHEDULE | MESSAGE | REP_COUNT | PRE_096; // scheduleMessage(message, dateTime, colour, flags, audioURL, reminder, recurType, interval, endTime) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,Q_INT32,const QDateTime&)" - || func == "scheduleMessage(QString,QDateTime,QColor,Q_UINT32,QString,Q_INT32,Q_INT32,Q_INT32,QDateTime)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32,const TQDateTime&)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32,TQDateTime)") function = SCHEDULE | MESSAGE | REP_END | PRE_096; // Deprecated methods: backwards compatibility with KAlarm pre-0.9.1 // scheduleMessage(message, dateTime, colour, flags, audioURL) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&)" - || func == "scheduleMessage(QString,QDateTime,QColor,Q_UINT32,QString)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString)") function = SCHEDULE | MESSAGE | PRE_091; // scheduleFile(URL, dateTime, colour, flags, audioURL) - else if (func == "scheduleFile(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&)" - || func == "scheduleFile(QString,QDateTime,QColor,Q_UINT32,QString)") + else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&)" + || func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString)") function = SCHEDULE | FILE | PRE_091; // scheduleMessage(message, dateTime, colour, flags, audioURL, recurType, interval, recurCount) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,Q_INT32)" - || func == "scheduleMessage(QString,QDateTime,QColor,Q_UINT32,QString,Q_INT32,Q_INT32,Q_INT32)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32)") function = SCHEDULE | MESSAGE | REP_COUNT | PRE_091; // scheduleFile(URL, dateTime, colour, flags, audioURL, recurType, interval, recurCount) - else if (func == "scheduleFile(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,Q_INT32)" - || func == "scheduleFile(QString,QDateTime,QColor,Q_UINT32,QString,Q_INT32,Q_INT32,Q_INT32)") + else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,Q_INT32)" + || func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,Q_INT32)") function = SCHEDULE | FILE | REP_COUNT | PRE_091; // scheduleMessage(message, dateTime, colour, flags, audioURL, recurType, interval, endTime) - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,const QDateTime&)" - || func == "scheduleMessage(QString,QDateTime,QColor,Q_UINT32,QString,Q_INT32,Q_INT32,QDateTime)") + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,const TQDateTime&)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,TQDateTime)") function = SCHEDULE | MESSAGE | REP_END | PRE_091; // scheduleFile(URL, dateTime, colour, flags, audioURL, recurType, interval, endTime) - else if (func == "scheduleFile(const QString&,const QDateTime&,const QColor&,Q_UINT32,const QString&,Q_INT32,Q_INT32,const QDateTime&)" - || func == "scheduleFile(QString,QDateTime,QColor,Q_UINT32,QString,Q_INT32,Q_INT32,QDateTime)") + else if (func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,const TQString&,Q_INT32,Q_INT32,const TQDateTime&)" + || func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,TQString,Q_INT32,Q_INT32,TQDateTime)") function = SCHEDULE | FILE | REP_END | PRE_091; // Obsolete methods: backwards compatibility with KAlarm pre-0.7 - else if (func == "scheduleMessage(const QString&,const QDateTime&,const QColor&,Q_UINT32,Q_INT32,Q_INT32)" - || func == "scheduleMessage(QString,QDateTime,QColor,Q_UINT32,Q_INT32,Q_INT32)" - || func == "scheduleFile(const QString&,const QDateTime&,const QColor&,Q_UINT32,Q_INT32,Q_INT32)" - || func == "scheduleFile(QString,QDateTime,QColor,Q_UINT32,Q_INT32,Q_INT32)" - || func == "scheduleCommand(const QString&,const QDateTime&,Q_UINT32,Q_INT32,Q_INT32)" - || func == "scheduleCommand(QString,QDateTime,Q_UINT32,Q_INT32,Q_INT32)" + else if (func == "scheduleMessage(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,Q_INT32,Q_INT32)" + || func == "scheduleMessage(TQString,TQDateTime,TQColor,Q_UINT32,Q_INT32,Q_INT32)" + || func == "scheduleFile(const TQString&,const TQDateTime&,const TQColor&,Q_UINT32,Q_INT32,Q_INT32)" + || func == "scheduleFile(TQString,TQDateTime,TQColor,Q_UINT32,Q_INT32,Q_INT32)" + || func == "scheduleCommand(const TQString&,const TQDateTime&,Q_UINT32,Q_INT32,Q_INT32)" + || func == "scheduleCommand(TQString,TQDateTime,Q_UINT32,Q_INT32,Q_INT32)" // Obsolete methods: backwards compatibility with KAlarm pre-0.6 - || func == "cancelMessage(const QString&,const QString&)" - || func == "cancelMessage(QString,QString)" - || func == "displayMessage(const QString&,const QString&)" - || func == "displayMessage(QString,QString)") + || func == "cancelMessage(const TQString&,const TQString&)" + || func == "cancelMessage(TQString,TQString)" + || func == "displayMessage(const TQString&,const TQString&)" + || func == "displayMessage(TQString,TQString)") { kdError(5950) << "DcopHandlerOld::process(): obsolete DCOP function call: '" << func << "'" << endl; return false; @@ -643,8 +643,8 @@ bool DcopHandlerOld::process(const QCString& func, const QByteArray& data, QCStr case TRIGGER: // trigger event with specified ID in calendar file { - QDataStream arg(data, IO_ReadOnly); - QString urlString, vuid; + TQDataStream arg(data, IO_ReadOnly); + TQString urlString, vuid; arg >> urlString >> vuid; switch (function) { @@ -668,24 +668,24 @@ bool DcopHandlerOld::process(const QCString& func, const QByteArray& data, QCStr case EMAIL: action = KAEvent::EMAIL; break; default: return false; } - QDataStream arg(data, IO_ReadOnly); - QString text, audioFile, mailSubject; + TQDataStream arg(data, IO_ReadOnly); + TQString text, audioFile, mailSubject; float audioVolume = -1; EmailAddressList mailAddresses; - QStringList mailAttachments; - QDateTime dateTime, endTime; - QColor bgColour; - QColor fgColour(Qt::black); - QFont font; + TQStringList mailAttachments; + TQDateTime dateTime, endTime; + TQColor bgColour; + TQColor fgColour(Qt::black); + TQFont font; Q_UINT32 flags; int lateCancel = 0; KARecurrence recurrence; Q_INT32 reminderMinutes = 0; if (action == KAEvent::EMAIL) { - QString addresses, attachments; + TQString addresses, attachments; arg >> addresses >> mailSubject >> text >> attachments; - QString bad = KAMail::convertAddresses(addresses, mailAddresses); + TQString bad = KAMail::convertAddresses(addresses, mailAddresses); if (!bad.isEmpty()) { kdError(5950) << "DcopHandlerOld::process(): invalid email addresses: " << bad << endl; @@ -755,7 +755,7 @@ bool DcopHandlerOld::process(const QCString& func, const QByteArray& data, QCStr } else if (!(function & PRE_091)) { - QString rule; + TQString rule; arg >> rule; recurrence.set(rule); } -- cgit v1.2.1