diff options
Diffstat (limited to 'kalarm')
131 files changed, 1161 insertions, 1081 deletions
diff --git a/kalarm/COPYING b/kalarm/COPYING index 54754ab4b..b55fa1466 100644 --- a/kalarm/COPYING +++ b/kalarm/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/kalarm/Changelog b/kalarm/Changelog index a3a1c6590..c76cad450 100644 --- a/kalarm/Changelog +++ b/kalarm/Changelog @@ -142,7 +142,7 @@ KAlarm Change Log - Add context help for sound file fade options. === Version 1.4.5 (KDE 3.5.5) --- 29 September 2006 === -- Improve alarm edit dialogue layout (Reminder controls moved to below Time box). +- Improve alarm edit dialogue tqlayout (Reminder controls moved to below Time box). === Version 1.4.4 --- 11 July 2006 === - Use an alarm's previous deferral time interval as default for its next deferral. @@ -260,8 +260,8 @@ KAlarm Change Log - Align times in alarm list. - Fix crash when the last recurrence of an alarm is reached. - Fix random limit on expired alarm discard time if stepping with spinbox buttons. -- Fix dialog layouts for right-to-left languages. -- Fix time spin box layout for right-to-left languages. +- Fix dialog tqlayouts for right-to-left languages. +- Fix time spin box tqlayout for right-to-left languages. === Version 1.2.2 --- 27 November 2004 === - Make alarm daemon (kalarmd) exclusive to KAlarm. @@ -640,7 +640,7 @@ KAlarm Change Log - Add dialog option to set an alarm's time as an interval from the current time. - Add defer option to alarm message window. - Provide button in alarm message window to activate KAlarm. -- Make dialogs modal only for their parent window. +- Make dialogs modal only for their tqparent window. === Version 0.2 --- 20 October 2001 === - Implement repeating alarms. diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 274bf0c81..2d4e962d5 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -64,7 +64,7 @@ TQString AlarmCalendar::icalProductId() return TQString::tqfromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").arg(KAlarm::currentCalendarVersionString()); } -static const KAEvent::Status eventTypes[AlarmCalendar::NCALS] = { +static const KAEvent::tqStatus eventTypes[AlarmCalendar::NCALS] = { KAEvent::ACTIVE, KAEvent::EXPIRED, KAEvent::DISPLAYING, KAEvent::TEMPLATE }; static const TQString calendarNames[AlarmCalendar::NCALS] = { @@ -83,7 +83,7 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 }; * There are 4 calendars: * 1) A user-independent one containing the active alarms; * 2) A historical one containing expired alarms; -* 3) A user-specific one which tqcontains details of alarms which are currently +* 3) A user-specific one which contains details of alarms which are currently * being displayed to that user and which have not yet been acknowledged; * 4) One containing alarm templates. * Reply = true if success, false if calendar name error. @@ -206,7 +206,7 @@ const KCal::Event* AlarmCalendar::getEvent(const TQString& uniqueID) if (uniqueID.isEmpty()) return 0; CalID calID; - switch (KAEvent::uidStatus(uniqueID)) + switch (KAEvent::uidtqStatus(uniqueID)) { case KAEvent::ACTIVE: calID = ACTIVE; break; case KAEvent::TEMPLATE: calID = TEMPLATE; break; @@ -231,7 +231,7 @@ const KCal::Event* AlarmCalendar::getEvent(const TQString& uniqueID) AlarmCalendar::AlarmCalendar(const TQString& path, CalID type, const TQString& icalPath, const TQString& configKey) : mCalendar(0), - mConfigKey(icalPath.isNull() ? TQString::null : configKey), + mConfigKey(icalPath.isNull() ? TQString() : configKey), mType(eventTypes[type]), mPurgeDays(-1), // default to not purging mOpen(false), @@ -325,7 +325,7 @@ int AlarmCalendar::load() return -1; } kdDebug(5950) << "AlarmCalendar::load(): --- Downloaded to " << tmpFile << endl; - mCalendar->setTimeZoneId(TQString::null); // default to the local time zone for reading + mCalendar->setTimeZoneId(TQString()); // default to the local time zone for reading bool loaded = mCalendar->load(tmpFile); mCalendar->setLocalTime(); // write using local time (i.e. no time zone) if (!loaded) @@ -439,14 +439,14 @@ void AlarmCalendar::close() /****************************************************************************** * Import alarms from an external calendar and merge them into KAlarm's calendar. * The alarms are given new unique event IDs. -* Parameters: parent = parent widget for error message boxes +* Parameters: tqparent = tqparent widget for error message boxes * Reply = true if all alarms in the calendar were successfully imported * = false if any alarms failed to be imported. */ -bool AlarmCalendar::importAlarms(TQWidget* parent) +bool AlarmCalendar::importAlarms(TQWidget* tqparent) { KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"), - TQString::tqfromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), parent); + TQString::tqfromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), tqparent); if (url.isEmpty()) { kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl; @@ -468,7 +468,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) if (!KStandardDirs::exists(filename)) { kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl; - KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL())); + KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").arg(url.prettyURL())); return false; } } @@ -477,7 +477,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl; - KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL())); + KMessageBox::error(tqparent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL())); return false; } kdDebug(5950) << "--- Downloaded to " << filename << endl; @@ -490,7 +490,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) if (!success) { kdDebug(5950) << "AlarmCalendar::importAlarms(): error loading calendar '" << filename << "'" << endl; - KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL())); + KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").arg(url.prettyURL())); } else { @@ -508,7 +508,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) const Event* event = *it; if (event->alarms().isEmpty() || !KAEvent(*event).valid()) continue; // ignore events without alarms, or usable alarms - KAEvent::Status type = KAEvent::uidStatus(event->uid()); + KAEvent::tqStatus type = KAEvent::uidtqStatus(event->uid()); switch (type) { case KAEvent::ACTIVE: @@ -544,7 +544,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) if (alarm->type() == Alarm::Display && alarm->text().isEmpty()) alarm->setText(newev->summary()); } - newev->setSummary(TQString::null); // KAlarm only uses summary for template names + newev->setSummary(TQString()); // KAlarm only uses summary for template names } // Give the event a new ID and add it to the calendar newev->setUid(KAEvent::uid(CalFormat::createUniqueId(), type)); @@ -807,9 +807,9 @@ bool AlarmCalendar::deleteEvent(const TQString& eventID, bool saveit) /****************************************************************************** * Emit a signal to indicate whether the calendar is empty. */ -void AlarmCalendar::emitEmptyStatus() +void AlarmCalendar::emitEmptytqStatus() { - emit emptyStatus(events().isEmpty()); + emit emptytqStatus(events().isEmpty()); } /****************************************************************************** diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h index be96c3879..47d59f3ed 100644 --- a/kalarm/alarmcalendar.h +++ b/kalarm/alarmcalendar.h @@ -33,13 +33,14 @@ class KConfig; * Either vCalendar or iCalendar files may be read, but the calendar is saved * only in iCalendar format to avoid information loss. */ -class AlarmCalendar : public QObject +class AlarmCalendar : public TQObject { Q_OBJECT + TQ_OBJECT public: virtual ~AlarmCalendar(); bool valid() const { return mUrl.isValid(); } - KAEvent::Status type() const { return mType; } + KAEvent::tqStatus type() const { return mType; } bool open(); int load(); bool reload(); @@ -53,7 +54,7 @@ class AlarmCalendar : public QObject KCal::Event* addEvent(KAEvent&, bool useEventID = false); void updateEvent(const KAEvent&); bool deleteEvent(const TQString& eventID, bool save = false); - void emitEmptyStatus(); + void emitEmptytqStatus(); void purgeAll() { purge(0); } void setPurgeDays(int days); void purgeIfQueued(); // must only be called from KAlarmApp::processQueue() @@ -80,19 +81,19 @@ class AlarmCalendar : public QObject signals: void calendarSaved(AlarmCalendar*); void purged(); - void emptyStatus(bool empty); + void emptytqStatus(bool empty); private slots: void slotPurge(); private: - AlarmCalendar(const TQString& file, CalID, const TQString& icalFile = TQString::null, - const TQString& configKey = TQString::null); + AlarmCalendar(const TQString& file, CalID, const TQString& icalFile = TQString(), + const TQString& configKey = TQString()); bool create(); - bool saveCal(const TQString& newFile = TQString::null); + bool saveCal(const TQString& newFile = TQString()); void purge(int daysToKeep); void startPurgeTimer(); - static AlarmCalendar* createCalendar(CalID, KConfig*, TQString& writePath, const TQString& configKey = TQString::null); + static AlarmCalendar* createCalendar(CalID, KConfig*, TQString& writePath, const TQString& configKey = TQString()); static AlarmCalendar* calendarOpen(CalID); static AlarmCalendar* mCalendars[NCALS]; // the calendars @@ -102,7 +103,7 @@ class AlarmCalendar : public QObject KURL mICalUrl; // URL of iCalendar file TQString mLocalFile; // calendar file, or local copy if it's a remote file TQString mConfigKey; // config file key for this calendar's URL - KAEvent::Status mType; // what type of events the calendar file is for + KAEvent::tqStatus mType; // what type of events the calendar file is for int mPurgeDays; // how long to keep alarms, 0 = don't keep, -1 = keep indefinitely bool mOpen; // true if the calendar file is open int mPurgeDaysQueued; // >= 0 to purge the calendar when called from KAlarmApp::processLoop() diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp index 52206342b..66534b694 100644 --- a/kalarm/alarmevent.cpp +++ b/kalarm/alarmevent.cpp @@ -211,8 +211,8 @@ void KAEvent::set(const Event& event) // Extract status from the event mEventID = event.uid(); mRevision = event.revision(); - mTemplateName = TQString::null; - mLogFile = TQString::null; + mTemplateName = TQString(); + mLogFile = TQString(); mTemplateAfterTime = -1; mBeep = false; mSpeak = false; @@ -334,7 +334,7 @@ void KAEvent::set(const Event& event) } mNextMainDateTime = readDateTime(event, dateOnly, mStartDateTime); mSaveDateTime = event.created(); - if (uidStatus() == TEMPLATE) + if (uidtqStatus() == TEMPLATE) mTemplateName = event.summary(); if (event.statusStr() == DISABLED_STATUS) mEnabled = false; @@ -789,10 +789,10 @@ void KAEvent::set(const TQDateTime& dateTime, const TQString& text, const TQColo break; } mText = (mActionType == T_COMMAND) ? text.stripWhiteSpace() : text; - mEventID = TQString::null; - mTemplateName = TQString::null; - mPreAction = TQString::null; - mPostAction = TQString::null; + mEventID = TQString(); + mTemplateName = TQString(); + mPreAction = TQString(); + mPostAction = TQString(); mAudioFile = ""; mSoundVolume = -1; mFadeVolume = -1; @@ -877,7 +877,7 @@ DateTime KAEvent::displayDateTime() const { if (mMainExpired) return mDeferralTime; - return QMIN(mDeferralTime, dt); + return TQMIN(mDeferralTime, dt); } return dt; } @@ -885,38 +885,38 @@ DateTime KAEvent::displayDateTime() const /****************************************************************************** * Convert a unique ID to indicate that the event is in a specified calendar file. */ -TQString KAEvent::uid(const TQString& id, Status status) +TQString KAEvent::uid(const TQString& id, tqStatus status) { TQString result = id; - Status oldStatus; + tqStatus oldtqStatus; int i, len; - if ((i = result.find(EXPIRED_UID)) > 0) + if ((i = result.tqfind(EXPIRED_UID)) > 0) { - oldStatus = EXPIRED; + oldtqStatus = EXPIRED; len = EXPIRED_UID.length(); } - else if ((i = result.find(DISPLAYING_UID)) > 0) + else if ((i = result.tqfind(DISPLAYING_UID)) > 0) { - oldStatus = DISPLAYING; + oldtqStatus = DISPLAYING; len = DISPLAYING_UID.length(); } - else if ((i = result.find(TEMPLATE_UID)) > 0) + else if ((i = result.tqfind(TEMPLATE_UID)) > 0) { - oldStatus = TEMPLATE; + oldtqStatus = TEMPLATE; len = TEMPLATE_UID.length(); } - else if ((i = result.find(KORGANIZER_UID)) > 0) + else if ((i = result.tqfind(KORGANIZER_UID)) > 0) { - oldStatus = KORGANIZER; + oldtqStatus = KORGANIZER; len = KORGANIZER_UID.length(); } else { - oldStatus = ACTIVE; + oldtqStatus = ACTIVE; i = result.findRev('-'); len = 1; } - if (status != oldStatus && i > 0) + if (status != oldtqStatus && i > 0) { TQString part; switch (status) @@ -935,15 +935,15 @@ TQString KAEvent::uid(const TQString& id, Status status) /****************************************************************************** * Get the calendar type for a unique ID. */ -KAEvent::Status KAEvent::uidStatus(const TQString& uid) +KAEvent::tqStatus KAEvent::uidtqStatus(const TQString& uid) { - if (uid.find(EXPIRED_UID) > 0) + if (uid.tqfind(EXPIRED_UID) > 0) return EXPIRED; - if (uid.find(DISPLAYING_UID) > 0) + if (uid.tqfind(DISPLAYING_UID) > 0) return DISPLAYING; - if (uid.find(TEMPLATE_UID) > 0) + if (uid.tqfind(TEMPLATE_UID) > 0) return TEMPLATE; - if (uid.find(KORGANIZER_UID) > 0) + if (uid.tqfind(KORGANIZER_UID) > 0) return KORGANIZER; return ACTIVE; } @@ -1046,7 +1046,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc cats.append(ARCHIVE_CATEGORY); } ev.setCategories(cats); - ev.setCustomStatus(mEnabled ? TQString::null : DISABLED_STATUS); + ev.setCustomtqStatus(mEnabled ? TQString() : DISABLED_STATUS); ev.setRevision(mRevision); ev.clearAlarms(); @@ -1279,7 +1279,7 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY, TQString::tqfromLatin1("%1;%2;%3").arg(mBgColour.name()) .arg(mFgColour.name()) - .arg(mDefaultFont ? TQString::null : mFont.toString())); + .arg(mDefaultFont ? TQString() : mFont.toString())); break; case T_COMMAND: if (mCommandScript) @@ -2108,7 +2108,7 @@ TQString KAEvent::recurrenceText(bool brief) const break; } } - return brief ? TQString::null : i18n("None"); + return brief ? TQString() : i18n("None"); } /****************************************************************************** @@ -2131,7 +2131,7 @@ TQString KAEvent::repetitionText(bool brief) const return i18n("1 Day", "%n Days", mRepeatInterval/1440); return i18n("1 Week", "%n Weeks", mRepeatInterval/(7*1440)); } - return brief ? TQString::null : i18n("None"); + return brief ? TQString() : i18n("None"); } /****************************************************************************** @@ -2551,7 +2551,7 @@ bool KAEvent::adjustStartOfDay(const Event::List& events) { Event* event = *evit; const TQStringList cats = event->categories(); - if (cats.find(DATE_ONLY_CATEGORY) != cats.end()) + if (cats.tqfind(DATE_ONLY_CATEGORY) != cats.end()) { // It's an untimed event, so fix it TQTime oldTime = event->dtStart().time(); @@ -2694,9 +2694,9 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju * All alarms were of type DISPLAY. Instead of the X-KDE-KALARM-TYPE * alarm property, characteristics were stored as a prefix to the * alarm DESCRIPTION property, as follows: - * SEQNO;[FLAGS];TYPE:TEXT + * SETQNO;[FLAGS];TYPE:TEXT * where - * SEQNO = sequence number of alarm within the event + * SETQNO = sequence number of alarm within the event * FLAGS = C for late-cancel, L for repeat-at-login, D for deferral * TYPE = TEXT or FILE or CMD * TEXT = message text, file name/URL or command @@ -2732,14 +2732,14 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju else i = 0; // invalid prefix } - if (txt.find(TEXT_PREFIX, i) == i) + if (txt.tqfind(TEXT_PREFIX, i) == i) i += TEXT_PREFIX.length(); - else if (txt.find(FILE_PREFIX, i) == i) + else if (txt.tqfind(FILE_PREFIX, i) == i) { action = T_FILE; i += FILE_PREFIX.length(); } - else if (txt.find(COMMAND_PREFIX, i) == i) + else if (txt.tqfind(COMMAND_PREFIX, i) == i) { action = T_COMMAND; i += COMMAND_PREFIX.length(); @@ -2818,7 +2818,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju * X-KDE-KALARM-FONTCOLOUR property. * Convert BEEP category into an audio alarm with no audio file. */ - if (uidStatus(event->uid()) == EXPIRED) + if (uidtqStatus(event->uid()) == EXPIRED) event->setCreated(event->dtEnd()); TQDateTime start = event->dtStart(); if (event->doesFloat()) @@ -2882,7 +2882,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju * Convert simple LATECANCEL category to LATECANCEL:n where n = minutes late. */ TQStringList::Iterator it; - while ((it = cats.find(LATE_CANCEL_CAT)) != cats.end()) + while ((it = cats.tqfind(LATE_CANCEL_CAT)) != cats.end()) { cats.remove(it); addLateCancel = true; @@ -2915,7 +2915,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju * Convert simple TMPLDEFTIME category to TMPLAFTTIME:n where n = minutes after. */ TQStringList::Iterator it; - while ((it = cats.find(TEMPL_DEF_TIME_CAT)) != cats.end()) + while ((it = cats.tqfind(TEMPL_DEF_TIME_CAT)) != cats.end()) { cats.remove(it); cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(0)); @@ -2929,7 +2929,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju * Convert simple XTERM category to LOG:xterm: */ TQStringList::Iterator it; - while ((it = cats.find(EXEC_IN_XTERM_CAT)) != cats.end()) + while ((it = cats.tqfind(EXEC_IN_XTERM_CAT)) != cats.end()) { cats.remove(it); cats.append(LOG_CATEGORY + xtermURL); @@ -2952,7 +2952,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju * alarm offsets to zero and deferral alarm offsets to be relative to * the next recurrence. */ - bool dateOnly = (cats.find(DATE_ONLY_CATEGORY) != cats.end()); + bool dateOnly = (cats.tqfind(DATE_ONLY_CATEGORY) != cats.end()); DateTime startDateTime(event->dtStart(), dateOnly); // Convert the main alarm and get the next main trigger time from it DateTime nextMainDateTime; @@ -3431,8 +3431,8 @@ TQString EmailAddressList::join(const TQString& separator) const */ static void setProcedureAlarm(Alarm* alarm, const TQString& commandLine) { - TQString command = TQString::null; - TQString arguments = TQString::null; + TQString command = TQString(); + TQString arguments = TQString(); TQChar quoteChar; bool quoted = false; uint posMax = commandLine.length(); diff --git a/kalarm/alarmevent.h b/kalarm/alarmevent.h index 0436d3fb5..75ff7cbef 100644 --- a/kalarm/alarmevent.h +++ b/kalarm/alarmevent.h @@ -58,9 +58,9 @@ class KAAlarmEventBase public: ~KAAlarmEventBase() { } const TQString& cleanText() const { return mText; } - TQString message() const { return (mActionType == T_MESSAGE || mActionType == T_EMAIL) ? mText : TQString::null; } - TQString fileName() const { return (mActionType == T_FILE) ? mText : TQString::null; } - TQString command() const { return (mActionType == T_COMMAND) ? mText : TQString::null; } + TQString message() const { return (mActionType == T_MESSAGE || mActionType == T_EMAIL) ? mText : TQString(); } + TQString fileName() const { return (mActionType == T_FILE) ? mText : TQString(); } + TQString command() const { return (mActionType == T_COMMAND) ? mText : TQString(); } uint emailFromId() const { return mEmailFromIdentity; } const EmailAddressList& emailAddresses() const { return mEmailAddresses; } TQString emailAddresses(const TQString& sep) const { return mEmailAddresses.join(sep); } @@ -200,7 +200,7 @@ class KAAlarm : public KAAlarmEventBase ? mNextMainDateTime.addSecs(mNextRepeat * mRepeatInterval * 60) : mNextMainDateTime; } TQDate date() const { return mNextMainDateTime.date(); } TQTime time() const { return mNextMainDateTime.time(); } - TQString audioFile() const { return (mActionType == T_AUDIO) && !mBeep ? mText : TQString::null; } + TQString audioFile() const { return (mActionType == T_AUDIO) && !mBeep ? mText : TQString(); } float soundVolume() const { return (mActionType == T_AUDIO) && !mBeep && !mText.isEmpty() ? mSoundVolume : -1; } float fadeVolume() const { return (mActionType == T_AUDIO) && mSoundVolume >= 0 && mFadeSeconds && !mBeep && !mText.isEmpty() ? mFadeVolume : -1; } int fadeSeconds() const { return (mActionType == T_AUDIO) && mSoundVolume >= 0 && mFadeVolume >= 0 && !mBeep && !mText.isEmpty() ? mFadeSeconds : 0; } @@ -266,7 +266,7 @@ class KAEvent : public KAAlarmEventBase READ_ONLY_FLAGS = 0xF0000 // tqmask for all read-only internal values }; /** The category of an event, indicated by the middle part of its UID. */ - enum Status + enum tqStatus { ACTIVE, // the event is currently active EXPIRED, // the event has expired @@ -331,7 +331,7 @@ class KAEvent : public KAAlarmEventBase void setLateCancel(int lc) { mLateCancel = lc; mUpdated = true; } void setAutoClose(bool ac) { mAutoClose = ac; mUpdated = true; } void setRepeatAtLogin(bool rl) { mRepeatAtLogin = rl; mUpdated = true; } - void setUid(Status s) { mEventID = uid(mEventID, s); mUpdated = true; } + void setUid(tqStatus s) { mEventID = uid(mEventID, s); mUpdated = true; } void setKMailSerialNumber(unsigned long n) { mKMailSerialNumber = n; } void setLogFile(const TQString& logfile); void setReminder(int minutes, bool onceOnly); @@ -408,10 +408,10 @@ class KAEvent : public KAAlarmEventBase bool enabled() const { return mEnabled; } bool updated() const { return mUpdated; } bool mainExpired() const { return mMainExpired; } - bool expired() const { return mDisplaying && mMainExpired || uidStatus(mEventID) == EXPIRED; } - Status uidStatus() const { return uidStatus(mEventID); } - static Status uidStatus(const TQString& uid); - static TQString uid(const TQString& id, Status); + bool expired() const { return mDisplaying && mMainExpired || uidtqStatus(mEventID) == EXPIRED; } + tqStatus uidtqStatus() const { return uidtqStatus(mEventID); } + static tqStatus uidtqStatus(const TQString& uid); + static TQString uid(const TQString& id, tqStatus); static KAEvent findTemplateName(AlarmCalendar&, const TQString& name); struct MonthPos diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 2d4e39d62..4ef40f563 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -41,10 +41,10 @@ #include "alarmlistview.moc" -class AlarmListTooltip : public QToolTip +class AlarmListTooltip : public TQToolTip { public: - AlarmListTooltip(TQWidget* parent) : TQToolTip(parent) { } + AlarmListTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { } virtual ~AlarmListTooltip() {} protected: virtual void maybeTip(const TQPoint&); @@ -59,8 +59,8 @@ TQValueList<EventListViewBase*> AlarmListView::mInstanceList; bool AlarmListView::mDragging = false; -AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* parent, const char* name) - : EventListViewBase(parent, name), +AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* tqparent, const char* name) + : EventListViewBase(tqparent, name), mMousePressed(false), mDrawMessageInColour(false), mShowExpired(false) @@ -69,8 +69,8 @@ AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* parent, co i18n("Time"), i18n("Time To"), i18n("Repeat"), - TQString::null, - TQString::null, + TQString(), + TQString(), i18n("Message, File or Command") }; @@ -133,7 +133,7 @@ AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* parent, co setSorting(mColumn[TIME_COLUMN]); // sort initially by date/time mTimeColumnHeaderWidth = columnWidth(mColumn[TIME_COLUMN]); mTimeToColumnHeaderWidth = columnWidth(mColumn[TIME_TO_COLUMN]); - setColumnAlignment(mColumn[REPEAT_COLUMN], Qt::AlignHCenter); + setColumnAlignment(mColumn[REPEAT_COLUMN], TQt::AlignHCenter); setColumnWidthMode(mColumn[REPEAT_COLUMN], TQListView::Maximum); // Set the width of the colour column in proportion to height @@ -348,7 +348,7 @@ TQString AlarmListView::whatsThisText(int column) const void AlarmListView::contentsMousePressEvent(TQMouseEvent* e) { TQListView::contentsMousePressEvent(e); - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { TQPoint p(contentsToViewport(e->pos())); if (itemAt(p)) @@ -414,20 +414,20 @@ void AlarmListView::contentsMouseReleaseEvent(TQMouseEvent *e) int AlarmListViewItem::mTimeHourPos = -2; int AlarmListViewItem::mDigitWidth = -1; -AlarmListViewItem::AlarmListViewItem(AlarmListView* parent, const KAEvent& event, const TQDateTime& now) - : EventListViewItemBase(parent, event), +AlarmListViewItem::AlarmListViewItem(AlarmListView* tqparent, const KAEvent& event, const TQDateTime& now) + : EventListViewItemBase(tqparent, event), mMessageTruncated(false), mTimeToAlarmShown(false) { setLastColumnText(); // set the message column text DateTime dateTime = event.expired() ? event.startDateTime() : event.displayDateTime(); - if (parent->column(AlarmListView::TIME_COLUMN) >= 0) - setText(parent->column(AlarmListView::TIME_COLUMN), alarmTimeText(dateTime)); - if (parent->column(AlarmListView::TIME_TO_COLUMN) >= 0) + if (tqparent->column(AlarmListView::TIME_COLUMN) >= 0) + setText(tqparent->column(AlarmListView::TIME_COLUMN), alarmTimeText(dateTime)); + if (tqparent->column(AlarmListView::TIME_TO_COLUMN) >= 0) { TQString tta = timeToAlarmText(now); - setText(parent->column(AlarmListView::TIME_TO_COLUMN), tta); + setText(tqparent->column(AlarmListView::TIME_TO_COLUMN), tta); mTimeToAlarmShown = !tta.isNull(); } TQTime t = dateTime.time(); @@ -468,7 +468,7 @@ AlarmListViewItem::AlarmListViewItem(AlarmListView* parent, const KAEvent& event break; } } - setText(parent->column(AlarmListView::REPEAT_COLUMN), repeatText); + setText(tqparent->column(AlarmListView::REPEAT_COLUMN), repeatText); mRepeatOrder.sprintf("%c%08d", '0' + repeatOrder, repeatInterval); bool showColour = (event.action() == KAEvent::MESSAGE || event.action() == KAEvent::FILE); @@ -507,8 +507,8 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const if (!TQApplication::reverseLayout()) // don't try to align right-to-left languages { TQString fmt = locale->timeFormat(); - int i = fmt.find(TQRegExp("%[kl]")); // check if leading zeroes are omitted - if (i >= 0 && i == fmt.find('%')) // and whether the hour is first + int i = fmt.tqfind(TQRegExp("%[kl]")); // check if leading zeroes are omitted + if (i >= 0 && i == fmt.tqfind('%')) // and whether the hour is first mTimeHourPos = i; // yes, so need to align } } @@ -526,7 +526,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const { if (event().expired()) - return TQString::null; + return TQString(); DateTime dateTime = event().displayDateTime(); if (dateTime.isDateOnly()) { @@ -535,7 +535,7 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const } int mins = (now.secsTo(dateTime.dateTime()) + 59) / 60; if (mins < 0) - return TQString::null; + return TQString(); char minutes[3] = "00"; minutes[0] = (mins%60) / 10 + '0'; minutes[1] = (mins%60) % 10 + '0'; @@ -557,7 +557,7 @@ void AlarmListViewItem::updateTimeToAlarm(const TQDateTime& now, bool forceDispl { if (forceDisplay || mTimeToAlarmShown) { - setText(alarmListView()->column(AlarmListView::TIME_TO_COLUMN), TQString::null); + setText(alarmListView()->column(AlarmListView::TIME_TO_COLUMN), TQString()); mTimeToAlarmShown = false; } } @@ -593,7 +593,7 @@ void AlarmListViewItem::paintCell(TQPainter* painter, const TQColorGroup& cg, in if (mTimeHourPos >= 0) { // Need to pad out spacing to align times without leading zeroes - i = str.find(" ~"); + i = str.tqfind(" ~"); if (i >= 0) { if (mDigitWidth < 0) diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h index a722ac238..56b5c5895 100644 --- a/kalarm/alarmlistview.h +++ b/kalarm/alarmlistview.h @@ -31,7 +31,7 @@ class AlarmListTooltip; class AlarmListViewItem : public EventListViewItemBase { public: - AlarmListViewItem(AlarmListView* parent, const KAEvent&, const TQDateTime& now); + AlarmListViewItem(AlarmListView* tqparent, const KAEvent&, const TQDateTime& now); TQTime showTimeToAlarm(bool show); void updateTimeToAlarm(const TQDateTime& now, bool forceDisplay = false); virtual void paintCell(TQPainter*, const TQColorGroup&, int column, int width, int align); @@ -63,14 +63,15 @@ class AlarmListViewItem : public EventListViewItemBase class AlarmListView : public EventListViewBase { - Q_OBJECT // needed by TQObject::isA() calls + Q_OBJECT + TQ_OBJECT // needed by TQObject::isA() calls public: enum ColumnIndex { // default column order TIME_COLUMN, TIME_TO_COLUMN, REPEAT_COLUMN, COLOUR_COLUMN, TYPE_COLUMN, MESSAGE_COLUMN, COLUMN_COUNT }; - AlarmListView(const TQValueList<int>& order, TQWidget* parent = 0, const char* name = 0); + AlarmListView(const TQValueList<int>& order, TQWidget* tqparent = 0, const char* name = 0); ~AlarmListView(); void showExpired(bool show) { mShowExpired = show; } bool showingExpired() const { return mShowExpired; } diff --git a/kalarm/alarmtext.cpp b/kalarm/alarmtext.cpp index 5be991f0d..6cf07c34f 100644 --- a/kalarm/alarmtext.cpp +++ b/kalarm/alarmtext.cpp @@ -44,7 +44,7 @@ void AlarmText::setText(const TQString& text) mBody = text; mIsScript = text.startsWith(TQString::tqfromLatin1("#!")); mIsEmail = false; - mTo = mFrom = mCc = mTime = mSubject = TQString::null; + mTo = mFrom = mCc = mTime = mSubject = TQString(); mKMailSerialNum = 0; } @@ -136,14 +136,14 @@ int AlarmText::emailHeaderCount(const TQStringList& lines) /****************************************************************************** * Check whether a text is an email, and if so return its headers or optionally * only its subject line. -* Reply = headers/subject line, or TQString::null if not the text of an email. +* Reply = headers/subject line, or TQString() if not the text of an email. */ TQString AlarmText::emailHeaders(const TQString& text, bool subjectOnly) { TQStringList lines = TQStringList::split('\n', text); int n = emailHeaderCount(lines); if (!n) - return TQString::null; + return TQString(); if (subjectOnly) return lines[n-1].mid(mSubjectPrefix.length()).stripWhiteSpace(); TQString h = lines[0]; @@ -184,8 +184,8 @@ TQString AlarmText::fromCalendarText(const TQString& text, bool& email) dispText += mCcPrefix + lines[2].mid(mCcPrefixEn.length()) + '\n'; dispText += mDatePrefix + lines[n].mid(mDatePrefixEn.length()) + '\n'; dispText += mSubjectPrefix + lines[n+1].mid(mSubjectPrefixEn.length()); - int i = text.find(mSubjectPrefixEn); - i = text.find('\n', i); + int i = text.tqfind(mSubjectPrefixEn); + i = text.tqfind('\n', i); if (i > 0) dispText += text.mid(i); email = true; @@ -224,8 +224,8 @@ TQString AlarmText::toCalendarText(const TQString& text) calText += mCcPrefixEn + lines[2].mid(mCcPrefix.length()) + '\n'; calText += mDatePrefixEn + lines[n].mid(mDatePrefix.length()) + '\n'; calText += mSubjectPrefixEn + lines[n+1].mid(mSubjectPrefix.length()); - int i = text.find(mSubjectPrefix); - i = text.find('\n', i); + int i = text.tqfind(mSubjectPrefix); + i = text.tqfind('\n', i); if (i > 0) calText += text.mid(i); return calText; @@ -276,7 +276,7 @@ TQString AlarmText::summary(const KAEvent& event, int maxLines, bool* truncated) int newline = -1; for (int i = 0; i < maxLines; ++i) { - newline = text.find('\n', newline + 1); + newline = text.tqfind('\n', newline + 1); if (newline < 0) return text; // not truncated after all !?! } diff --git a/kalarm/alarmtext.h b/kalarm/alarmtext.h index b839ace28..e5eb7d974 100644 --- a/kalarm/alarmtext.h +++ b/kalarm/alarmtext.h @@ -29,7 +29,7 @@ class KAEvent; class AlarmText { public: - AlarmText(const TQString& text = TQString::null) { setText(text); } + AlarmText(const TQString& text = TQString()) { setText(text); } void setText(const TQString&); void setScript(const TQString& text) { setText(text); mIsScript = true; } void setEmail(const TQString& to, const TQString& from, const TQString& cc, const TQString& time, @@ -41,7 +41,7 @@ class AlarmText TQString cc() const { return mCc; } TQString time() const { return mTime; } TQString subject() const { return mSubject; } - TQString body() const { return mIsEmail ? mBody : TQString::null; } + TQString body() const { return mIsEmail ? mBody : TQString(); } bool isEmpty() const; bool isEmail() const { return mIsEmail; } bool isScript() const { return mIsScript; } diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index 2e4263300..4ce881485 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -55,8 +55,8 @@ TQString AlarmTimeWidget::i18n_TimeAfterPeriod() /****************************************************************************** * Construct a widget with a group box and title. */ -AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent, const char* name) - : ButtonGroup(groupBoxTitle, parent, name), +AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* tqparent, const char* name) + : ButtonGroup(groupBoxTitle, tqparent, name), mMinDateTimeIsNow(false), mPastMax(false), mMinMaxTimeSet(false) @@ -67,8 +67,8 @@ AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidg /****************************************************************************** * Construct a widget without a group box or title. */ -AlarmTimeWidget::AlarmTimeWidget(int mode, TQWidget* parent, const char* name) - : ButtonGroup(parent, name), +AlarmTimeWidget::AlarmTimeWidget(int mode, TQWidget* tqparent, const char* name) + : ButtonGroup(tqparent, name), mMinDateTimeIsNow(false), mPastMax(false), mMinMaxTimeSet(false) @@ -156,8 +156,8 @@ void AlarmTimeWidget::init(int mode) { TQGridLayout* grid = new TQGridLayout(topLayout, 2, 2, KDialog::spacingHint()); grid->addWidget(mAtTimeRadio, 0, 0); - grid->addWidget(mDateEdit, 0, 1, Qt::AlignAuto); - grid->addWidget(timeBox, 1, 1, Qt::AlignAuto); + grid->addWidget(mDateEdit, 0, 1, TQt::AlignAuto); + grid->addWidget(timeBox, 1, 1, TQt::AlignAuto); grid->setColStretch(2, 1); topLayout->addStretch(); TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); @@ -168,12 +168,12 @@ void AlarmTimeWidget::init(int mode) else { TQGridLayout* grid = new TQGridLayout(topLayout, 2, 3, KDialog::spacingHint()); - grid->addWidget(mAtTimeRadio, 0, 0, Qt::AlignAuto); - grid->addWidget(mDateEdit, 0, 1, Qt::AlignAuto); - grid->addWidget(timeBox, 0, 2, Qt::AlignAuto); + grid->addWidget(mAtTimeRadio, 0, 0, TQt::AlignAuto); + grid->addWidget(mDateEdit, 0, 1, TQt::AlignAuto); + grid->addWidget(timeBox, 0, 2, TQt::AlignAuto); grid->setRowStretch(0, 1); - grid->addWidget(mAfterTimeRadio, 1, 0, Qt::AlignAuto); - grid->addWidget(mDelayTimeEdit, 1, 1, Qt::AlignAuto); + grid->addWidget(mAfterTimeRadio, 1, 0, TQt::AlignAuto); + grid->addWidget(mDelayTimeEdit, 1, 1, TQt::AlignAuto); grid->setColStretch(3, 1); topLayout->addStretch(); } diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h index e3580d735..0b8d6d4f1 100644 --- a/kalarm/alarmtimewidget.h +++ b/kalarm/alarmtimewidget.h @@ -34,14 +34,15 @@ class TimeSpinBox; class AlarmTimeWidget : public ButtonGroup { Q_OBJECT + TQ_OBJECT public: enum { // 'mode' values for constructor. May be OR'ed together. AT_TIME = 0x00, // "At ..." DEFER_TIME = 0x01, // "Defer to ..." NARROW = 0x02 // make a narrow widget }; - AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent = 0, const char* name = 0); - AlarmTimeWidget(int mode, TQWidget* parent = 0, const char* name = 0); + AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* tqparent = 0, const char* name = 0); + AlarmTimeWidget(int mode, TQWidget* tqparent = 0, const char* name = 0); DateTime getDateTime(int* minsFromNow = 0, bool checkExpired = true, bool showErrorMessage = true, TQWidget** errorWidget = 0) const; void setDateTime(const DateTime&); void setMinDateTimeIsCurrent(); diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 2e2997853..5ed43275e 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -54,11 +54,11 @@ using namespace KCal; -class AddresseeItem : public QListViewItem +class AddresseeItem : public TQListViewItem { public: enum columns { NAME = 0, BIRTHDAY = 1 }; - AddresseeItem(TQListView* parent, const TQString& name, const TQDate& birthday); + AddresseeItem(TQListView* tqparent, const TQString& name, const TQDate& birthday); TQDate birthday() const { return mBirthday; } virtual TQString key(int column, bool ascending) const; private: @@ -70,8 +70,8 @@ class AddresseeItem : public QListViewItem const KABC::AddressBook* BirthdayDlg::mAddressBook = 0; -BirthdayDlg::BirthdayDlg(TQWidget* parent) - : KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, parent, "BirthdayDlg"), +BirthdayDlg::BirthdayDlg(TQWidget* tqparent) + : KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, tqparent, "BirthdayDlg"), mSpecialActionsButton(0) { TQWidget* topWidget = plainPage(); @@ -85,7 +85,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) mPrefixText = config->readEntry(TQString::tqfromLatin1("BirthdayPrefix"), i18n("Birthday: ")); mSuffixText = config->readEntry(TQString::tqfromLatin1("BirthdaySuffix")); - TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Alarm Text"), topWidget); + TQGroupBox* textGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Alarm Text"), topWidget); topLayout->addWidget(textGroup); TQLabel* label = new TQLabel(i18n("Pre&fix:"), textGroup); mPrefix = new BLineEdit(mPrefixText, textGroup); @@ -105,7 +105,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) i18n("Enter text to appear after the person's name in the alarm message, " "including any necessary leading spaces.")); - TQGroupBox* group = new TQGroupBox(1, Qt::Horizontal, i18n("Select Birthdays"), topWidget); + TQGroupBox* group = new TQGroupBox(1, TQt::Horizontal, i18n("Select Birthdays"), topWidget); topLayout->addWidget(group); mAddresseeList = new BListView(group); mAddresseeList->setMultiSelection(true); @@ -134,7 +134,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) // Sound checkbox and file selector mSoundPicker = new SoundPicker(group); mSoundPicker->setFixedSize(mSoundPicker->tqsizeHint()); - groupLayout->addWidget(mSoundPicker, 0, Qt::AlignAuto); + groupLayout->addWidget(mSoundPicker, 0, TQt::AlignAuto); // How much to advance warning to give mReminder = new Reminder(i18n("&Reminder"), @@ -145,7 +145,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) mReminder->setFixedSize(mReminder->tqsizeHint()); mReminder->setMaximum(0, 364); mReminder->setMinutes(0, true); - groupLayout->addWidget(mReminder, 0, Qt::AlignAuto); + groupLayout->addWidget(mReminder, 0, TQt::AlignAuto); // Acknowledgement confirmation required - default = no confirmation TQHBoxLayout* tqlayout = new TQHBoxLayout(groupLayout, 2*spacingHint()); @@ -256,7 +256,7 @@ void BirthdayDlg::updateSelectionList() name = addressee.realName(); // Check if the birthday already has an alarm TQString text = mPrefixText + name + mSuffixText; - bool alarmExists = (messageList.find(text) != messageList.end()); + bool alarmExists = (messageList.tqfind(text) != messageList.end()); // Check if the birthday is already in the selection list bool inSelectionList = false; AddresseeItem* item = 0; @@ -396,8 +396,8 @@ void BirthdayDlg::slotTextLostFocus() = Class: AddresseeItem =============================================================================*/ -AddresseeItem::AddresseeItem(TQListView* parent, const TQString& name, const TQDate& birthday) - : TQListViewItem(parent), +AddresseeItem::AddresseeItem(TQListView* tqparent, const TQString& name, const TQDate& birthday) + : TQListViewItem(tqparent), mBirthday(birthday) { setText(NAME, name); @@ -417,8 +417,8 @@ TQString AddresseeItem::key(int column, bool) const = Class: BListView =============================================================================*/ -BListView::BListView(TQWidget* parent, const char* name) - : KListView(parent, name) +BListView::BListView(TQWidget* tqparent, const char* name) + : KListView(tqparent, name) { KAccel* accel = new KAccel(this); accel->insert(KStdAccel::SelectAll, this, TQT_SLOT(slotSelectAll())); diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h index 321288eae..776b5f1bd 100644 --- a/kalarm/birthdaydlg.h +++ b/kalarm/birthdaydlg.h @@ -43,8 +43,9 @@ class BListView; class BirthdayDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - BirthdayDlg(TQWidget* parent = 0); + BirthdayDlg(TQWidget* tqparent = 0); TQValueList<KAEvent> events() const; static void close(); @@ -76,14 +77,15 @@ class BirthdayDlg : public KDialogBase }; -class BLineEdit : public QLineEdit +class BLineEdit : public TQLineEdit { Q_OBJECT + TQ_OBJECT public: - BLineEdit(TQWidget* parent = 0, const char* name = 0) - : TQLineEdit(parent, name) {} - BLineEdit(const TQString& text, TQWidget* parent = 0, const char* name = 0) - : TQLineEdit(text, parent, name) {} + BLineEdit(TQWidget* tqparent = 0, const char* name = 0) + : TQLineEdit(tqparent, name) {} + BLineEdit(const TQString& text, TQWidget* tqparent = 0, const char* name = 0) + : TQLineEdit(text, tqparent, name) {} signals: void focusLost(); protected: @@ -93,8 +95,9 @@ class BLineEdit : public QLineEdit class BListView : public KListView { Q_OBJECT + TQ_OBJECT public: - BListView(TQWidget* parent = 0, const char* name = 0); + BListView(TQWidget* tqparent = 0, const char* name = 0); public slots: virtual void slotSelectAll() { selectAll(true); } virtual void slotDeselect() { selectAll(false); } diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp index f0a349197..134436a25 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; diff --git a/kalarm/calendarcompat.h b/kalarm/calendarcompat.h index ec79ea802..c095bff11 100644 --- a/kalarm/calendarcompat.h +++ b/kalarm/calendarcompat.h @@ -30,7 +30,7 @@ namespace KCal { class Calendar; } class CalendarCompat { public: - static void fix(KCal::Calendar&, const TQString& localFile = TQString::null); + static void fix(KCal::Calendar&, const TQString& localFile = TQString()); private: static int readKAlarmVersion(KCal::Calendar&, TQString& subVersion); diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index a129de8a3..f3a466ea7 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -58,7 +58,7 @@ class NotificationHandler : public TQObject, virtual public AlarmGuiIface NotificationHandler(); private: // DCOP interface - void alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL); + void alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL); void handleEvent(const TQString& calendarURL, const TQString& eventID); void registered(bool reregister, int result, int version); }; @@ -74,7 +74,7 @@ TQTimer* Daemon::mStatusTimer = 0; int Daemon::mStatusTimerCount = 0; int Daemon::mStatusTimerInterval; int Daemon::mStartTimeout = 0; -Daemon::Status Daemon::mStatus = Daemon::STOPPED; +Daemon::tqStatus Daemon::mtqStatus = Daemon::STOPPED; bool Daemon::mRunning = false; bool Daemon::mCalendarDisabled = false; bool Daemon::mEnableCalPending = false; @@ -125,8 +125,8 @@ void Daemon::createDcopHandler() bool Daemon::start() { kdDebug(5950) << "Daemon::start()\n"; - updateRegisteredStatus(); - switch (mStatus) + updateRegisteredtqStatus(); + switch (mtqStatus) { case STOPPED: { @@ -173,7 +173,7 @@ bool Daemon::registerWith(bool reregister) { if (mRegisterTimer) return true; - switch (mStatus) + switch (mtqStatus) { case STOPPED: case RUNNING: @@ -258,8 +258,8 @@ void Daemon::registrationResult(bool reregister, int result, int version) { if (!errmsg.isEmpty()) { - if (mStatus == REGISTERED) - mStatus = READY; + if (mtqStatus == REGISTERED) + mtqStatus = READY; if (!mRegisterFailMsg) { mRegisterFailMsg = true; @@ -272,7 +272,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) if (!reregister) { // The alarm daemon has loaded the calendar - mStatus = REGISTERED; + mtqStatus = REGISTERED; mRegisterFailMsg = false; kdDebug(5950) << "Daemon::start(): daemon startup complete" << endl; } @@ -283,9 +283,9 @@ void Daemon::registrationResult(bool reregister, int result, int version) */ void Daemon::checkIfStarted() { - updateRegisteredStatus(); + updateRegisteredtqStatus(); bool err = false; - switch (mStatus) + switch (mtqStatus) { case STOPPED: if (--mStartTimeout > 0) @@ -312,27 +312,27 @@ void Daemon::checkIfStarted() * Check whether the alarm daemon has started yet, and if so, whether it is * ready to accept DCOP calls. */ -void Daemon::updateRegisteredStatus(bool timeout) +void Daemon::updateRegisteredtqStatus(bool timeout) { if (!kapp->dcopClient()->isApplicationRegistered(DAEMON_APP_NAME)) { - mStatus = STOPPED; + mtqStatus = STOPPED; mRegisterFailMsg = false; } else { - switch (mStatus) + switch (mtqStatus) { case STOPPED: // The daemon has newly been detected as registered with DCOP. // Wait for a short time to ensure that it is ready for DCOP calls. - mStatus = RUNNING; + mtqStatus = RUNNING; TQTimer::singleShot(startCheckInterval, mInstance, TQT_SLOT(slotStarted())); break; case RUNNING: if (timeout) { - mStatus = READY; + mtqStatus = READY; start(); } break; @@ -341,7 +341,7 @@ void Daemon::updateRegisteredStatus(bool timeout) break; } } - kdDebug(5950) << "Daemon::updateRegisteredStatus() -> " << mStatus << endl; + kdDebug(5950) << "Daemon::updateRegisteredtqStatus() -> " << mtqStatus << endl; } /****************************************************************************** @@ -491,8 +491,8 @@ bool Daemon::monitoringAlarms() bool Daemon::isRunning(bool startdaemon) { static bool runState = false; - updateRegisteredStatus(); - bool newRunState = (mStatus == READY || mStatus == REGISTERED); + updateRegisteredtqStatus(); + bool newRunState = (mtqStatus == READY || mtqStatus == REGISTERED); if (newRunState != runState) { // Daemon's status has changed @@ -500,7 +500,7 @@ bool Daemon::isRunning(bool startdaemon) if (runState && startdaemon) start(); // re-register with the daemon } - return runState && (mStatus == REGISTERED); + return runState && (mtqStatus == REGISTERED); } /****************************************************************************** @@ -666,10 +666,10 @@ NotificationHandler::NotificationHandler() * The daemon notifies calendar statuses when we first register as a GUI, and whenever * a calendar status changes. So we don't need to read its config files. */ -void NotificationHandler::alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL) +void NotificationHandler::alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL) { - kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(" << calendarStatus << ")\n"; - KAlarmd::CalendarStatus status = KAlarmd::CalendarStatus(calendarStatus); + kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(" << calendartqStatus << ")\n"; + KAlarmd::CalendartqStatus status = KAlarmd::CalendartqStatus(calendartqStatus); if (expandURL(calendarURL) != AlarmCalendar::activeCalendar()->urlString()) return; // it's not a notification about KAlarm's calendar bool enabled = false; @@ -723,8 +723,8 @@ void NotificationHandler::registered(bool reregister, int result, int version) = Class: AlarmEnableAction =============================================================================*/ -AlarmEnableAction::AlarmEnableAction(int accel, TQObject* parent, const char* name) - : KToggleAction(i18n("Enable &Alarms"), accel, parent, name), +AlarmEnableAction::AlarmEnableAction(int accel, TQObject* tqparent, const char* name) + : KToggleAction(i18n("Enable &Alarms"), accel, tqparent, name), mInitialised(false) { setCheckedState(i18n("Disable &Alarms")); diff --git a/kalarm/daemon.h b/kalarm/daemon.h index 58b34ecdf..fff7c7554 100644 --- a/kalarm/daemon.h +++ b/kalarm/daemon.h @@ -34,9 +34,10 @@ class AlarmEnableAction; class NotificationHandler; -class Daemon : public QObject +class Daemon : public TQObject { Q_OBJECT + TQ_OBJECT public: static void initialise(); static void createDcopHandler(); @@ -50,11 +51,11 @@ class Daemon : public QObject static void enableAutoStart(bool enable); static void notifyTimeChanged(); static void setAlarmsEnabled() { mInstance->setAlarmsEnabled(true); } - static void checkStatus() { checkIfRunning(); } + static void checktqStatus() { checkIfRunning(); } static bool monitoringAlarms(); static bool isRunning(bool startDaemon = true); static int maxTimeSinceCheck(); - static bool isRegistered() { return mStatus == REGISTERED; } + static bool isRegistered() { return mtqStatus == REGISTERED; } static void allowRegisterFailMsg() { mRegisterFailMsg = false; } static void queueEvent(const TQString& eventID); @@ -67,15 +68,15 @@ class Daemon : public QObject private slots: void slotCalendarSaved(AlarmCalendar*); void checkIfStarted(); - void slotStarted() { updateRegisteredStatus(true); } - void registerTimerExpired() { registrationResult((mStatus == REGISTERED), KAlarmd::FAILURE); } + void slotStarted() { updateRegisteredtqStatus(true); } + void registerTimerExpired() { registrationResult((mtqStatus == REGISTERED), KAlarmd::FAILURE); } void setAlarmsEnabled(bool enable); void timerCheckIfRunning(); void slotPreferencesChanged(); private: - enum Status // daemon status. KEEP IN THIS ORDER!! + enum tqStatus // daemon status. KEEP IN THIS ORDER!! { STOPPED, // daemon is not registered with DCOP RUNNING, // daemon is newly registered with DCOP @@ -87,7 +88,7 @@ class Daemon : public QObject static void registrationResult(bool reregister, int result, int version = 0); static void reload(); static void notifyEventHandled(const TQString& eventID, bool reloadCal); - static void updateRegisteredStatus(bool timeout = false); + static void updateRegisteredtqStatus(bool timeout = false); static void enableCalendar(bool enable); static void calendarIsEnabled(bool enabled); static bool checkIfRunning(); @@ -103,7 +104,7 @@ class Daemon : public QObject static int mStatusTimerCount; // countdown for fast status checking static int mStatusTimerInterval; // timer interval (seconds) for checking daemon status static int mStartTimeout; // remaining number of times to check if alarm daemon has started - static Status mStatus; // daemon status + static tqStatus mtqStatus; // daemon status static bool mRunning; // whether the alarm daemon is currently running static bool mCalendarDisabled; // monitoring of calendar is currently disabled by daemon static bool mEnableCalPending; // waiting to tell daemon to enable calendar @@ -119,8 +120,9 @@ class Daemon : public QObject class AlarmEnableAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: - AlarmEnableAction(int accel, TQObject* parent, const char* name = 0); + AlarmEnableAction(int accel, TQObject* tqparent, const char* name = 0); public slots: void setCheckedActual(bool); // set state and emit switched() signal virtual void setChecked(bool); // request state change and emit userClicked() signal diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp index 42af4ce9b..5f6e85074 100644 --- a/kalarm/dcophandler.cpp +++ b/kalarm/dcophandler.cpp @@ -256,7 +256,7 @@ bool DcopHandler::scheduleFile(const KURL& file, TQColor bg = convertBgColour(bgColor); if (!bg.isValid()) return false; - return theApp()->scheduleEvent(KAEvent::FILE, file.url(), start.dateTime(), lateCancel, kaEventFlags, bg, Qt::black, TQFont(), + return theApp()->scheduleEvent(KAEvent::FILE, file.url(), start.dateTime(), lateCancel, kaEventFlags, bg, TQt::black, TQFont(), audioFile.url(), -1, reminderMins, recurrence, subRepeatInterval, subRepeatCount); } @@ -268,8 +268,8 @@ bool DcopHandler::scheduleCommand(const TQString& commandLine, 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, TQFont(), - TQString::null, -1, 0, recurrence, subRepeatInterval, subRepeatCount); + return theApp()->scheduleEvent(KAEvent::COMMAND, commandLine, start.dateTime(), lateCancel, kaEventFlags, TQt::black, TQt::black, TQFont(), + TQString(), -1, 0, recurrence, subRepeatInterval, subRepeatCount); } /****************************************************************************** @@ -310,8 +310,8 @@ bool DcopHandler::scheduleEmail(const TQString& fromID, const TQString& addresse 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, TQFont(), - TQString::null, -1, 0, recurrence, subRepeatInterval, subRepeatCount, senderId, addrs, subject, atts); + return theApp()->scheduleEvent(KAEvent::EMAIL, message, start.dateTime(), lateCancel, kaEventFlags, TQt::black, TQt::black, TQFont(), + TQString(), -1, 0, recurrence, subRepeatInterval, subRepeatCount, senderId, addrs, subject, atts); } @@ -325,7 +325,7 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime) if (startDateTime.length() > 10) { // Both a date and a time are specified - start = TQDateTime::fromString(startDateTime, Qt::ISODate); + start = TQDateTime::fromString(startDateTime, TQt::ISODate); } else { @@ -339,12 +339,12 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime) if (t.isEmpty()) { // It's a date - start = TQDate::fromString(startDateTime, Qt::ISODate); + start = TQDate::fromString(startDateTime, TQt::ISODate); } else { // It's a time, so use today as the date - start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, Qt::ISODate)); + start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, TQt::ISODate)); } } if (!start.isValid()) @@ -419,14 +419,14 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c if (!start.isValid()) return false; TQDateTime end; - if (endDateTime.find('T') < 0) + if (endDateTime.tqfind('T') < 0) { if (!start.isDateOnly()) { kdError(5950) << "DCOP call: alarm is date-only, but recurrence end is date/time" << endl; return false; } - end.setDate(TQDate::fromString(endDateTime, Qt::ISODate)); + end.setDate(TQDate::fromString(endDateTime, TQt::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 = TQDateTime::fromString(endDateTime, Qt::ISODate); + end = TQDateTime::fromString(endDateTime, TQt::ISODate); } if (!end.isValid()) { @@ -675,7 +675,7 @@ bool DcopHandlerOld::process(const TQCString& func, const TQByteArray& data, TQC TQStringList mailAttachments; TQDateTime dateTime, endTime; TQColor bgColour; - TQColor fgColour(Qt::black); + TQColor fgColour(TQt::black); TQFont font; TQ_UINT32 flags; int lateCancel = 0; diff --git a/kalarm/dcophandler.h b/kalarm/dcophandler.h index f14f4cda7..42a36d6a6 100644 --- a/kalarm/dcophandler.h +++ b/kalarm/dcophandler.h @@ -97,6 +97,7 @@ class DcopHandler : public TQWidget, virtual public KAlarmIface class DcopHandlerOld : public TQWidget, public DCOPObject { Q_OBJECT + TQ_OBJECT public: DcopHandlerOld(); ~DcopHandlerOld() { } diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp index 9df852a93..75b95b8f5 100644 --- a/kalarm/deferdlg.cpp +++ b/kalarm/deferdlg.cpp @@ -40,8 +40,8 @@ DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT, - bool cancelButton, TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, caption, Ok|Cancel|User1, Ok, false, i18n("Cancel &Deferral")) + bool cancelButton, TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, caption, Ok|Cancel|User1, Ok, false, i18n("Cancel &Deferral")) { if (!cancelButton) showButton(User1, false); @@ -135,7 +135,7 @@ void DeferAlarmDlg::slotPastLimit() */ void DeferAlarmDlg::setLimit(const DateTime& limit) { - mLimitEventID = TQString::null; + mLimitEventID = TQString(); mLimitDateTime = limit; mTimeWidget->setMaxDateTime(mLimitDateTime); } diff --git a/kalarm/deferdlg.h b/kalarm/deferdlg.h index 999eccf40..4ab2c9cb5 100644 --- a/kalarm/deferdlg.h +++ b/kalarm/deferdlg.h @@ -30,9 +30,10 @@ class AlarmTimeWidget; class DeferAlarmDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: DeferAlarmDlg(const TQString& caption, const DateTime& initialDT, - bool cancelButton, TQWidget* parent = 0, const char* name = 0); + bool cancelButton, TQWidget* tqparent = 0, const char* name = 0); void setLimit(const DateTime&); DateTime setLimit(const TQString& eventID); const DateTime& getDateTime() const { return mAlarmDateTime; } diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index e5cd07dcd..b93f681e6 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -97,12 +97,12 @@ static const int maxDelayTime = 99*60 + 59; // < 100 hours class PickAlarmFileRadio : public PickFileRadio { public: - PickAlarmFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = 0) - : PickFileRadio(text, parent, name) { } + PickAlarmFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name = 0) + : PickFileRadio(text, tqparent, name) { } virtual TQString pickFile() // called when browse button is pressed to select a file to display { return KAlarm::browseFile(i18n("Choose Text or Image File to Display"), mDefaultDir, fileEdit()->text(), - TQString::null, KFile::ExistingOnly, tqparentWidget(), "pickAlarmFile"); + TQString(), KFile::ExistingOnly, tqparentWidget(), "pickAlarmFile"); } private: TQString mDefaultDir; // default directory for file browse button @@ -114,11 +114,11 @@ class PickAlarmFileRadio : public PickFileRadio class PickLogFileRadio : public PickFileRadio { public: - PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* parent, const char* name = 0) - : PickFileRadio(b, e, text, parent, name) { } + PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* tqparent, const char* name = 0) + : PickFileRadio(b, e, text, tqparent, name) { } virtual TQString pickFile() // called when browse button is pressed to select a log file { - return KAlarm::browseFile(i18n("Choose Log File"), mDefaultDir, fileEdit()->text(), TQString::null, + return KAlarm::browseFile(i18n("Choose Log File"), mDefaultDir, fileEdit()->text(), TQString(), KFile::LocalOnly, tqparentWidget(), "pickLogFile"); } private: @@ -165,9 +165,9 @@ TQString EditAlarmDlg::i18n_j_EmailSubject() { return i18n("Email subject", * = false to edit/create an alarm. * event != to initialise the dialogue to show the specified event's data. */ -EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent, const char* name, +EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqparent, const char* name, const KAEvent* event, bool readOnly) - : KDialogBase(parent, (name ? name : Template ? "TemplEditDlg" : "EditDlg"), true, caption, + : KDialogBase(tqparent, (name ? name : Template ? "TemplEditDlg" : "EditDlg"), true, caption, (readOnly ? Cancel|Try : Template ? Ok|Cancel|Try : Ok|Cancel|Try|Default), (readOnly ? Cancel : Ok)), mMainPageShown(false), @@ -217,7 +217,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par // Recurrence tab TQVBox* recurTab = new TQVBox(mTabs); mainPageBox->setSpacing(spacingHint()); - mTabs->addTab(recurTab, TQString::null); + mTabs->addTab(recurTab, TQString()); mRecurPageIndex = 1; mRecurrenceEdit = new RecurrenceEdit(readOnly, recurTab, "recurPage"); connect(mRecurrenceEdit, TQT_SIGNAL(shown()), TQT_SLOT(slotShowRecurrenceEdit())); @@ -273,7 +273,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par tqlayout->addWidget(mEmailFrame); // Deferred date/time: visible only for a deferred recurring event. - mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup"); + mDeferGroup = new TQGroupBox(1, TQt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup"); topLayout->addWidget(mDeferGroup); TQLabel* label = new TQLabel(i18n("Deferred to:"), mDeferGroup); label->setFixedSize(label->tqsizeHint()); @@ -296,7 +296,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft; + int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; mTemplateDefaultTime = new RadioButton(i18n("&Default time"), mTemplateTimeGroup, "templateDefTimeButton"); mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->tqsizeHint()); @@ -366,11 +366,11 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par TQString("%1\n\n%2").arg(reminderText).arg(TimeSpinBox::shiftWhatsThis()), true, true, mainPage); mReminder->setFixedSize(mReminder->tqsizeHint()); - topLayout->addWidget(mReminder, 0, Qt::AlignAuto); + topLayout->addWidget(mReminder, 0, TQt::AlignAuto); // Late cancel selector - default = allow late display mLateCancel = new LateCancelSelector(true, mainPage); - topLayout->addWidget(mLateCancel, 0, Qt::AlignAuto); + topLayout->addWidget(mLateCancel, 0, TQt::AlignAuto); // Acknowledgement confirmation required - default = no confirmation tqlayout = new TQHBoxLayout(topLayout, 0); @@ -414,9 +414,9 @@ EditAlarmDlg::~EditAlarmDlg() /****************************************************************************** * Set up the dialog controls common to display alarms. */ -void EditAlarmDlg::initDisplayAlarms(TQWidget* parent) +void EditAlarmDlg::initDisplayAlarms(TQWidget* tqparent) { - mDisplayAlarmsFrame = new TQFrame(parent); + mDisplayAlarmsFrame = new TQFrame(tqparent); mDisplayAlarmsFrame->setFrameStyle(TQFrame::NoFrame); TQBoxLayout* frameLayout = new TQVBoxLayout(mDisplayAlarmsFrame, 0, spacingHint()); @@ -481,9 +481,9 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* parent) /****************************************************************************** * Set up the command alarm dialog controls. */ -void EditAlarmDlg::initCommand(TQWidget* parent) +void EditAlarmDlg::initCommand(TQWidget* tqparent) { - mCommandFrame = new TQFrame(parent); + mCommandFrame = new TQFrame(tqparent); mCommandFrame->setFrameStyle(TQFrame::NoFrame); TQBoxLayout* frameLayout = new TQVBoxLayout(mCommandFrame, 0, spacingHint()); @@ -491,7 +491,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) mCmdTypeScript->setFixedSize(mCmdTypeScript->tqsizeHint()); connect(mCmdTypeScript, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCmdScriptToggled(bool))); TQWhatsThis::add(mCmdTypeScript, i18n("Check to enter the contents of a script instead of a shell command line")); - frameLayout->addWidget(mCmdTypeScript, 0, Qt::AlignAuto); + frameLayout->addWidget(mCmdTypeScript, 0, TQt::AlignAuto); mCmdCommandEdit = new LineEdit(LineEdit::Url, mCommandFrame); TQWhatsThis::add(mCmdCommandEdit, i18n("Enter a shell command to execute.")); @@ -513,7 +513,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) button->setFixedSize(button->tqsizeHint()); TQWhatsThis::add(button, i18n("Check to execute the command in a terminal window")); mCmdOutputGroup->insert(button, EXEC_IN_TERMINAL); - tqlayout->addWidget(button, 0, Qt::AlignAuto); + tqlayout->addWidget(button, 0, TQt::AlignAuto); // Log file name edit box TQHBox* box = new TQHBox(mCmdOutputGroup); @@ -537,7 +537,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) TQWhatsThis::add(button, i18n("Check to log the command output to a local file. The output will be appended to any existing contents of the file.")); mCmdOutputGroup->insert(button, LOG_TO_FILE); - tqlayout->addWidget(button, 0, Qt::AlignAuto); + tqlayout->addWidget(button, 0, TQt::AlignAuto); tqlayout->addWidget(box); // Discard output @@ -545,7 +545,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) button->setFixedSize(button->tqsizeHint()); TQWhatsThis::add(button, i18n("Check to discard command output.")); mCmdOutputGroup->insert(button, DISCARD_OUTPUT); - tqlayout->addWidget(button, 0, Qt::AlignAuto); + tqlayout->addWidget(button, 0, TQt::AlignAuto); // Top-adjust the controls mCmdPadding = new TQHBox(mCommandFrame); @@ -556,9 +556,9 @@ void EditAlarmDlg::initCommand(TQWidget* parent) /****************************************************************************** * Set up the email alarm dialog controls. */ -void EditAlarmDlg::initEmail(TQWidget* parent) +void EditAlarmDlg::initEmail(TQWidget* tqparent) { - mEmailFrame = new TQFrame(parent); + mEmailFrame = new TQFrame(tqparent); mEmailFrame->setFrameStyle(TQFrame::NoFrame); TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint()); TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint()); @@ -649,7 +649,7 @@ list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height()); mEmailBcc->setFixedSize(mEmailBcc->tqsizeHint()); TQWhatsThis::add(mEmailBcc, i18n("If checked, the email will be blind copied to you.")); - grid->addMultiCellWidget(mEmailBcc, 1, 1, 0, 1, Qt::AlignAuto); + grid->addMultiCellWidget(mEmailBcc, 1, 1, 0, 1, TQt::AlignAuto); } /****************************************************************************** @@ -728,7 +728,7 @@ void EditAlarmDlg::initialise(const KAEvent* event) else { mExpiredRecurrence = recurs && event->mainExpired(); - mTimeWidget->setDateTime(recurs || event->uidStatus() == KAEvent::EXPIRED ? event->startDateTime() + mTimeWidget->setDateTime(recurs || event->uidtqStatus() == KAEvent::EXPIRED ? event->startDateTime() : event->mainExpired() ? event->deferDateTime() : event->mainDateTime()); } } @@ -894,7 +894,7 @@ void EditAlarmDlg::setReadOnly() mCmdCommandEdit->setReadOnly(mReadOnly); mCmdScriptEdit->setReadOnly(mReadOnly); for (int id = DISCARD_OUTPUT; id < EXEC_IN_TERMINAL; ++id) - ((RadioButton*)mCmdOutputGroup->find(id))->setReadOnly(mReadOnly); + ((RadioButton*)mCmdOutputGroup->tqfind(id))->setReadOnly(mReadOnly); // Email alarm controls mEmailToEdit->setReadOnly(mReadOnly); @@ -972,9 +972,9 @@ void EditAlarmDlg::setAction(KAEvent::Action action, const AlarmText& alarmText) /****************************************************************************** * Create an "acknowledgement confirmation required" checkbox. */ -CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* parent, const char* name) +CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* tqparent, const char* name) { - CheckBox* widget = new CheckBox(i18n_k_ConfirmAck(), parent, name); + CheckBox* widget = new CheckBox(i18n_k_ConfirmAck(), tqparent, name); TQWhatsThis::add(widget, i18n("Check to be prompted for confirmation when you acknowledge the alarm.")); return widget; @@ -1565,7 +1565,7 @@ void EditAlarmDlg::slotEditDeferral() if (deferDlg.exec() == TQDialog::Accepted) { mDeferDateTime = deferDlg.getDateTime(); - mDeferTimeLabel->setText(mDeferDateTime.isValid() ? mDeferDateTime.formatLocale() : TQString::null); + mDeferTimeLabel->setText(mDeferDateTime.isValid() ? mDeferDateTime.formatLocale() : TQString()); } } @@ -1895,8 +1895,8 @@ void EditAlarmDlg::openAddressBook() */ void EditAlarmDlg::slotAddAttachment() { - TQString url = KAlarm::browseFile(i18n("Choose File to Attach"), mAttachDefaultDir, TQString::null, - TQString::null, KFile::ExistingOnly, this, "pickAttachFile"); + TQString url = KAlarm::browseFile(i18n("Choose File to Attach"), mAttachDefaultDir, TQString(), + TQString(), KFile::ExistingOnly, this, "pickAttachFile"); if (!url.isEmpty()) { mEmailAttachList->insertItem(url); @@ -1948,7 +1948,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const enum Err { NONE = 0, BLANK, NONEXISTENT, DIRECTORY, UNREADABLE, NOT_TEXT_IMAGE }; Err err = NONE; KURL url; - int i = alarmtext.find(TQString::tqfromLatin1("/")); + int i = alarmtext.tqfind(TQString::tqfromLatin1("/")); if (i > 0 && alarmtext[i - 1] == ':') { url = alarmtext; @@ -2027,8 +2027,8 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const = A text edit field with a minimum height of 3 text lines. = Provides KDE 2 compatibility. =============================================================================*/ -TextEdit::TextEdit(TQWidget* parent, const char* name) - : KTextEdit(parent, name) +TextEdit::TextEdit(TQWidget* tqparent, const char* name) + : KTextEdit(tqparent, name) { TQSize tsize = tqsizeHint(); tsize.setHeight(fontMetrics().lineSpacing()*13/4 + 2*frameWidth()); diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h index 500eccb2a..272deaa3a 100644 --- a/kalarm/editdlg.h +++ b/kalarm/editdlg.h @@ -58,17 +58,18 @@ class PickAlarmFileRadio; class EditAlarmDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum MessageType { MESSAGE, FILE }; enum CmdLogType { DISCARD_OUTPUT, LOG_TO_FILE, EXEC_IN_TERMINAL }; - EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent = 0, const char* name = 0, + EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqparent = 0, const char* name = 0, const KAEvent* = 0, bool readOnly = false); virtual ~EditAlarmDlg(); bool getEvent(KAEvent&); void setAction(KAEvent::Action, const AlarmText& = AlarmText()); - static CheckBox* createConfirmAckCheckbox(TQWidget* parent, const char* name = 0); + static CheckBox* createConfirmAckCheckbox(TQWidget* tqparent, const char* name = 0); static TQString i18n_ConfirmAck(); // plain text of 'Confirm acknowledgement' checkbox static TQString i18n_k_ConfirmAck(); // text of 'Confirm acknowledgement' checkbox, with 'k' shortcut @@ -125,9 +126,9 @@ class EditAlarmDlg : public KDialogBase bool checkCommandData(); bool checkEmailData(); - void initDisplayAlarms(TQWidget* parent); - void initCommand(TQWidget* parent); - void initEmail(TQWidget* parent); + void initDisplayAlarms(TQWidget* tqparent); + void initCommand(TQWidget* tqparent); + void initEmail(TQWidget* tqparent); void saveState(const KAEvent*); bool stateChanged() const; diff --git a/kalarm/editdlgprivate.h b/kalarm/editdlgprivate.h index 6cf664006..6dffba7eb 100644 --- a/kalarm/editdlgprivate.h +++ b/kalarm/editdlgprivate.h @@ -24,11 +24,12 @@ #include <ktextedit.h> -class PageFrame : public QFrame +class PageFrame : public TQFrame { Q_OBJECT + TQ_OBJECT public: - PageFrame(TQWidget* parent = 0, const char* name = 0) : TQFrame(parent, name) { } + PageFrame(TQWidget* tqparent = 0, const char* name = 0) : TQFrame(tqparent, name) { } protected: virtual void showEvent(TQShowEvent*) { emit shown(); } signals: @@ -38,8 +39,9 @@ class PageFrame : public QFrame class TextEdit : public KTextEdit { Q_OBJECT + TQ_OBJECT public: - TextEdit(TQWidget* parent, const char* name = 0); + TextEdit(TQWidget* tqparent, const char* name = 0); protected: virtual void dragEnterEvent(TQDragEnterEvent*); }; diff --git a/kalarm/emailidcombo.cpp b/kalarm/emailidcombo.cpp index baa8c2103..20b0ad198 100644 --- a/kalarm/emailidcombo.cpp +++ b/kalarm/emailidcombo.cpp @@ -21,8 +21,8 @@ #include "emailidcombo.moc" -EmailIdCombo::EmailIdCombo(KPIM::IdentityManager* manager, TQWidget* parent, const char* name) - : KPIM::IdentityCombo(manager, parent, name), +EmailIdCombo::EmailIdCombo(KPIM::IdentityManager* manager, TQWidget* tqparent, const char* name) + : KPIM::IdentityCombo(manager, tqparent, name), mReadOnly(false) { } @@ -51,7 +51,7 @@ void EmailIdCombo::mouseMoveEvent(TQMouseEvent* e) void EmailIdCombo::keyPressEvent(TQKeyEvent* e) { - if (!mReadOnly || e->key() == Qt::Key_Escape) + if (!mReadOnly || e->key() == TQt::Key_Escape) KPIM::IdentityCombo::keyPressEvent(e); } diff --git a/kalarm/emailidcombo.h b/kalarm/emailidcombo.h index 378f5c6b2..6e5294d8d 100644 --- a/kalarm/emailidcombo.h +++ b/kalarm/emailidcombo.h @@ -28,8 +28,9 @@ class EmailIdCombo : public KPIM::IdentityCombo { Q_OBJECT + TQ_OBJECT public: - explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* parent = 0, const char* name = 0); + explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* tqparent = 0, const char* name = 0); void setReadOnly(bool ro) { mReadOnly = ro; } protected: virtual void mousePressEvent(TQMouseEvent*); diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp index 23af4aafc..ce0257301 100644 --- a/kalarm/eventlistviewbase.cpp +++ b/kalarm/eventlistviewbase.cpp @@ -30,7 +30,7 @@ #include "eventlistviewbase.moc" -class EventListWhatsThisBase : public QWhatsThis +class EventListWhatsThisBase : public TQWhatsThis { public: EventListWhatsThisBase(EventListViewBase* lv) : TQWhatsThis(lv), mListView(lv) { } @@ -45,8 +45,8 @@ class EventListWhatsThisBase : public QWhatsThis = Base class for displaying a list of events. =============================================================================*/ -EventListViewBase::EventListViewBase(TQWidget* parent, const char* name) - : KListView(parent, name), +EventListViewBase::EventListViewBase(TQWidget* tqparent, const char* name) + : KListView(tqparent, name), mFind(0), mLastColumn(-1), mLastColumnHeaderWidth(0) @@ -370,7 +370,7 @@ int EventListViewBase::itemHeight() if (!item) { // The list is empty, so create a temporary item to find its height - TQListViewItem* item = new TQListViewItem(this, TQString::null); + TQListViewItem* item = new TQListViewItem(this, TQString()); int height = item->height(); delete item; return height; @@ -392,8 +392,8 @@ TQPixmap* EventListViewItemBase::mEmailIcon; int EventListViewItemBase::mIconWidth = 0; -EventListViewItemBase::EventListViewItemBase(EventListViewBase* parent, const KAEvent& event) - : TQListViewItem(parent), +EventListViewItemBase::EventListViewItemBase(EventListViewBase* tqparent, const KAEvent& event) + : TQListViewItem(tqparent), mEvent(event) { iconWidth(); // load the icons @@ -404,9 +404,9 @@ EventListViewItemBase::EventListViewItemBase(EventListViewBase* parent, const KA */ void EventListViewItemBase::setLastColumnText() { - EventListViewBase* parent = (EventListViewBase*)listView(); - setText(parent->lastColumn(), lastColumnText()); - mLastColumnWidth = width(parent->fontMetrics(), parent, parent->lastColumn()); + EventListViewBase* tqparent = (EventListViewBase*)listView(); + setText(tqparent->lastColumn(), lastColumnText()); + mLastColumnWidth = width(tqparent->fontMetrics(), tqparent, tqparent->lastColumn()); } /****************************************************************************** diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h index d9b2b097a..6fe74f4f7 100644 --- a/kalarm/eventlistviewbase.h +++ b/kalarm/eventlistviewbase.h @@ -36,12 +36,13 @@ class Find; class EventListViewBase : public KListView { Q_OBJECT + TQ_OBJECT public: typedef TQValueList<EventListViewBase*> InstanceList; typedef TQValueListIterator<EventListViewBase*> InstanceListIterator; typedef TQValueListConstIterator<EventListViewBase*> InstanceListConstIterator; - EventListViewBase(TQWidget* parent = 0, const char* name = 0); + EventListViewBase(TQWidget* tqparent = 0, const char* name = 0); virtual ~EventListViewBase() { } EventListViewItemBase* getEntry(const TQString& eventID) const; void addEvent(const KAEvent& e) { addEvent(e, instances(), this); } @@ -103,10 +104,10 @@ class EventListViewBase : public KListView }; -class EventListViewItemBase : public QListViewItem +class EventListViewItemBase : public TQListViewItem { public: - EventListViewItemBase(EventListViewBase* parent, const KAEvent&); + EventListViewItemBase(EventListViewBase* tqparent, const KAEvent&); const KAEvent& event() const { return mEvent; } TQPixmap* eventIcon() const; int lastColumnWidth() const { return mLastColumnWidth; } diff --git a/kalarm/find.cpp b/kalarm/find.cpp index 1bec3c7a8..77e841407 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -49,9 +49,9 @@ enum { static long FIND_KALARM_OPTIONS = FIND_LIVE | FIND_EXPIRED | FIND_MESSAGE | FIND_FILE | FIND_COMMAND | FIND_EMAIL; -Find::Find(EventListViewBase* parent) - : TQObject(parent), - mListView(parent), +Find::Find(EventListViewBase* tqparent) + : TQObject(tqparent), + mListView(tqparent), mDialog(0), mFind(0), mOptions(0) @@ -90,7 +90,7 @@ void Find::display() mDialog = new KFindDialog(false, mListView, "FindDlg", mOptions, mHistory, (mListView->selectedCount() > 1)); #endif mDialog->setHasSelection(false); - TQWidget* kalarmWidgets = mDialog->tqfindExtension(); + TQWidget* kalarmWidgets = mDialog->findExtension(); // Alarm types TQBoxLayout* tqlayout = new TQVBoxLayout(kalarmWidgets, 0, KDialog::spacingHint()); @@ -104,16 +104,16 @@ void Find::display() mLive = new TQCheckBox(i18n("Acti&ve"), group); mLive->setFixedSize(mLive->tqsizeHint()); TQWhatsThis::add(mLive, i18n("Check to include active alarms in the search.")); - grid->addWidget(mLive, 1, 0, Qt::AlignAuto); + grid->addWidget(mLive, 1, 0, TQt::AlignAuto); mExpired = new TQCheckBox(i18n("Ex&pired"), group); mExpired->setFixedSize(mExpired->tqsizeHint()); TQWhatsThis::add(mExpired, i18n("Check to include expired alarms in the search. " "This option is only available if expired alarms are currently being displayed.")); - grid->addWidget(mExpired, 1, 2, Qt::AlignAuto); + grid->addWidget(mExpired, 1, 2, TQt::AlignAuto); - mActiveExpiredSep = new KSeparator(Qt::Horizontal, kalarmWidgets); + mActiveExpiredSep = new KSeparator(TQt::Horizontal, kalarmWidgets); grid->addMultiCellWidget(mActiveExpiredSep, 2, 2, 0, 2); // Alarm actions @@ -211,7 +211,7 @@ void Find::slotFind() { if (!mDialog) return; - mHistory = mDialog->tqfindHistory(); // save search history so that it can be displayed again + mHistory = mDialog->findHistory(); // save search history so that it can be displayed again mOptions = mDialog->options() & ~FIND_KALARM_OPTIONS; mOptions |= (mLive->isEnabled() && mLive->isChecked() ? FIND_LIVE : 0) | (mExpired->isEnabled() && mExpired->isChecked() ? FIND_EXPIRED : 0) @@ -250,7 +250,7 @@ void Find::slotFind() } // Set the starting point for the search - mStartID = TQString::null; + mStartID = TQString(); mNoCurrentItem = newPattern; bool checkEnd = false; if (newPattern) @@ -307,40 +307,40 @@ void Find::findNext(bool forward, bool sort, bool checkEnd, bool fromCurrent) if (!(mOptions & FIND_MESSAGE)) break; mFind->setData(event.cleanText()); - found = (mFind->find() == KFind::Match); + found = (mFind->tqfind() == KFind::Match); break; case KAEvent::FILE: if (!(mOptions & FIND_FILE)) break; mFind->setData(event.cleanText()); - found = (mFind->find() == KFind::Match); + found = (mFind->tqfind() == KFind::Match); break; case KAEvent::COMMAND: if (!(mOptions & FIND_COMMAND)) break; mFind->setData(event.cleanText()); - found = (mFind->find() == KFind::Match); + found = (mFind->tqfind() == KFind::Match); break; case KAEvent::EMAIL: if (!(mOptions & FIND_EMAIL)) break; mFind->setData(event.emailAddresses(", ")); - found = (mFind->find() == KFind::Match); + found = (mFind->tqfind() == KFind::Match); if (found) break; mFind->setData(event.emailSubject()); - found = (mFind->find() == KFind::Match); + found = (mFind->tqfind() == KFind::Match); if (found) break; mFind->setData(event.emailAttachments().join(", ")); - found = (mFind->find() == KFind::Match); + found = (mFind->tqfind() == KFind::Match); if (found) break; mFind->setData(event.cleanText()); - found = (mFind->find() == KFind::Match); + found = (mFind->tqfind() == KFind::Match); break; } if (found) @@ -365,7 +365,7 @@ void Find::findNext(bool forward, bool sort, bool checkEnd, bool fromCurrent) { TQString msg = forward ? i18n("End of alarm list reached.\nContinue from the beginning?") : i18n("Beginning of alarm list reached.\nContinue from the end?"); - if (KMessageBox::questionYesNo(mListView, msg, TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(mListView, msg, TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()) == KMessageBox::Yes) { mNoCurrentItem = true; findNext(forward, false); diff --git a/kalarm/find.h b/kalarm/find.h index 3dba48d94..f7170a291 100644 --- a/kalarm/find.h +++ b/kalarm/find.h @@ -33,11 +33,12 @@ class EventListViewBase; class EventListViewItemBase; -class Find : public QObject +class Find : public TQObject { Q_OBJECT + TQ_OBJECT public: - explicit Find(EventListViewBase* parent); + explicit Find(EventListViewBase* tqparent); ~Find(); void display(); void findNext(bool forward) { findNext(forward, true); } @@ -53,7 +54,7 @@ class Find : public QObject void findNext(bool forward, bool sort, bool checkEnd = false, bool fromCurrent = false); EventListViewItemBase* nextItem(EventListViewItemBase*, bool forward) const; - EventListViewBase* mListView; // parent list view + EventListViewBase* mListView; // tqparent list view TQGuardedPtr<KFindDialog> mDialog; TQCheckBox* mExpired; TQCheckBox* mLive; diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index 94497b969..3b45dbc49 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -38,11 +38,11 @@ #include "fontcolour.moc" -FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, +FontColourChooser::FontColourChooser(TQWidget *tqparent, const char *name, bool onlyFixed, const TQStringList &fontList, const TQString& frameLabel, bool editColours, bool fg, bool defaultFont, int visibleListSize) - : TQWidget(parent, name), + : TQWidget(tqparent, name), mFgColourButton(0), mRemoveColourButton(0), mColourList(Preferences::messageColours()), diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h index 1c91bfa2a..b7205602a 100644 --- a/kalarm/fontcolour.h +++ b/kalarm/fontcolour.h @@ -32,11 +32,12 @@ class TQPushButton; class CheckBox; -class FontColourChooser : public QWidget +class FontColourChooser : public TQWidget { Q_OBJECT + TQ_OBJECT public: - explicit FontColourChooser(TQWidget* parent = 0, const char* name = 0, + explicit FontColourChooser(TQWidget* tqparent = 0, const char* name = 0, bool onlyFixed = false, const TQStringList& fontList = TQStringList(), const TQString& frameLabel = i18n("Requested font"), diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index 62888d462..ca62d1011 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -38,8 +38,8 @@ = Font/colour selection button. =============================================================================*/ -FontColourButton::FontColourButton(TQWidget* parent, const char* name) - : TQFrame(parent, name), +FontColourButton::FontColourButton(TQWidget* tqparent, const char* name) + : TQFrame(tqparent, name), mReadOnly(false) { setFrameStyle(NoFrame); @@ -54,11 +54,11 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) // Font and colour sample display mSample = new TQLineEdit(this); - mSample->setMinimumHeight(QMAX(mSample->fontMetrics().lineSpacing(), mButton->height()*3/2)); + mSample->setMinimumHeight(TQMAX(mSample->fontMetrics().lineSpacing(), mButton->height()*3/2)); mSample->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::MinimumExpanding); mSample->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); mSample->setCursorPosition(0); - mSample->tqsetAlignment(Qt::AlignCenter); + mSample->tqsetAlignment(TQt::AlignCenter); TQWhatsThis::add(mSample, i18n("This sample text illustrates the current font and color settings. " "You may edit it to test special characters.")); @@ -119,14 +119,14 @@ void FontColourButton::slotButtonPressed() =============================================================================*/ FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, const TQFont& font, - bool defaultFont, const TQString& caption, TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false), + bool defaultFont, const TQString& caption, TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false), mReadOnly(false) { TQWidget* page = new TQWidget(this); setMainWidget(page); TQVBoxLayout* tqlayout = new TQVBoxLayout(page, 0, spacingHint()); - mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString::null, false, true, true); + mChooser = new FontColourChooser(page, 0, false, TQStringList(), TQString(), false, true, true); mChooser->setBgColour(bgColour); mChooser->setFgColour(fgColour); if (defaultFont) diff --git a/kalarm/fontcolourbutton.h b/kalarm/fontcolourbutton.h index f49942eea..55713605d 100644 --- a/kalarm/fontcolourbutton.h +++ b/kalarm/fontcolourbutton.h @@ -31,11 +31,12 @@ class FontColourChooser; class PushButton; -class FontColourButton : public QFrame +class FontColourButton : public TQFrame { Q_OBJECT + TQ_OBJECT public: - FontColourButton(TQWidget* parent = 0, const char* name = 0); + FontColourButton(TQWidget* tqparent = 0, const char* name = 0); void setDefaultFont(); void setFont(const TQFont&); void setBgColour(const TQColor&); @@ -67,9 +68,10 @@ class FontColourButton : public QFrame class FontColourDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: FontColourDlg(const TQColor& bg, const TQColor& fg, const TQFont&, bool defaultFont, - const TQString& caption, TQWidget* parent = 0, const char* name = 0); + const TQString& caption, TQWidget* tqparent = 0, const char* name = 0); bool defaultFont() const { return mDefaultFont; } TQFont font() const { return mFont; } TQColor bgColour() const { return mBgColour; } diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index db0ff7d34..97d046896 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -129,10 +129,10 @@ TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* * event in that listView instance. * 'event' is updated with the actual event ID. */ -UpdateStatus addEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool useEventID, bool allowKOrgUpdate) +UpdatetqStatus addEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool useEventID, bool allowKOrgUpdate) { kdDebug(5950) << "KAlarm::addEvent(): " << event.id() << endl; - UpdateStatus status = UPDATE_OK; + UpdatetqStatus status = UPDATE_OK; if (!theApp()->checkCalendarDaemon()) // ensure calendar is open and daemon started return UPDATE_FAILED; else @@ -172,7 +172,7 @@ bool addExpiredEvent(KAEvent& event) AlarmCalendar* cal = AlarmCalendar::expiredCalendarOpen(); if (!cal) return false; - bool archiving = (KAEvent::uidStatus(event.id()) == KAEvent::ACTIVE); + bool archiving = (KAEvent::uidtqStatus(event.id()) == KAEvent::ACTIVE); if (archiving) event.setSaveDateTime(TQDateTime::tqcurrentDateTime()); // time stamp to control purging KCal::Event* kcalEvent = cal->addEvent(event); @@ -193,10 +193,10 @@ bool addExpiredEvent(KAEvent& event) * event in that listView instance. * 'event' is updated with the actual event ID. */ -UpdateStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent) +UpdatetqStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent) { kdDebug(5950) << "KAlarm::addTemplate(): " << event.id() << endl; - UpdateStatus status = UPDATE_OK; + UpdatetqStatus status = UPDATE_OK; // Add the template to the calendar file AlarmCalendar* cal = AlarmCalendar::templateCalendarOpen(); @@ -206,7 +206,7 @@ UpdateStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidg status = SAVE_FAILED; else { - cal->emitEmptyStatus(); + cal->emitEmptytqStatus(); // Update the window lists TemplateListView::addEvent(event, selectionView); @@ -225,11 +225,11 @@ UpdateStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidg * If 'selectionView' is non-null, the selection highlight is moved to the * modified event in that listView instance. */ -UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent) +UpdatetqStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent) { kdDebug(5950) << "KAlarm::modifyEvent(): '" << oldEvent.id() << endl; - UpdateStatus status = UPDATE_OK; + UpdatetqStatus status = UPDATE_OK; if (!newEvent.valid()) { deleteEvent(oldEvent, true); @@ -280,7 +280,7 @@ UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListVi * The event is not updated in KOrganizer, since this function is called when an * existing alarm is rescheduled (due to recurrence or deferral). */ -UpdateStatus updateEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool archiveOnDelete, bool incRevision) +UpdatetqStatus updateEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool archiveOnDelete, bool incRevision) { kdDebug(5950) << "KAlarm::updateEvent(): " << event.id() << endl; @@ -311,9 +311,9 @@ UpdateStatus updateEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* * If 'selectionView' is non-null, the selection highlight is moved to the * updated event in that listView instance. */ -UpdateStatus updateTemplate(const KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent) +UpdatetqStatus updateTemplate(const KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent) { - UpdateStatus status = UPDATE_OK; + UpdatetqStatus status = UPDATE_OK; AlarmCalendar* cal = AlarmCalendar::templateCalendarOpen(); if (!cal) status = UPDATE_FAILED; @@ -338,7 +338,7 @@ UpdateStatus updateTemplate(const KAEvent& event, TemplateListView* selectionVie * Delete an alarm from the calendar file and from every main window instance. * If the event is archived, the event's ID is changed to an expired ID if necessary. */ -UpdateStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent) +UpdatetqStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent) { TQString id = event.id(); kdDebug(5950) << "KAlarm::deleteEvent(): " << id << endl; @@ -346,11 +346,11 @@ UpdateStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent) // Update the window lists AlarmListView::deleteEvent(id); - UpdateStatus status = UPDATE_OK; + UpdatetqStatus status = UPDATE_OK; AlarmCalendar* cal; // Delete the event from the calendar file - if (KAEvent::uidStatus(id) == KAEvent::EXPIRED) + if (KAEvent::uidtqStatus(id) == KAEvent::EXPIRED) { cal = AlarmCalendar::expiredCalendarOpen(); if (!cal) @@ -383,7 +383,7 @@ UpdateStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent) /****************************************************************************** * Delete a template from the calendar file and from every template list view. */ -UpdateStatus deleteTemplate(const KAEvent& event) +UpdatetqStatus deleteTemplate(const KAEvent& event) { TQString id = event.id(); @@ -393,7 +393,7 @@ UpdateStatus deleteTemplate(const KAEvent& event) return UPDATE_FAILED; if (!cal->deleteEvent(id, true)) // save calendar after deleting return SAVE_FAILED; - cal->emitEmptyStatus(); + cal->emitEmptytqStatus(); // Update the window lists TemplateListView::deleteEvent(id); @@ -407,7 +407,7 @@ void deleteDisplayEvent(const TQString& eventID) { kdDebug(5950) << "KAlarm::deleteDisplayEvent(" << eventID << ")\n"; - if (KAEvent::uidStatus(eventID) == KAEvent::DISPLAYING) + if (KAEvent::uidtqStatus(eventID) == KAEvent::DISPLAYING) { AlarmCalendar* cal = AlarmCalendar::displayCalendarOpen(); if (cal) @@ -421,13 +421,13 @@ void deleteDisplayEvent(const TQString& eventID) * If 'selectionView' is non-null, the selection highlight is moved to the * restored event in that listView instance. */ -UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool useEventID) +UpdatetqStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool useEventID) { TQString id = event.id(); kdDebug(5950) << "KAlarm::reactivateEvent(): " << id << endl; // Delete the event from the expired calendar file - if (KAEvent::uidStatus(id) == KAEvent::EXPIRED) + if (KAEvent::uidtqStatus(id) == KAEvent::EXPIRED) { TQDateTime now = TQDateTime::tqcurrentDateTime(); if (event.occursAfter(now, true)) @@ -443,7 +443,7 @@ UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool if (!cal->save()) return SAVE_FAILED; - UpdateStatus status = UPDATE_OK; + UpdatetqStatus status = UPDATE_OK; if (event.copyToKOrganizer()) { if (!sendToKOrganizer(event)) // tell KOrganizer to show the event @@ -468,7 +468,7 @@ UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool * If 'selectionView' is non-null, the selection highlight is moved to the * updated event in that listView instance. */ -UpdateStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool enable) +UpdatetqStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool enable) { kdDebug(5950) << "KAlarm::enableEvent(" << enable << "): " << event.id() << endl; @@ -498,7 +498,7 @@ UpdateStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool enab /****************************************************************************** * Display an error message about an error saving an event. */ -void displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError code, int nAlarms) +void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError code, int nAlarms) { TQString errmsg; switch (code) @@ -519,13 +519,13 @@ void displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError code, int nA errmsg = i18n("Error saving alarm template"); break; } - KMessageBox::error(parent, errmsg); + KMessageBox::error(tqparent, errmsg); } /****************************************************************************** * Display an error message corresponding to a specified alarm update error code. */ -void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms) +void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError code, int nAlarms) { TQString errmsg; switch (code) @@ -542,7 +542,7 @@ void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms) : i18n("Unable to delete alarm from KOrganizer"); break; } - KMessageBox::error(parent, errmsg); + KMessageBox::error(tqparent, errmsg); } /****************************************************************************** @@ -551,7 +551,7 @@ void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms) bool edit(const TQString& eventID) { AlarmCalendar* cal; - switch (KAEvent::uidStatus(eventID)) + switch (KAEvent::uidtqStatus(eventID)) { case KAEvent::ACTIVE: cal = AlarmCalendar::activeCalendar(); @@ -628,17 +628,17 @@ TQValueList<KAEvent> templateList() * Prompt the user to re-enable alarms if they are currently disabled, and if * it's an email alarm, warn if no 'From' email address is configured. */ -void outputAlarmWarnings(TQWidget* parent, const KAEvent* event) +void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* event) { if (event && event->action() == KAEvent::EMAIL && Preferences::emailAddress().isEmpty()) - KMessageBox::information(parent, i18n("Please set the 'From' email address...", + KMessageBox::information(tqparent, i18n("Please set the 'From' email address...", "%1\nPlease set it in the Preferences dialog.").arg(KAMail::i18n_NeedFromEmailAddress())); if (!Daemon::monitoringAlarms()) { - if (KMessageBox::warningYesNo(parent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"), - TQString::null, i18n("Enable"), i18n("Keep Disabled"), + if (KMessageBox::warningYesNo(tqparent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"), + TQString(), i18n("Enable"), i18n("Keep Disabled"), TQString::tqfromLatin1("EditEnableAlarms")) == KMessageBox::Yes) Daemon::setAlarmsEnabled(); @@ -706,14 +706,14 @@ TQString runKMail(bool minimise) TQString errmsg; if (!runProgram("kmail", (minimise ? KMAIL_DCOP_WINDOW : ""), dcopName, errmsg)) return i18n("Unable to start KMail\n(%1)").arg(errmsg); - return TQString::null; + return TQString(); } /****************************************************************************** * Start another program for DCOP access if it isn't already running. * If 'windowName' is not empty, the program's window of that name is iconised. -* On exit, 'dcopName' tqcontains the DCOP name to access the application, and -* 'errorMessage' tqcontains an error message if failure. +* On exit, 'dcopName' contains the DCOP name to access the application, and +* 'errorMessage' contains an error message if failure. * Reply = true if the program is now running. */ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage) @@ -721,7 +721,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString if (!kapp->dcopClient()->isApplicationRegistered(program)) { // KOrganizer is not already running, so start it - if (KApplication::startServiceByDesktopName(TQString::tqfromLatin1(program), TQString::null, &errorMessage, &dcopName)) + if (KApplication::startServiceByDesktopName(TQString::tqfromLatin1(program), TQString(), &errorMessage, &dcopName)) { kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")\n"; return false; @@ -729,11 +729,11 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString // Minimise its window - don't use hide() since this would remove all // trace of it from the panel if it is not configured to be docked in // the system tray. - kapp->dcopClient()->send(dcopName, windowName, "minimize()", TQString::null); + kapp->dcopClient()->send(dcopName, windowName, "minimize()", TQString()); } else if (dcopName.isEmpty()) dcopName = program; - errorMessage = TQString::null; + errorMessage = TQString(); return true; } @@ -792,7 +792,7 @@ int getVersionNumber(const TQString& version, TQString* subVersion) // N.B. Remember to change Version(int major, int minor, int rev) // if the representation returned by this method changes. if (subVersion) - *subVersion = TQString::null; + *subVersion = TQString(); int count = version.tqcontains('.') + 1; if (count < 2) return 0; @@ -836,7 +836,7 @@ FileType fileType(const TQString& mimetype) if (mimetype.startsWith(TQString::tqfromLatin1("image/"))) return Image; - int slash = mimetype.find('/'); + int slash = mimetype.tqfind('/'); if (slash < 0) return Unknown; TQString type = mimetype.mid(slash + 1); @@ -868,19 +868,19 @@ FileType fileType(const TQString& mimetype) * Reply = URL selected. If none is selected, URL.isEmpty() is true. */ TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile, - const TQString& filter, int mode, TQWidget* parent, const char* name) + const TQString& filter, int mode, TQWidget* tqparent, const char* name) { TQString initialDir = !initialFile.isEmpty() ? TQString(initialFile).remove(TQRegExp("/[^/]*$")) : !defaultDir.isEmpty() ? defaultDir : TQDir::homeDirPath(); - KFileDialog fileDlg(initialDir, filter, parent, name, true); + KFileDialog fileDlg(initialDir, filter, tqparent, name, true); fileDlg.setOperationMode(mode & KFile::ExistingOnly ? KFileDialog::Opening : KFileDialog::Saving); fileDlg.setMode(KFile::File | mode); fileDlg.setCaption(caption); if (!initialFile.isEmpty()) fileDlg.setSelection(initialFile); if (fileDlg.exec() != TQDialog::Accepted) - return TQString::null; + return TQString(); KURL url = fileDlg.selectedURL(); defaultDir = url.path(); return (mode & KFile::LocalOnly) ? url.path() : url.prettyURL(); @@ -959,17 +959,17 @@ bool sendToKOrganizer(const KAEvent& event) ? KAMail::identityManager()->identityForUoid(event.emailFromId()).fullEmailAddr() : Preferences::emailAddress(); AlarmText atext; - atext.setEmail(event.emailAddresses(", "), from, TQString::null, TQString::null, event.emailSubject(), TQString::null); + atext.setEmail(event.emailAddresses(", "), from, TQString(), TQString(), event.emailSubject(), TQString()); kcalEvent->setSummary(atext.displayText()); userEmail = from; break; } } - kcalEvent->setOrganizer(KCal::Person(TQString::null, userEmail)); + kcalEvent->setOrganizer(KCal::Person(TQString(), userEmail)); // Translate the event into string format KCal::ICalFormat format; - format.setTimeZone(TQString::null, false); + format.setTimeZone(TQString(), false); TQString iCal = format.toICalString(kcalEvent); kdDebug(5950)<<"Korg->"<<iCal<<endl; delete kcalEvent; @@ -1032,7 +1032,7 @@ bool runKOrganizer() { TQString error; TQCString dcopService; - int result = KDCOPServiceStarter::self()->tqfindServiceFor("DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService); + int result = KDCOPServiceStarter::self()->findServiceFor("DCOP/Organizer", TQString(), TQString(), &error, &dcopService); if (result) { kdDebug(5950) << "Unable to start DCOP/Organizer: " << dcopService << " " << error << endl; @@ -1042,7 +1042,7 @@ bool runKOrganizer() // to load KOrganizer into Kontact. But if KOrganizer is running independently, // the load() method doesn't exist. TQCString dummy; - if (!kapp->dcopClient()->tqfindObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) + if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) { DCOPRef ref(dcopService, dcopService); // talk to the KUniqueApplication or its Kontact wrapper DCOPReply reply = ref.call("load()"); @@ -1051,7 +1051,7 @@ bool runKOrganizer() kdWarning(5950) << "Error loading " << dcopService << endl; return false; } - if (!kapp->dcopClient()->tqfindObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) + if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy)) { kdWarning(5950) << "Unable to access KOrganizer's "KORG_DCOP_OBJECT" DCOP object" << endl; return false; diff --git a/kalarm/functions.h b/kalarm/functions.h index 37041f6f2..5a6798640 100644 --- a/kalarm/functions.h +++ b/kalarm/functions.h @@ -48,7 +48,7 @@ enum FileType { Unknown, TextPlain, TextFormatted, TextApplication, Image }; /** Return codes from calendar update functions. * The codes are ordered by severity. */ -enum UpdateStatus { +enum UpdatetqStatus { UPDATE_OK, // update succeeded UPDATE_KORG_ERR, // update succeeded, but KOrganizer update failed UPDATE_ERROR, // update failed partially @@ -62,7 +62,7 @@ enum KOrgUpdateError { KORG_ERR_ADD, KORG_ERR_MODIFY, KORG_ERR_DELETE }; /** Display a main window with the specified event selected */ -MainWindow* displayMainWindowSelected(const TQString& eventID = TQString::null); +MainWindow* displayMainWindowSelected(const TQString& eventID = TQString()); bool readConfigWindowSize(const char* window, TQSize&); void writeConfigWindowSize(const char* window, const TQSize&); /** Check from its mime type whether a file appears to be a text or image file. @@ -76,10 +76,10 @@ int getVersionNumber(const TQString& version, TQString* subVersi /** Return which version of KAlarm was the first to use the current calendar/event format */ inline int currentCalendarVersion() { return KAEvent::calVersion(); } inline TQString currentCalendarVersionString() { return KAEvent::calVersionString(); } -TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile = TQString::null, - const TQString& filter = TQString::null, int mode = 0, TQWidget* parent = 0, const char* name = 0); +TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile = TQString(), + const TQString& filter = TQString(), int mode = 0, TQWidget* tqparent = 0, const char* name = 0); bool edit(const TQString& eventID); -bool editNew(const TQString& templateName = TQString::null); +bool editNew(const TQString& templateName = TQString()); /** Create a "New Alarm" KAction */ KAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection*, const char* name); /** Create a "New From Template" KAction */ @@ -88,25 +88,25 @@ TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* * If shell commands are disabled, command alarm templates are omitted. */ TQValueList<KAEvent> templateList(); -void outputAlarmWarnings(TQWidget* parent, const KAEvent* = 0); +void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* = 0); void resetDaemon(); void resetDaemonIfQueued(); // must only be called from KAlarmApp::processQueue() TQString runKMail(bool minimise); bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage); -UpdateStatus addEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool useEventID = false, bool allowKOrgUpdate = true); +UpdatetqStatus addEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool useEventID = false, bool allowKOrgUpdate = true); bool addExpiredEvent(KAEvent&); -UpdateStatus addTemplate(KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); -UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent = 0); -UpdateStatus updateEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool archiveOnDelete = true, bool incRevision = true); -UpdateStatus updateTemplate(const KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); -UpdateStatus deleteEvent(KAEvent&, bool archive = true, TQWidget* errmsgParent = 0); -UpdateStatus deleteTemplate(const KAEvent&); +UpdatetqStatus addTemplate(KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); +UpdatetqStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent = 0); +UpdatetqStatus updateEvent(KAEvent&, AlarmListView* selectionView, TQWidget* errmsgParent = 0, bool archiveOnDelete = true, bool incRevision = true); +UpdatetqStatus updateTemplate(const KAEvent&, TemplateListView* selectionView, TQWidget* errmsgParent = 0); +UpdatetqStatus deleteEvent(KAEvent&, bool archive = true, TQWidget* errmsgParent = 0); +UpdatetqStatus deleteTemplate(const KAEvent&); void deleteDisplayEvent(const TQString& eventID); -UpdateStatus reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false); -UpdateStatus enableEvent(KAEvent&, AlarmListView* selectionView, bool enable); -void displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError, int nAlarms); -void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError, int nAlarms); +UpdatetqStatus reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false); +UpdatetqStatus enableEvent(KAEvent&, AlarmListView* selectionView, bool enable); +void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError, int nAlarms); +void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError, int nAlarms); TQString stripAccel(const TQString&); diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index a0f008f03..fd81aed47 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -436,7 +436,7 @@ int KAlarmApp::newInstance() TQString addr = TQString::fromLocal8Bit(*i); if (!KAMail::checkAddress(addr)) USAGE(i18n("%1: invalid email address").arg(TQString::tqfromLatin1("--mail"))) - alAddresses += KCal::Person(TQString::null, addr); + alAddresses += KCal::Person(TQString(), addr); } params = args->getOptionList("attach"); for (QCStringList::Iterator i = params.begin(); i != params.end(); ++i) @@ -788,7 +788,7 @@ void KAlarmApp::quitIf(int exitCode, bool force) MainWindow* mw = mwcount ? MainWindow::firstWindow() : 0; if (mwcount > 1 || mwcount && (!mw->isHidden() || !mw->isTrayParent())) return; - // There are no windows left except perhaps a main window which is a hidden tray icon parent + // There are no windows left except perhaps a main window which is a hidden tray icon tqparent if (mTrayWindow) { // There is a system tray icon. @@ -816,13 +816,13 @@ void KAlarmApp::quitIf(int exitCode, bool force) * Closes the system tray window and all main windows, but does not exit the * program if other windows are still open. */ -void KAlarmApp::doQuit(TQWidget* parent) +void KAlarmApp::doQuit(TQWidget* tqparent) { kdDebug(5950) << "KAlarmApp::doQuit()\n"; if (mDisableAlarmsIfStopped - && MessageBox::warningContinueCancel(parent, KMessageBox::Cancel, + && MessageBox::warningContinueCancel(tqparent, KMessageBox::Cancel, i18n("Quitting will disable alarms\n(once any alarm message windows are closed)."), - TQString::null, KStdGuiItem::quit(), Preferences::QUIT_WARN + TQString(), KStdGuiItem::quit(), Preferences::TQUIT_WARN ) != KMessageBox::Yes) return; quitIf(0, true); @@ -831,7 +831,7 @@ void KAlarmApp::doQuit(TQWidget* parent) /****************************************************************************** * Called when the session manager is about to close down the application. */ -void KAlarmApp::commitData(QSessionManager& sm) +void KAlarmApp::commitData(TQSessionManager& sm) { mSessionClosingDown = true; KUniqueApplication::commitData(sm); @@ -901,7 +901,7 @@ void KAlarmApp::processQueue() // Process DCOP calls while (!mDcopQueue.isEmpty()) { - DcopQEntry& entry = mDcopQueue.first(); + DcopTQEntry& entry = mDcopQueue.first(); if (entry.eventId.isEmpty()) { // It's a new alarm @@ -973,7 +973,7 @@ void KAlarmApp::removeWindow(TrayWindow*) /****************************************************************************** * Display or close the system tray icon. */ -bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent) +bool KAlarmApp::displayTrayIcon(bool show, MainWindow* tqparent) { static bool creating = false; if (show) @@ -985,10 +985,10 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent) if (!MainWindow::count() && wantRunInSystemTray()) { creating = true; // prevent main window constructor from creating an additional tray icon - parent = MainWindow::create(); + tqparent = MainWindow::create(); creating = false; } - mTrayWindow = new TrayWindow(parent ? parent : MainWindow::firstWindow()); + mTrayWindow = new TrayWindow(tqparent ? tqparent : MainWindow::firstWindow()); connect(mTrayWindow, TQT_SIGNAL(deleted()), TQT_SIGNAL(trayIconToggled())); mTrayWindow->show(); emit trayIconToggled(); @@ -1199,7 +1199,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons // Alarm is due for display already. // First execute it once without adding it to the calendar file. if (!mInitialised) - mDcopQueue.append(DcopQEntry(event, EVENT_TRIGGER)); + mDcopQueue.append(DcopTQEntry(event, EVENT_TRIGGER)); else execAlarm(event, event.firstAlarm(), false); // If it's a recurring alarm, reschedule it for its next occurrence @@ -1210,7 +1210,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons } // Queue the alarm for insertion into the calendar file - mDcopQueue.append(DcopQEntry(event)); + mDcopQueue.append(DcopTQEntry(event)); if (mInitialised) TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); return true; @@ -1232,7 +1232,7 @@ bool KAlarmApp::handleEvent(const TQString& urlString, const TQString& eventID, Daemon::eventHandled(eventID, false); return false; } - mDcopQueue.append(DcopQEntry(function, eventID)); + mDcopQueue.append(DcopTQEntry(function, eventID)); if (mInitialised) TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); return true; @@ -1592,9 +1592,9 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule MessageWin* win = MessageWin::findEvent(event.id()); // Find if we're changing a reminder message to the real message bool reminder = (alarm.type() & KAAlarm::REMINDER_ALARM); - bool tqreplaceReminder = !reminder && win && (win->alarmType() & KAAlarm::REMINDER_ALARM); + bool replaceReminder = !reminder && win && (win->alarmType() & KAAlarm::REMINDER_ALARM); if (!reminder && !event.deferred() - && (tqreplaceReminder || !win) && !noPreAction + && (replaceReminder || !win) && !noPreAction && !event.preAction().isEmpty() && ShellProcess::authorised()) { // It's not a reminder or a deferred alarm, and there is no message window @@ -1622,11 +1622,11 @@ void* KAlarmApp::execAlarm(KAEvent& event, const KAAlarm& alarm, bool reschedule delete win; // event is disabled - close its window else if (!win || !win->hasDefer() && !alarm.repeatAtLogin() - || tqreplaceReminder) + || replaceReminder) { // Either there isn't already a message for this event, // or there is a repeat-at-login message with no Defer - // button, which needs to be tqreplaced with a new message, + // button, which needs to be replaced with a new message, // or the caption needs to be changed from "Reminder" to "Message". if (win) win->setRecreating(); // prevent post-alarm actions @@ -1705,7 +1705,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& // Execute the command in a terminal window. cmd = Preferences::cmdXTermCommand(); cmd.tqreplace("%t", aboutData()->programName()); // set the terminal window title - if (cmd.find("%C") >= 0) + if (cmd.tqfind("%C") >= 0) { // Execute the command from a temporary script file if (flags & ProcData::TEMP_FILE) @@ -1718,7 +1718,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& cmd.tqreplace("%C", tmpXtermFile); // %C indicates where to insert the command } } - else if (cmd.find("%W") >= 0) + else if (cmd.tqfind("%W") >= 0) { // Execute the command from a temporary script file, // with a sleep after the command is executed @@ -1727,19 +1727,19 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& return 0; cmd.tqreplace("%W", tmpXtermFile); // %w indicates where to insert the command } - else if (cmd.find("%w") >= 0) + else if (cmd.tqfind("%w") >= 0) { // Append a sleep to the command. - // Quote the command in case it tqcontains characters such as [>|;]. + // Quote the command in case it contains characters such as [>|;]. TQString exec = KShellProcess::quote(command + TQString::tqfromLatin1("; sleep 86400")); cmd.tqreplace("%w", exec); // %w indicates where to insert the command string } else { // Set the command to execute. - // Put it in quotes in case it tqcontains characters such as [>|;]. + // Put it in quotes in case it contains characters such as [>|;]. TQString exec = KShellProcess::quote(command); - if (cmd.find("%c") >= 0) + if (cmd.tqfind("%c") >= 0) cmd.tqreplace("%c", exec); // %c indicates where to insert the command string else cmd.append(exec); // otherwise, simply append the command string @@ -1797,7 +1797,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& */ TQString KAlarmApp::createTempScriptFile(const TQString& command, bool insertShell, const KAEvent& event, const KAAlarm& alarm) { - KTempFile tmpFile(TQString::null, TQString::null, 0700); + KTempFile tmpFile(TQString(), TQString(), 0700); tmpFile.setAutoDelete(false); // don't delete file when it is destructed TQTextStream* stream = tmpFile.textStream(); if (!stream) @@ -1816,7 +1816,7 @@ TQString KAlarmApp::createTempScriptFile(const TQString& command, bool insertShe TQStringList errmsgs(i18n("Error creating temporary script file")); (new MessageWin(event, alarm.dateTime(), errmsgs))->show(); - return TQString::null; + return TQString(); } /****************************************************************************** @@ -1917,7 +1917,7 @@ void KAlarmApp::commandErrorMsg(const ShellProcess* proc, const KAEvent& event, /****************************************************************************** * Notes that an informational KMessageBox is displayed for this process. */ -void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* parent) +void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* tqparent) { // Find this command in the command list for (TQValueList<ProcData*>::Iterator it = mCommandProcesses.begin(); it != mCommandProcesses.end(); ++it) @@ -1925,7 +1925,7 @@ void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* parent) ProcData* pd = *it; if (pd->process == proc) { - pd->messageBoxParent = parent; + pd->messageBoxParent = tqparent; break; } } @@ -2118,7 +2118,7 @@ static bool convInterval(const TQCString& timeParam, KARecurrence::Type& recurTy break; case 'M': { - int i = timeString.find('H'); + int i = timeString.tqfind('H'); if (i < 0) { if (!allowMonthYear) diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h index ce1787ff5..0aa81b1bf 100644 --- a/kalarm/kalarmapp.h +++ b/kalarm/kalarmapp.h @@ -48,6 +48,7 @@ class ShellProcess; class KAlarmApp : public KUniqueApplication { Q_OBJECT + TQ_OBJECT public: ~KAlarmApp(); virtual int newInstance(); @@ -61,7 +62,7 @@ class KAlarmApp : public KUniqueApplication bool restoreSession(); bool sessionClosingDown() const { return mSessionClosingDown; } void quitIf() { quitIf(0); } - void doQuit(TQWidget* parent); + void doQuit(TQWidget* tqparent); static void displayFatalError(const TQString& message); void addWindow(TrayWindow* w) { mTrayWindow = w; } void removeWindow(TrayWindow*); @@ -70,13 +71,13 @@ class KAlarmApp : public KUniqueApplication bool displayTrayIcon(bool show, MainWindow* = 0); bool trayIconDisplayed() const { return !!mTrayWindow; } bool editNewAlarm(MainWindow* = 0); - virtual void commitData(QSessionManager&); + virtual void commitData(TQSessionManager&); void* execAlarm(KAEvent&, const KAAlarm&, bool reschedule, bool allowDefer = true, bool noPreAction = false); void alarmShowing(KAEvent&, KAAlarm::Type, const DateTime&); void alarmCompleted(const KAEvent&); bool deleteEvent(const TQString& eventID) { return handleEvent(eventID, EVENT_CANCEL); } - void commandMessage(ShellProcess*, TQWidget* parent); + void commandMessage(ShellProcess*, TQWidget* tqparent); // Methods called indirectly by the DCOP interface bool scheduleEvent(KAEvent::Action, const TQString& text, const TQDateTime&, int lateCancel, int flags, const TQColor& bg, const TQColor& fg, @@ -84,7 +85,7 @@ class KAlarmApp : public KUniqueApplication int reminderMinutes, const KARecurrence& recurrence, int repeatInterval, int repeatCount, uint mailFromID = 0, const EmailAddressList& mailAddresses = EmailAddressList(), - const TQString& mailSubject = TQString::null, + const TQString& mailSubject = TQString(), const TQStringList& mailAttachments = TQStringList()); bool handleEvent(const TQString& calendarFile, const TQString& eventID) { return handleEvent(calendarFile, eventID, EVENT_HANDLE); } bool triggerEvent(const TQString& calendarFile, const TQString& eventID) { return handleEvent(calendarFile, eventID, EVENT_TRIGGER); } @@ -130,11 +131,11 @@ class KAlarmApp : public KUniqueApplication TQStringList tempFiles; int flags; }; - struct DcopQEntry + struct DcopTQEntry { - DcopQEntry(EventFunc f, const TQString& id) : function(f), eventId(id) { } - DcopQEntry(const KAEvent& e, EventFunc f = EVENT_HANDLE) : function(f), event(e) { } - DcopQEntry() { } + DcopTQEntry(EventFunc f, const TQString& id) : function(f), eventId(id) { } + DcopTQEntry(const KAEvent& e, EventFunc f = EVENT_HANDLE) : function(f), event(e) { } + DcopTQEntry() { } EventFunc function; TQString eventId; KAEvent event; @@ -159,16 +160,16 @@ class KAlarmApp : public KUniqueApplication static int mFatalError; // a fatal error has occurred - just wait to exit static TQString mFatalMessage; // fatal error message to output bool mInitialised; // initialisation complete: ready to handle DCOP calls - DcopHandler* mDcopHandler; // the parent of the main DCOP receiver object + DcopHandler* mDcopHandler; // the tqparent of the main DCOP receiver object #ifdef OLD_DCOP - DcopHandlerOld* mDcopHandlerOld; // the parent of the old main DCOP receiver object + DcopHandlerOld* mDcopHandlerOld; // the tqparent of the old main DCOP receiver object #endif TrayWindow* mTrayWindow; // active system tray icon TQTime mStartOfDay; // start-of-day time currently in use TQColor mPrefsExpiredColour; // expired alarms text colour int mPrefsExpiredKeepDays;// how long expired alarms are being kept TQValueList<ProcData*> mCommandProcesses; // currently active command alarm processes - TQValueList<DcopQEntry> mDcopQueue; // DCOP command queue + TQValueList<DcopTQEntry> mDcopQueue; // DCOP command queue int mPendingQuitCode; // exit code for a pending quit bool mPendingQuit; // quit once the DCOP command and shell command queues have been processed bool mProcessingQueue; // a mDcopQueue entry is currently being processed diff --git a/kalarm/kalarmd/adapp.h b/kalarm/kalarmd/adapp.h index 83d11d298..9e0cdc1d0 100644 --- a/kalarm/kalarmd/adapp.h +++ b/kalarm/kalarmd/adapp.h @@ -31,6 +31,7 @@ class AlarmDaemon; class AlarmDaemonApp : public KUniqueApplication { Q_OBJECT + TQ_OBJECT public: AlarmDaemonApp(); virtual int newInstance(); diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp index 1b738b043..2752a3689 100644 --- a/kalarm/kalarmd/adcalendar.cpp +++ b/kalarm/kalarmd/adcalendar.cpp @@ -115,7 +115,7 @@ void ADCalendar::slotDownloadJobResult(KIO::Job *job) loadLocalFile(mTempFileName); } unlink(TQFile::encodeName(mTempFileName)); - mTempFileName = TQString::null; + mTempFileName = TQString(); emit loaded(this, mLoaded); } @@ -142,7 +142,7 @@ bool ADCalendar::setLoadedConnected() */ bool ADCalendar::eventHandled(const KCal::Event* event, const TQValueList<TQDateTime>& alarmtimes) { - EventsMap::ConstIterator it = mEventsHandled.find(EventKey(event->uid(), mUrlIndex)); + EventsMap::ConstIterator it = mEventsHandled.tqfind(EventKey(event->uid(), mUrlIndex)); if (it == mEventsHandled.end()) return false; @@ -170,7 +170,7 @@ void ADCalendar::setEventHandled(const TQString& eventID) EventKey key(eventID, mUrlIndex); // Remove it from the pending list, and add it to the handled list - EventsMap::Iterator it = mEventsPending.find(key); + EventsMap::Iterator it = mEventsPending.tqfind(key); if (it != mEventsPending.end()) { setEventInMap(mEventsHandled, key, it.data().alarmTimes, it.data().eventSequence); @@ -197,7 +197,7 @@ void ADCalendar::setEventPending(const KCal::Event* event, const TQValueList<TQD */ void ADCalendar::setEventInMap(EventsMap& map, const EventKey& key, const TQValueList<TQDateTime>& alarmtimes, int sequence) { - EventsMap::Iterator it = map.find(key); + EventsMap::Iterator it = map.tqfind(key); if (it != map.end()) { // Update the existing entry for the event diff --git a/kalarm/kalarmd/adcalendar.h b/kalarm/kalarmd/adcalendar.h index 67e2fac92..51506d46d 100644 --- a/kalarm/kalarmd/adcalendar.h +++ b/kalarm/kalarmd/adcalendar.h @@ -30,6 +30,7 @@ class ADCalendar; class ADCalendar : public KCal::CalendarLocal { Q_OBJECT + TQ_OBJECT public: typedef TQValueList<ADCalendar*>::ConstIterator ConstIterator; diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 4b6495728..c14a1bf5b 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -58,9 +58,9 @@ static const TQString START_OF_DAY(TQString::tqfromLatin1("StartOfDay")); static const TQString AUTOSTART_TRAY(TQString::tqfromLatin1("AutostartTray")); -AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) +AlarmDaemon::AlarmDaemon(bool autostart, TQObject *tqparent, const char *name) : DCOPObject(name), - TQObject(parent, name), + TQObject(tqparent, name), mAlarmTimer(0) { kdDebug(5900) << "AlarmDaemon::AlarmDaemon()" << endl; @@ -138,7 +138,7 @@ void AlarmDaemon::startMonitoring() // Set up the alarm timer mAlarmTimer = new TQTimer(this); connect(mAlarmTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarmsSlot())); - setTimerStatus(); + setTimertqStatus(); // Start monitoring calendar files. // They are monitored until their client application registers, upon which @@ -156,7 +156,7 @@ void AlarmDaemon::enableCal(const TQString& urlString, bool enable) if (cal) { cal->setEnabled(enable); - notifyCalStatus(cal); // notify KAlarm + notifyCaltqStatus(cal); // notify KAlarm } } @@ -196,8 +196,8 @@ void AlarmDaemon::calendarLoaded(ADCalendar* cal, bool success) { if (success) kdDebug(5900) << "Calendar reloaded" << endl; - notifyCalStatus(cal); // notify KAlarm - setTimerStatus(); + notifyCaltqStatus(cal); // notify KAlarm + setTimertqStatus(); checkAlarms(cal); } @@ -262,8 +262,8 @@ void AlarmDaemon::registerApp(const TQCString& appName, const TQString& appTitle ADConfigData::writeClient(appName, client); ADConfigData::enableAutoStart(true); - setTimerStatus(); - notifyCalStatus(client->calendar()); + setTimertqStatus(); + notifyCaltqStatus(client->calendar()); result = KAlarmd::SUCCESS; } @@ -373,8 +373,8 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal) TQValueList<KCal::Event*> eventsDone; for (TQValueList<KCal::Alarm*>::ConstIterator it = alarms.begin(); it != alarms.end(); ++it) { - KCal::Event* event = dynamic_cast<KCal::Event*>((*it)->parent()); - if (!event || eventsDone.find(event) != eventsDone.end()) + KCal::Event* event = dynamic_cast<KCal::Event*>((*it)->tqparent()); + if (!event || eventsDone.tqfind(event) != eventsDone.end()) continue; // either not an event, or the event has already been processed eventsDone += event; const TQString& eventID = event->uid(); @@ -385,7 +385,7 @@ void AlarmDaemon::checkAlarms(ADCalendar* cal) // The times for non-due alarms are set invalid in 'alarmtimes'. bool recurs = event->doesRecur(); const TQStringList cats = event->categories(); - bool floats = (cats.find(TQString::tqfromLatin1("DATE")) != cats.end()); + bool floats = (cats.tqfind(TQString::tqfromLatin1("DATE")) != cats.end()); TQDateTime nextDateTime = event->dtStart(); if (recurs) { @@ -487,7 +487,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID) { // It's running, but check if it has created our DCOP interface yet QCStringList objects = kapp->dcopClient()->remoteObjects(appname); - if (objects.find(client->dcopObject()) == objects.end()) + if (objects.tqfind(client->dcopObject()) == objects.end()) ready = false; } if (!ready) @@ -531,7 +531,7 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID) /****************************************************************************** * Starts or stops the alarm timer as necessary after a calendar is enabled/disabled. */ -void AlarmDaemon::setTimerStatus() +void AlarmDaemon::setTimertqStatus() { #ifdef AUTOSTART_KALARM if (!mAlarmTimer) @@ -569,7 +569,7 @@ void AlarmDaemon::setTimerStatus() * Send a DCOP message to to the client which owns the specified calendar, * notifying it of a change in calendar status. */ -void AlarmDaemon::notifyCalStatus(const ADCalendar* cal) +void AlarmDaemon::notifyCaltqStatus(const ADCalendar* cal) { ClientInfo* client = ClientInfo::get(cal); if (!client) @@ -577,13 +577,13 @@ void AlarmDaemon::notifyCalStatus(const ADCalendar* cal) TQCString appname = client->appName(); if (kapp->dcopClient()->isApplicationRegistered(static_cast<const char*>(appname))) { - KAlarmd::CalendarStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED) + KAlarmd::CalendartqStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED) : KAlarmd::CALENDAR_UNAVAILABLE; - kdDebug(5900) << "AlarmDaemon::notifyCalStatus() sending:" << appname << " -> " << change << endl; + kdDebug(5900) << "AlarmDaemon::notifyCaltqStatus() sending:" << appname << " -> " << change << endl; AlarmGuiIface_stub stub(appname, client->dcopObject()); stub.alarmDaemonUpdate(change, cal->urlString()); if (!stub.ok()) - kdError(5900) << "AlarmDaemon::notifyCalStatus(): dcop send failed:" << appname << endl; + kdError(5900) << "AlarmDaemon::notifyCaltqStatus(): dcop send failed:" << appname << endl; } } diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h index 54e7980a2..c05a4725c 100644 --- a/kalarm/kalarmd/alarmdaemon.h +++ b/kalarm/kalarmd/alarmdaemon.h @@ -32,8 +32,9 @@ class ADCalendar; class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface { Q_OBJECT + TQ_OBJECT public: - AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0); + AlarmDaemon(bool autostart, TQObject* tqparent = 0, const char* name = 0); private slots: //#ifdef AUTOSTART_KALARM @@ -66,8 +67,8 @@ class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface void reloadCal(ADCalendar*, bool reset); void checkAlarms(ADCalendar*); bool notifyEvent(ADCalendar*, const TQString& eventID); - void notifyCalStatus(const ADCalendar*); - void setTimerStatus(); + void notifyCaltqStatus(const ADCalendar*); + void setTimertqStatus(); static TQString expandURL(const TQString& urlString); TQTimer* mAlarmTimer; diff --git a/kalarm/kalarmd/alarmguiiface.h b/kalarm/kalarmd/alarmguiiface.h index d221fd345..49a467008 100644 --- a/kalarm/kalarmd/alarmguiiface.h +++ b/kalarm/kalarmd/alarmguiiface.h @@ -35,7 +35,7 @@ namespace KAlarmd NOT_FOUND = 2 // notification type requires client start, but client executable not found }; - enum CalendarStatus // parameters to client notification + enum CalendartqStatus // parameters to client notification { CALENDAR_ENABLED, // calendar is now being monitored CALENDAR_DISABLED, // calendar is available but not being monitored @@ -53,9 +53,9 @@ class AlarmGuiIface : virtual public DCOPObject K_DCOP k_dcop: /** Called to notify a change in status of the calendar. - @param calendarStatus new calendar status. Value is of type CalendarStatus. + @param calendartqStatus new calendar status. Value is of type CalendartqStatus. */ - virtual ASYNC alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL) = 0; + virtual ASYNC alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL) = 0; /** Called to notify that an alarm is due. */ diff --git a/kalarm/kalarmd/clientinfo.cpp b/kalarm/kalarmd/clientinfo.cpp index e8c5ea6c7..5475cce57 100644 --- a/kalarm/kalarmd/clientinfo.cpp +++ b/kalarm/kalarmd/clientinfo.cpp @@ -72,7 +72,7 @@ ClientInfo* ClientInfo::get(const TQCString& appName) { if (appName.isEmpty()) return 0; - TQMap<TQCString, ClientInfo*>::ConstIterator it = mClients.find(appName); + TQMap<TQCString, ClientInfo*>::ConstIterator it = mClients.tqfind(appName); if (it == mClients.end()) return 0; return it.data(); @@ -104,7 +104,7 @@ void ClientInfo::clear() */ void ClientInfo::remove(const TQCString& appName) { - TQMap<TQCString, ClientInfo*>::Iterator it = mClients.find(appName); + TQMap<TQCString, ClientInfo*>::Iterator it = mClients.tqfind(appName); if (it != mClients.end()) delete it.data(); } diff --git a/kalarm/kalarmiface.h b/kalarm/kalarmiface.h index 9f74e2824..7ea53c443 100644 --- a/kalarm/kalarmiface.h +++ b/kalarm/kalarmiface.h @@ -103,15 +103,15 @@ class KAlarmIface : virtual public DCOPObject * @param startDateTime Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS] * @param lateCancel Late-cancellation period in minutes, or 0 for no cancellation. * @param flags OR of flag bits defined in Flags enum. - * @param bgColor The background colour for the alarm message window, or TQString::null for the + * @param bgColor The background colour for the alarm message window, or TQString() for the * current default background colour. The string may be in any of the formats * accepted by TQColor::TQColor(const TQString&). - * @param fgColor The foreground colour for the alarm message, or TQString::null for the current + * @param fgColor The foreground colour for the alarm message, or TQString() for the current * default foreground colour. The format of the string is the same as for @p bgColor. - * @param font The font for the alarm message, or TQString::null for the default message font + * @param font The font for the alarm message, or TQString() for the default message font * current at the time the message is displayed. The string should be in format * returned by TQFont::toString(). - * @param audioFile The audio file to play when the alarm is displayed, or TQString::null for none. + * @param audioFile The audio file to play when the alarm is displayed, or TQString() for none. * @param reminderMins The number of minutes in advance of the main alarm and its recurrences to display * a reminder alarm, or 0 for no reminder. * @param recurrence Recurrence specification using iCalendar syntax (defined in RFC2445). @@ -128,15 +128,15 @@ class KAlarmIface : virtual public DCOPObject * @param startDateTime Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS] * @param lateCancel Late-cancellation period in minutes, or 0 for no cancellation. * @param flags OR of flag bits defined in Flags enum. - * @param bgColor The background colour for the alarm message window, or TQString::null for the + * @param bgColor The background colour for the alarm message window, or TQString() for the * current default background colour. The string may be in any of the formats * accepted by TQColor::TQColor(const TQString&). - * @param fgColor The foreground colour for the alarm message, or TQString::null for the current + * @param fgColor The foreground colour for the alarm message, or TQString() for the current * default foreground colour. The format of the string is the same as for @p bgColor. - * @param font The font for the alarm message, or TQString::null for the default message font + * @param font The font for the alarm message, or TQString() for the default message font * current at the time the message is displayed. The string should be in format * returned by TQFont::toString(). - * @param audioFile The audio file to play when the alarm is displayed, or TQString::null for none. + * @param audioFile The audio file to play when the alarm is displayed, or TQString() for none. * @param reminderMins The number of minutes in advance of the main alarm and its recurrences to display * a reminder alarm, or 0 for no reminder. * @param repeatType The time units to use for recurrence. The actual recurrence interval is equal to @@ -155,15 +155,15 @@ class KAlarmIface : virtual public DCOPObject * @param startDateTime Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS] * @param lateCancel Late-cancellation period in minutes, or 0 for no cancellation. * @param flags OR of flag bits defined in Flags enum. - * @param bgColor The background colour for the alarm message window, or TQString::null for the + * @param bgColor The background colour for the alarm message window, or TQString() for the * current default background colour. The string may be in any of the formats * accepted by TQColor::TQColor(const TQString&). - * @param fgColor The foreground colour for the alarm message, or TQString::null for the current + * @param fgColor The foreground colour for the alarm message, or TQString() for the current * default foreground colour. The format of the string is the same as for @p bgColor. - * @param font The font for the alarm message, or TQString::null for the default message font + * @param font The font for the alarm message, or TQString() for the default message font * current at the time the message is displayed. The string should be in format * returned by TQFont::toString(). - * @param audioFile The audio file to play when the alarm is displayed, or TQString::null for none. + * @param audioFile The audio file to play when the alarm is displayed, or TQString() for none. * @param reminderMins The number of minutes in advance of the main alarm and its recurrences to display * a reminder alarm, or 0 for no reminder. * @param repeatType The time units to use for recurrence. The actual recurrence interval is equal to @@ -183,10 +183,10 @@ class KAlarmIface : virtual public DCOPObject * @param startDateTime Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS] * @param lateCancel Late-cancellation period in minutes, or 0 for no cancellation. * @param flags OR of flag bits defined in Flags enum. - * @param bgColor The background colour for the alarm message window, or TQString::null for the + * @param bgColor The background colour for the alarm message window, or TQString() for the * current default background colour. The string may be in any of the formats * accepted by TQColor::TQColor(const TQString&). - * @param audioFile The audio file to play when the alarm is displayed, or TQString::null for none. + * @param audioFile The audio file to play when the alarm is displayed, or TQString() for none. * @param reminderMins The number of minutes in advance of the main alarm and its recurrences to display * a reminder alarm, or 0 for no reminder. * @param recurrence Recurrence specification using iCalendar syntax (defined in RFC2445). @@ -202,10 +202,10 @@ class KAlarmIface : virtual public DCOPObject * @param startDateTime Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS] * @param lateCancel Late-cancellation period in minutes, or 0 for no cancellation. * @param flags OR of flag bits defined in Flags enum. - * @param bgColor The background colour for the alarm message window, or TQString::null for the + * @param bgColor The background colour for the alarm message window, or TQString() for the * current default background colour. The string may be in any of the formats * accepted by TQColor::TQColor(const TQString&). - * @param audioFile The audio file to play when the alarm is displayed, or TQString::null for none. + * @param audioFile The audio file to play when the alarm is displayed, or TQString() for none. * @param reminderMins The number of minutes in advance of the main alarm and its recurrences to display * a reminder alarm, or 0 for no reminder. * @param repeatType The time units to use for recurrence. The actual recurrence interval is equal to @@ -222,10 +222,10 @@ class KAlarmIface : virtual public DCOPObject * @param startDateTime Start date/time, in the format YYYY-MM-DD[THH:MM[:SS]] or [T]HH:MM[:SS] * @param lateCancel Late-cancellation period in minutes, or 0 for no cancellation. * @param flags OR of flag bits defined in Flags enum. - * @param bgColor The background colour for the alarm message window, or TQString::null for the + * @param bgColor The background colour for the alarm message window, or TQString() for the * current default background colour. The string may be in any of the formats * accepted by TQColor::TQColor(const TQString&). - * @param audioFile The audio file to play when the alarm is displayed, or TQString::null for none. + * @param audioFile The audio file to play when the alarm is displayed, or TQString() for none. * @param reminderMins The number of minutes in advance of the main alarm and its recurrences to display * a reminder alarm, or 0 for no reminder. * @param repeatType The time units to use for recurrence. The actual recurrence interval is equal to @@ -281,7 +281,7 @@ class KAlarmIface : virtual public DCOPObject int repeatType, int repeatInterval, const TQString& endDateTime) = 0; /** Schedule an email alarm. - * @param fromID The KMail identity to use as the sender of the email, or TQString::null to use KAlarm's default sender ID. + * @param fromID The KMail identity to use as the sender of the email, or TQString() to use KAlarm's default sender ID. * @param addresses Comma-separated list of addresses to send the email to. * @param subject Subject line of the email. * @param message Email message's body text. @@ -299,7 +299,7 @@ class KAlarmIface : virtual public DCOPObject const TQString& attachments, const TQString& startDateTime, int lateCancel, unsigned flags, const TQString& recurrence, int repeatInterval, int repeatCount) = 0; /** Schedule an email alarm. - * @param fromID The KMail identity to use as the sender of the email, or TQString::null to use KAlarm's default sender ID. + * @param fromID The KMail identity to use as the sender of the email, or TQString() to use KAlarm's default sender ID. * @param addresses Comma-separated list of addresses to send the email to. * @param subject Subject line of the email. * @param message Email message's body text. @@ -319,7 +319,7 @@ class KAlarmIface : virtual public DCOPObject const TQString& attachments, const TQString& startDateTime, int lateCancel, unsigned flags, int repeatType, int repeatInterval, int repeatCount) = 0; /** Schedule an email alarm. - * @param fromID The KMail identity to use as the sender of the email, or TQString::null to use KAlarm's default sender ID. + * @param fromID The KMail identity to use as the sender of the email, or TQString() to use KAlarm's default sender ID. * @param addresses Comma-separated list of addresses to send the email to. * @param subject Subject line of the email. * @param message Email message's body text. @@ -339,12 +339,12 @@ class KAlarmIface : virtual public DCOPObject const TQString& attachments, const TQString& startDateTime, int lateCancel, unsigned flags, int repeatType, int repeatInterval, const TQString& endDateTime) = 0; /** Open the alarm edit dialog to edit an existing alarm. - * @param eventId The unique ID of the event to be edited, or TQString::null to create a new alarm. + * @param eventId The unique ID of the event to be edited, or TQString() to create a new alarm. * @return false if the alarm could not be found or is read-only, true otherwise. */ virtual bool edit(const TQString& eventID) = 0; /** Open the alarm edit dialog to edit a new alarm. - * @param templateName Name of the alarm template to base the new alarm on, or TQString::null if none. + * @param templateName Name of the alarm template to base the new alarm on, or TQString() if none. * If a template is specified but cannot be found, the alarm edit dialog is still * opened but is (obviously) not preset with the template. * @return false if an alarm template was specified but could not be found, true otherwise. diff --git a/kalarm/kalarmui.rc b/kalarm/kalarmui.rc index 686271707..97d05056a 100644 --- a/kalarm/kalarmui.rc +++ b/kalarm/kalarmui.rc @@ -11,7 +11,7 @@ <Action name="edit_undo" /> <Action name="edit_redo" /> <Separator /> - <Action name="edit_find"/> + <Action name="edit_tqfind"/> </ToolBar> <MenuBar> <Menu name="file" > diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index ab4747e34..98647d93b 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -100,7 +100,7 @@ KPIM::IdentityManager* KAMail::identityManager() /****************************************************************************** * Send the email message specified in an event. * Reply = true if the message was sent - 'errmsgs' may contain copy error messages. -* = false if the message was not sent - 'errmsgs' tqcontains the error messages. +* = false if the message was not sent - 'errmsgs' contains the error messages. */ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify) { @@ -144,7 +144,7 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify) return false; } KAMailData data(event, from, - (event.emailBcc() ? Preferences::emailBccAddress() : TQString::null), + (event.emailBcc() ? Preferences::emailBccAddress() : TQString()), allowNotify); kdDebug(5950) << "KAlarmApp::sendEmail(): To: " << event.emailAddresses(", ") << "\nSubject: " << event.emailSubject() << endl; @@ -281,7 +281,7 @@ TQString KAMail::sendKMail(const KAMailData& data) } if (data.allowNotify) notifyQueued(data.event); - return TQString::null; + return TQString(); } /****************************************************************************** @@ -323,7 +323,7 @@ TQString KAMail::addToKMailFolder(const KAMailData& data, const char* folder, bo TQDataStream arg(callData, IO_WriteOnly); arg << TQString::tqfromLatin1(folder) << tmpFile.name(); if (callKMail(callData, "KMailIface", "dcopAddMessage(TQString,TQString)", "int")) - return TQString::null; + return TQString(); err = i18n("Error calling KMail"); } kdError(5950) << "KAMail::addToKMailFolder(" << folder << "): " << err << endl; @@ -385,7 +385,7 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId) char buff[64]; strftime(buff, sizeof(buff), "Date: %a, %d %b %Y %H:%M:%S %z", localtime(&timenow)); TQString from = data.from; - from.tqreplace(TQRegExp("^.*<"), TQString::null).tqreplace(TQRegExp(">.*$"), TQString::null); + from.tqreplace(TQRegExp("^.*<"), TQString()).tqreplace(TQRegExp(">.*$"), TQString()); message = TQString::tqfromLatin1(buff); message += TQString::tqfromLatin1("\nMessage-Id: <%1.%2.%3>\n").arg(timenow).arg(tod.tv_usec).arg(from); } @@ -513,7 +513,7 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event) } message += TQString::tqfromLatin1("\n--%1--\n.\n").arg(boundary); } - return TQString::null; + return TQString(); } /****************************************************************************** @@ -539,7 +539,7 @@ void KAMail::notifyQueued(const KAEvent& event) TQString text = (Preferences::emailClient() == Preferences::KMAIL) ? i18n("An email has been queued to be sent by KMail") : i18n("An email has been queued to be sent"); - KMessageBox::information(0, text, TQString::null, Preferences::EMAIL_QUEUED_NOTIFY); + KMessageBox::information(0, text, TQString(), Preferences::EMAIL_TQUEUED_NOTIFY); return; } } @@ -611,7 +611,7 @@ TQString KAMail::convertAddresses(const TQString& items, EmailAddressList& list) if (!bad.isEmpty()) return bad; } - return TQString::null; + return TQString(); } #if 0 @@ -654,7 +654,7 @@ TQString KAMail::convertAddress(KMime::Types::Address addr, EmailAddressList& li } list += KCal::Person((*mb).displayName, addrPart); } - return TQString::null; + return TQString(); } /* @@ -678,7 +678,7 @@ TQString KAMail::convertAddresses(const TQString& items, TQStringList& list) return item; } } - return TQString::null; + return TQString(); }*/ /****************************************************************************** @@ -691,7 +691,7 @@ int KAMail::checkAddress(TQString& address) { address = address.stripWhiteSpace(); // Check that there are no list separator characters present - if (address.find(',') >= 0 || address.find(';') >= 0) + if (address.tqfind(',') >= 0 || address.tqfind(';') >= 0) return -1; int n = address.length(); if (!n) @@ -701,16 +701,16 @@ int KAMail::checkAddress(TQString& address) if (address[end] == '>') { // The email address is in <...> - if ((start = address.find('<')) < 0) + if ((start = address.tqfind('<')) < 0) return -1; ++start; --end; } - int i = address.find('@', start); + int i = address.tqfind('@', start); if (i >= 0) { if (i == start || i == end) // check @ isn't the first or last character -// || address.find('@', i + 1) >= 0) // check for multiple @ characters +// || address.tqfind('@', i + 1) >= 0) // check for multiple @ characters return -1; } /* else @@ -744,10 +744,10 @@ TQString KAMail::convertAttachments(const TQString& items, TQStringList& list) for (int next = 0; next < length; ) { // Find the first delimiter character (, or ;) - int i = items.find(',', next); + int i = items.tqfind(',', next); if (i < 0) i = items.length(); - int sc = items.find(';', next); + int sc = items.tqfind(';', next); if (sc < 0) sc = items.length(); if (sc < i) @@ -762,7 +762,7 @@ TQString KAMail::convertAttachments(const TQString& items, TQStringList& list) } next = i + 1; } - return TQString::null; + return TQString(); } #if 0 @@ -780,10 +780,10 @@ TQString KAMail::convertAttachments(const TQString& items, KURL::List& list) for (int next = 0; next < length; ) { // Find the first delimiter character (, or ;) - int i = items.find(',', next); + int i = items.tqfind(',', next); if (i < 0) i = items.length(); - int sc = items.find(';', next); + int sc = items.tqfind(';', next); if (sc < 0) sc = items.length(); if (sc < i) @@ -798,7 +798,7 @@ TQString KAMail::convertAttachments(const TQString& items, KURL::List& list) } next = i + 1; } - return TQString::null; + return TQString(); } #endif @@ -944,7 +944,7 @@ TQString KAMail::getMailBody(TQ_UINT32 serialNumber) arg << (int)0; TQString body; if (kapp->dcopClient()->call("kmail", "KMailIface", "getDecodedBodyPart(TQ_UINT32,int)", data, replyType, replyData) - && replyType == "TQString") + && replyType == TQSTRING_OBJECT_NAME_STRING) { TQDataStream reply_stream(replyData, IO_ReadOnly); reply_stream >> body; @@ -963,7 +963,7 @@ TQString getHostName() { char hname[256]; if (gethostname(hname, sizeof(hname))) - return TQString::null; + return TQString(); return TQString::fromLocal8Bit(hname); } } @@ -1005,7 +1005,7 @@ bool parseUserName( const char* & scursor, const char * const send, default: // atom scursor--; // re-set scursor to point to ch again - tmp = TQString::null; + tmp = TQString(); if ( parseAtom( scursor, send, result, false /* no 8bit */ ) ) { if (getpwnam(result.local8Bit())) return true; @@ -1033,7 +1033,7 @@ bool parseAddress( const char* & scursor, const char * const send, const char * oldscursor = scursor; if ( parseMailbox( scursor, send, maybeMailbox, isCRLF ) ) { // yes, it is: - result.displayName = TQString::null; + result.displayName = TQString(); result.mailboxList.append( maybeMailbox ); return true; } @@ -1044,10 +1044,10 @@ bool parseAddress( const char* & scursor, const char * const send, TQString maybeUserName; if ( parseUserName( scursor, send, maybeUserName, isCRLF ) ) { // yes, it is: - maybeMailbox.displayName = TQString::null; + maybeMailbox.displayName = TQString(); maybeMailbox.addrSpec.localPart = maybeUserName; - maybeMailbox.addrSpec.domain = TQString::null; - result.displayName = TQString::null; + maybeMailbox.addrSpec.domain = TQString(); + result.displayName = TQString(); result.mailboxList.append( maybeMailbox ); return true; } diff --git a/kalarm/kamail.h b/kalarm/kamail.h index 6e2d03004..e62ab8f63 100644 --- a/kalarm/kamail.h +++ b/kalarm/kamail.h @@ -59,7 +59,7 @@ class KAMail static TQString convertAddress(KMime::Types::Address, EmailAddressList&); static void notifyQueued(const KAEvent&); static char* base64Encode(const char* in, TQIODevice::Offset size, TQIODevice::Offset& outSize); - static TQStringList errors(const TQString& error = TQString::null, bool sendfail = true); + static TQStringList errors(const TQString& error = TQString(), bool sendfail = true); }; #endif // KAMAIL_H diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp index 274ad9b72..51c127d60 100644 --- a/kalarm/latecancel.cpp +++ b/kalarm/latecancel.cpp @@ -39,8 +39,8 @@ TQString LateCancelSelector::i18n_AutoCloseWinLC() { return i18n("Auto-close TQString LateCancelSelector::i18n_i_AutoCloseWinLC() { return i18n("Auto-close w&indow after late-cancelation time"); } -LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name) - : TQFrame(parent, name), +LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* tqparent, const char* name) + : TQFrame(tqparent, name), mDateOnly(false), mReadOnly(false), mAutoCloseShown(false) @@ -63,13 +63,13 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c mCheckbox->setFixedSize(mCheckbox->tqsizeHint()); connect(mCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); TQWhatsThis::add(mCheckbox, whatsThis); - tqlayout->addWidget(mCheckbox, 0, Qt::AlignAuto); + tqlayout->addWidget(mCheckbox, 0, TQt::AlignAuto); mTimeSelectorFrame = new TQFrame(mStack); mTimeSelectorFrame->setFrameStyle(TQFrame::NoFrame); mStack->addWidget(mTimeSelectorFrame, 2); tqlayout = new TQVBoxLayout(mTimeSelectorFrame, 0, 0); - mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString::null, + mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString(), whatsThis, i18n("Enter how late will cause the alarm to be canceled"), allowHourMinute, mTimeSelectorFrame); connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h index 5b9146489..1d5b53630 100644 --- a/kalarm/latecancel.h +++ b/kalarm/latecancel.h @@ -30,11 +30,12 @@ class TQWidgetStack; class CheckBox; -class LateCancelSelector : public QFrame +class LateCancelSelector : public TQFrame { Q_OBJECT + TQ_OBJECT public: - LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name = 0); + LateCancelSelector(bool allowHourMinute, TQWidget* tqparent, const char* name = 0); int minutes() const; void setMinutes(int Minutes, bool dateOnly, TimePeriod::Units defaultUnits); void setDateOnly(bool dateOnly); @@ -55,7 +56,7 @@ class LateCancelSelector : public QFrame private: TQBoxLayout* mLayout; // overall tqlayout for the widget - TQWidgetStack* mStack; // tqcontains mCheckboxFrame and mTimeSelectorFrame + TQWidgetStack* mStack; // contains mCheckboxFrame and mTimeSelectorFrame TQFrame* mCheckboxFrame; CheckBox* mCheckbox; // displayed when late cancellation is not selected TQFrame* mTimeSelectorFrame; diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp index 018640123..b8528316c 100644 --- a/kalarm/lib/buttongroup.cpp +++ b/kalarm/lib/buttongroup.cpp @@ -26,26 +26,26 @@ #include "buttongroup.moc" -ButtonGroup::ButtonGroup(TQWidget* parent, const char* name) - : TQButtonGroup(parent, name) +ButtonGroup::ButtonGroup(TQWidget* tqparent, const char* name) + : TQButtonGroup(tqparent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } -ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* name) - : TQButtonGroup(title, parent, name) +ButtonGroup::ButtonGroup(const TQString& title, TQWidget* tqparent, const char* name) + : TQButtonGroup(title, tqparent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } -ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name) - : TQButtonGroup(strips, orient, parent, name) +ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* tqparent, const char* name) + : TQButtonGroup(strips, orient, tqparent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } -ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name) - : TQButtonGroup(strips, orient, title, parent, name) +ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* tqparent, const char* name) + : TQButtonGroup(strips, orient, title, tqparent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h index 8fbadae77..9d4a8886a 100644 --- a/kalarm/lib/buttongroup.h +++ b/kalarm/lib/buttongroup.h @@ -1,5 +1,5 @@ /* - * buttongroup.h - TQButtonGroup with an extra signal and Qt 2 compatibility + * buttongroup.h - TQButtonGroup with an extra signal and TQt 2 compatibility * Program: kalarm * Copyright © 2002,2004,2006 by David Jarvie <software@astrojar.org.uk> * @@ -24,47 +24,48 @@ /** - * @short A TQButtonGroup with signal on new selection, plus Qt 2 compatibility. + * @short A TQButtonGroup with signal on new selection, plus TQt 2 compatibility. * * The ButtonGroup class provides an enhanced version of the TQButtonGroup class. * * It emits an additional signal, buttonSet(int), whenever any of its buttons * changes state, for whatever reason, including programmatic control. (The * TQButtonGroup class only emits signals when buttons are clicked on by the user.) - * The class also provides Qt 2 compatibility. + * The class also provides TQt 2 compatibility. * * @author David Jarvie <software@astrojar.org.uk> */ -class ButtonGroup : public QButtonGroup +class ButtonGroup : public TQButtonGroup { Q_OBJECT + TQ_OBJECT public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit ButtonGroup(TQWidget* parent, const char* name = 0); + explicit ButtonGroup(TQWidget* tqparent, const char* name = 0); /** Constructor. * @param title The title displayed for this button group. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - ButtonGroup(const TQString& title, TQWidget* parent, const char* name = 0); + ButtonGroup(const TQString& title, TQWidget* tqparent, const char* name = 0); /** Constructor. * @param strips The number of rows or columns of buttons. - * @param orient The orientation (Qt::Horizontal or Qt::Vertical) of the button group. - * @param parent The parent object of this widget. + * @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name = 0); + ButtonGroup(int strips, Qt::Orientation orient, TQWidget* tqparent, const char* name = 0); /** Constructor. * @param strips The number of rows or columns of buttons. - * @param orient The orientation (Qt::Horizontal or Qt::Vertical) of the button group. + * @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group. * @param title The title displayed for this button group. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0); + ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* tqparent, const char* name = 0); /** Inserts a button in the group. * This overrides the insert() method of TQButtonGroup, which should really be a virtual method... * @param button The button to insert. diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp index dde0d10ff..cff6cdb17 100644 --- a/kalarm/lib/checkbox.cpp +++ b/kalarm/lib/checkbox.cpp @@ -21,15 +21,15 @@ #include "checkbox.moc" -CheckBox::CheckBox(TQWidget* parent, const char* name) - : TQCheckBox(parent, name), +CheckBox::CheckBox(TQWidget* tqparent, const char* name) + : TQCheckBox(tqparent, name), mFocusPolicy(focusPolicy()), mFocusWidget(0), mReadOnly(false) { } -CheckBox::CheckBox(const TQString& text, TQWidget* parent, const char* name) - : TQCheckBox(text, parent, name), +CheckBox::CheckBox(const TQString& text, TQWidget* tqparent, const char* name) + : TQCheckBox(text, tqparent, name), mFocusPolicy(focusPolicy()), mFocusWidget(0), mReadOnly(false) @@ -86,7 +86,7 @@ void CheckBox::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQCheckBox::mousePressEvent(e); @@ -97,7 +97,7 @@ void CheckBox::mouseReleaseEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQCheckBox::mouseReleaseEvent(e); @@ -114,10 +114,10 @@ void CheckBox::keyPressEvent(TQKeyEvent* e) if (mReadOnly) switch (e->key()) { - case Qt::Key_Up: - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_Down: + case TQt::Key_Up: + case TQt::Key_Left: + case TQt::Key_Right: + case TQt::Key_Down: // Process keys which shift the focus break; default: diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h index 389e66231..6b6985cd6 100644 --- a/kalarm/lib/checkbox.h +++ b/kalarm/lib/checkbox.h @@ -39,21 +39,22 @@ * * @author David Jarvie <software@astrojar.org.uk> */ -class CheckBox : public QCheckBox +class CheckBox : public TQCheckBox { Q_OBJECT + TQ_OBJECT public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit CheckBox(TQWidget* parent, const char* name = 0); + explicit CheckBox(TQWidget* tqparent, const char* name = 0); /** Constructor. * @param text Text to display. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - CheckBox(const TQString& text, TQWidget* parent, const char* name = 0); + CheckBox(const TQString& text, TQWidget* tqparent, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the check box is read-only for the user. If read-only, @@ -79,7 +80,7 @@ class CheckBox : public QCheckBox protected slots: void slotClicked(); private: - TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the QCheckBox + TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQCheckBox TQWidget* mFocusWidget; // widget to receive focus when button is clicked on bool mFocusWidgetEnable; // enable focus widget before setting focus bool mReadOnly; // value cannot be changed diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index 0345104e0..769e6518b 100644 --- a/kalarm/lib/colourcombo.cpp +++ b/kalarm/lib/colourcombo.cpp @@ -30,8 +30,8 @@ #include "colourcombo.moc" -ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defaultColour) - : TQComboBox(parent, name), +ColourCombo::ColourCombo(TQWidget* tqparent, const char* name, const TQColor& defaultColour) + : TQComboBox(tqparent, name), mColourList(Preferences::messageColours()), mSelectedColour(defaultColour), mCustomColour(255, 255, 255), @@ -169,9 +169,9 @@ void ColourCombo::drawCustomItem(TQRect& rect, bool insert) { TQPen pen; if (tqGray(mCustomColour.rgb()) < 128) - pen.setColor(Qt::white); + pen.setColor(TQt::white); else - pen.setColor(Qt::black); + pen.setColor(TQt::black); TQPainter painter; TQFontMetrics fm = TQFontMetrics(painter.font()); @@ -208,7 +208,7 @@ void ColourCombo::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQComboBox::mousePressEvent(e); @@ -228,7 +228,7 @@ void ColourCombo::mouseMoveEvent(TQMouseEvent* e) void ColourCombo::keyPressEvent(TQKeyEvent* e) { - if (!mReadOnly || e->key() == Qt::Key_Escape) + if (!mReadOnly || e->key() == TQt::Key_Escape) TQComboBox::keyPressEvent(e); } diff --git a/kalarm/lib/colourcombo.h b/kalarm/lib/colourcombo.h index b05f78823..31fcdbdcc 100644 --- a/kalarm/lib/colourcombo.h +++ b/kalarm/lib/colourcombo.h @@ -40,17 +40,18 @@ * * @author David Jarvie <software@astrojar.org.uk> */ -class ColourCombo : public QComboBox +class ColourCombo : public TQComboBox { Q_OBJECT - Q_PROPERTY(TQColor color READ color WRITE setColor) + TQ_OBJECT + TQ_PROPERTY(TQColor color READ color WRITE setColor) public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. * @param defaultColour The colour which is selected by default. */ - explicit ColourCombo(TQWidget* parent = 0, const char* name = 0, const TQColor& defaultColour = 0xFFFFFF); + explicit ColourCombo(TQWidget* tqparent = 0, const char* name = 0, const TQColor& defaultColour = 0xFFFFFF); /** Returns the selected colour. */ TQColor color() const { return mSelectedColour; } /** Returns the selected colour. */ diff --git a/kalarm/lib/colourlist.cpp b/kalarm/lib/colourlist.cpp index 93886b5fa..77bdaa9d1 100644 --- a/kalarm/lib/colourlist.cpp +++ b/kalarm/lib/colourlist.cpp @@ -29,8 +29,8 @@ ColourList::ColourList(const TQColor* colours) void ColourList::insert(const TQColor& colour) { - QRgb rgb = colour.rgb(); - for (TQValueListIterator<QRgb> it = mList.begin(); it != mList.end(); ++it) + TQRgb rgb = colour.rgb(); + for (TQValueListIterator<TQRgb> it = mList.begin(); it != mList.end(); ++it) { if (rgb <= *it) { diff --git a/kalarm/lib/colourlist.h b/kalarm/lib/colourlist.h index 8ec2b2a94..7bee8d149 100644 --- a/kalarm/lib/colourlist.h +++ b/kalarm/lib/colourlist.h @@ -32,7 +32,7 @@ * The ColourList class holds a list of colours, sorted in RGB value order. * * It provides a sorted TQValueList of colours in RGB value order, with iterators - * and other access methods which return either QRgb or TQColor objects. + * and other access methods which return either TQRgb or TQColor objects. * * @author David Jarvie <software@astrojar.org.uk> */ @@ -40,14 +40,14 @@ class ColourList { public: typedef size_t size_type; - typedef TQValueListConstIterator<QRgb> const_iterator; + typedef TQValueListConstIterator<TQRgb> const_iterator; /** Constructs an empty list. */ ColourList() { } /** Copy constructor. */ ColourList(const ColourList& l) : mList(l.mList) { } /** Constructs a list whose values are preset to the colours in @p list. */ - ColourList(const TQValueList<QRgb>& list) : mList(list) { qHeapSort(mList); } + ColourList(const TQValueList<TQRgb>& list) : mList(list) { qHeapSort(mList); } /** Constructs a list whose values are preset to the colours in the @p list. * Terminate @p list by an invalid colour. */ @@ -55,7 +55,7 @@ class ColourList /** Assignment operator. */ ColourList& operator=(const ColourList& l) { mList = l.mList; return *this; } /** Sets the list to comprise the colours in @p list. */ - ColourList& operator=(const TQValueList<QRgb>& list) { mList = list; qHeapSort(mList); return *this; } + ColourList& operator=(const TQValueList<TQRgb>& list) { mList = list; qHeapSort(mList); return *this; } /** Removes all values from the list. */ void clear() { mList.clear(); } /** Adds the specified colour @p c to the list. */ @@ -82,16 +82,16 @@ class ColourList const_iterator fromLast() const { return mList.fromLast(); } /** Returns an iterator pointing to the colour at position @p i in the list. */ const_iterator at(size_type i) const { return mList.at(i); } - /** Returns true if the list tqcontains the colour @p c. */ + /** Returns true if the list contains the colour @p c. */ size_type tqcontains(const TQColor& c) const { return mList.tqcontains(c.rgb()); } /** Returns an iterator pointing to the first occurrence of colour @p c in the list. * Returns end() if colour @p c is not in the list. */ - const_iterator find(const TQColor& c) const { return mList.find(c.rgb()); } + const_iterator tqfind(const TQColor& c) const { return mList.tqfind(c.rgb()); } /** Returns an iterator pointing to the first occurrence of colour @p c in the list, starting. * from position @p it. Returns end() if colour @p c is not in the list. */ - const_iterator find(const_iterator it, const TQColor& c) const { return mList.find(it, c.rgb()); } + const_iterator tqfind(const_iterator it, const TQColor& c) const { return mList.tqfind(it, c.rgb()); } /** Returns the index to the first occurrence of colour @p c in the list. * Returns -1 if colour @p c is not in the list. */ @@ -104,7 +104,7 @@ class ColourList TQColor operator[](size_type i) const { return TQColor(mList[i]); } private: void sort(); - TQValueList<QRgb> mList; + TQValueList<TQRgb> mList; }; #endif // COLOURLIST_H diff --git a/kalarm/lib/combobox.cpp b/kalarm/lib/combobox.cpp index bb232ffe5..0c526cae3 100644 --- a/kalarm/lib/combobox.cpp +++ b/kalarm/lib/combobox.cpp @@ -22,13 +22,13 @@ #include "combobox.moc" -ComboBox::ComboBox(TQWidget* parent, const char* name) - : TQComboBox(parent, name), +ComboBox::ComboBox(TQWidget* tqparent, const char* name) + : TQComboBox(tqparent, name), mReadOnly(false) { } -ComboBox::ComboBox(bool rw, TQWidget* parent, const char* name) - : TQComboBox(rw, parent, name), +ComboBox::ComboBox(bool rw, TQWidget* tqparent, const char* name) + : TQComboBox(rw, tqparent, name), mReadOnly(false) { } @@ -47,7 +47,7 @@ void ComboBox::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQComboBox::mousePressEvent(e); @@ -67,7 +67,7 @@ void ComboBox::mouseMoveEvent(TQMouseEvent* e) void ComboBox::keyPressEvent(TQKeyEvent* e) { - if (!mReadOnly || e->key() == Qt::Key_Escape) + if (!mReadOnly || e->key() == TQt::Key_Escape) TQComboBox::keyPressEvent(e); } diff --git a/kalarm/lib/combobox.h b/kalarm/lib/combobox.h index 3f33a63db..5f8f4cc3c 100644 --- a/kalarm/lib/combobox.h +++ b/kalarm/lib/combobox.h @@ -34,21 +34,22 @@ * * @author David Jarvie <software@astrojar.org.uk> */ -class ComboBox : public QComboBox +class ComboBox : public TQComboBox { Q_OBJECT + TQ_OBJECT public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit ComboBox(TQWidget* parent = 0, const char* name = 0); + explicit ComboBox(TQWidget* tqparent = 0, const char* name = 0); /** Constructor. * @param rw True for a read-write combo box, false for a read-only combo box. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit ComboBox(bool rw, TQWidget* parent = 0, const char* name = 0); + explicit ComboBox(bool rw, TQWidget* tqparent = 0, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the combo box is read-only for the user. If read-only, diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 2cc106982..38a6a5cba 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -25,8 +25,8 @@ #include "dateedit.moc" -DateEdit::DateEdit(TQWidget* parent, const char* name) - : KDateEdit(parent, name) +DateEdit::DateEdit(TQWidget* tqparent, const char* name) + : KDateEdit(tqparent, name) { connect(this, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(newDateEntered(const TQDate&))); } @@ -91,7 +91,7 @@ void DateEdit::mousePressEvent(TQMouseEvent *e) if (isReadOnly()) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } KDateEdit::mousePressEvent(e); diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h index 7ea09e01b..7ad0a7a05 100644 --- a/kalarm/lib/dateedit.h +++ b/kalarm/lib/dateedit.h @@ -37,13 +37,14 @@ class DateEdit : public KDateEdit { Q_OBJECT + TQ_OBJECT public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit DateEdit(TQWidget* parent = 0, const char* name = 0); - /** Returns true if the widget tqcontains a valid date. */ + explicit DateEdit(TQWidget* tqparent = 0, const char* name = 0); + /** Returns true if the widget contains a valid date. */ bool isValid() const { return date().isValid(); } /** Returns the earliest date which can be entered. * If there is no minimum date, returns an invalid date. @@ -56,15 +57,15 @@ class DateEdit : public KDateEdit /** Sets the earliest date which can be entered. * @param date Earliest date allowed. If invalid, any minimum limit is removed. * @param errorDate Error message to be displayed when a date earlier than - * @p date is entered. Set to TQString::null to use the default error message. + * @p date is entered. Set to TQString() to use the default error message. */ - void setMinDate(const TQDate& date, const TQString& errorDate = TQString::null); + void setMinDate(const TQDate& date, const TQString& errorDate = TQString()); /** Sets the latest date which can be entered. * @param date Latest date allowed. If invalid, any maximum limit is removed. * @param errorDate Error message to be displayed when a date later than - * @p date is entered. Set to TQString::null to use the default error message. + * @p date is entered. Set to TQString() to use the default error message. */ - void setMaxDate(const TQDate& date, const TQString& errorDate = TQString::null); + void setMaxDate(const TQDate& date, const TQString& errorDate = TQString()); /** Sets the date held in the widget to an invalid date. */ void setInvalid(); diff --git a/kalarm/lib/datetime.cpp b/kalarm/lib/datetime.cpp index 3ebaccd30..e9dae4140 100644 --- a/kalarm/lib/datetime.cpp +++ b/kalarm/lib/datetime.cpp @@ -43,7 +43,7 @@ TQString DateTime::formatLocale(bool shortFormat) const else if (mTimeValid) return KGlobal::locale()->formatDateTime(mDateTime, shortFormat); else - return TQString::null; + return TQString(); } bool operator==(const DateTime& dt1, const DateTime& dt2) diff --git a/kalarm/lib/datetime.h b/kalarm/lib/datetime.h index eb40d6b5c..976bada90 100644 --- a/kalarm/lib/datetime.h +++ b/kalarm/lib/datetime.h @@ -169,14 +169,14 @@ class DateTime * If it is a date-time, both time and date are included in the output. * If it is date-only, only the date is included in the output. */ - TQString toString(Qt::DateFormat f = Qt::TextDate) const + TQString toString(TQt::DateFormat f = TQt::TextDate) const { if (mDateOnly) return mDateTime.date().toString(f); else if (mTimeValid) return mDateTime.toString(f); else - return TQString::null; + return TQString(); } /** Returns the value as a string. * If it is a date-time, both time and date are included in the output. @@ -189,7 +189,7 @@ class DateTime else if (mTimeValid) return mDateTime.toString(format); else - return TQString::null; + return TQString(); } /** Returns the value as a string, formatted according to the user's locale. * If it is a date-time, both time and date are included in the output. diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp index ad6fd7832..d2b18ba10 100644 --- a/kalarm/lib/label.cpp +++ b/kalarm/lib/label.cpp @@ -23,20 +23,20 @@ #include "label.moc" -Label::Label(TQWidget* parent, const char* name, WFlags f) - : TQLabel(parent, name, f), +Label::Label(TQWidget* tqparent, const char* name, WFlags f) + : TQLabel(tqparent, name, f), mRadioButton(0), mFocusWidget(0) { } -Label::Label(const TQString& text, TQWidget* parent, const char* name, WFlags f) - : TQLabel(text, parent, name, f), +Label::Label(const TQString& text, TQWidget* tqparent, const char* name, WFlags f) + : TQLabel(text, tqparent, name, f), mRadioButton(0), mFocusWidget(0) { } -Label::Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name, WFlags f) - : TQLabel(buddy, text, parent, name, f), +Label::Label(TQWidget* buddy, const TQString& text, TQWidget* tqparent, const char* name, WFlags f) + : TQLabel(buddy, text, tqparent, name, f), mRadioButton(0), mFocusWidget(0) { } @@ -103,8 +103,8 @@ void Label::activated() * Class: LabelFocusWidget =============================================================================*/ -LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name) - : TQWidget(parent, name) +LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name) + : TQWidget(tqparent, name) { setFocusPolicy(ClickFocus); setFixedSize(TQSize(1,1)); @@ -112,7 +112,7 @@ LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name) void LabelFocusWidget::focusInEvent(TQFocusEvent*) { - Label* parent = (Label*)tqparentWidget(); - parent->activated(); + Label* tqparent = (Label*)tqparentWidget(); + tqparent->activated(); } diff --git a/kalarm/lib/label.h b/kalarm/lib/label.h index d5f46c4fe..bd0e39035 100644 --- a/kalarm/lib/label.h +++ b/kalarm/lib/label.h @@ -38,35 +38,36 @@ class LabelFocusWidget; * * @author David Jarvie <software@astrojar.org.uk> */ -class Label : public QLabel +class Label : public TQLabel { Q_OBJECT + TQ_OBJECT friend class LabelFocusWidget; public: /** Constructs an empty label. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. * @param f Flags. See TQWidget constructor for details. */ - explicit Label(TQWidget* parent, const char* name = 0, WFlags f = 0); + explicit Label(TQWidget* tqparent, const char* name = 0, WFlags f = 0); /** Constructs a label that displays @p text. * @param text Text string to display. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. * @param f Flags. See TQWidget constructor for details. */ - Label(const TQString& text, TQWidget* parent, const char* name = 0, WFlags f = 0); + Label(const TQString& text, TQWidget* tqparent, const char* name = 0, WFlags f = 0); /** Constructs a label, with a buddy widget, that displays @p text. * @param buddy Buddy widget which receives the keyboard focus when the * label's accelerator key is pressed. If @p buddy is a radio * button, @p buddy is in addition selected when the * accelerator key is pressed. * @param text Text string to display. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. * @param f Flags. See TQWidget constructor for details. */ - Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name = 0, WFlags f = 0); + Label(TQWidget* buddy, const TQString& text, TQWidget* tqparent, const char* name = 0, WFlags f = 0); /** Sets the label's buddy widget which receives the keyboard focus when the * label's accelerator key is pressed. If @p buddy is a radio button, * @p buddy is in addition selected when the accelerator key is pressed. @@ -84,11 +85,12 @@ class Label : public QLabel // Private class for use by Label -class LabelFocusWidget : public QWidget +class LabelFocusWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - LabelFocusWidget(TQWidget* parent, const char* name = 0); + LabelFocusWidget(TQWidget* tqparent, const char* name = 0); protected: virtual void focusInEvent(TQFocusEvent*); }; diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp index 4dcdc15f8..d85a99458 100644 --- a/kalarm/lib/lineedit.cpp +++ b/kalarm/lib/lineedit.cpp @@ -39,8 +39,8 @@ * It has an option to prevent its contents being selected when it receives = focus. =============================================================================*/ -LineEdit::LineEdit(Type type, TQWidget* parent, const char* name) - : KLineEdit(parent, name), +LineEdit::LineEdit(Type type, TQWidget* tqparent, const char* name) + : KLineEdit(tqparent, name), mType(type), mNoSelect(false), mSetCursorAtEnd(false) @@ -48,8 +48,8 @@ LineEdit::LineEdit(Type type, TQWidget* parent, const char* name) init(); } -LineEdit::LineEdit(TQWidget* parent, const char* name) - : KLineEdit(parent, name), +LineEdit::LineEdit(TQWidget* tqparent, const char* name) + : KLineEdit(tqparent, name), mType(Text), mNoSelect(false), mSetCursorAtEnd(false) @@ -122,7 +122,7 @@ void LineEdit::dropEvent(TQDropEvent* e) if (mType == Emails) newText = mailList.first().from(); else - setText(mailList.first().subject()); // tqreplace any existing text + setText(mailList.first().subject()); // replace any existing text } } // This must come before KURLDrag @@ -144,7 +144,7 @@ void LineEdit::dropEvent(TQDropEvent* e) { case Url: // URL entry field - ignore all but the first dropped URL - setText(files.first().prettyURL()); // tqreplace any existing text + setText(files.first().prettyURL()); // replace any existing text break; case Emails: { @@ -181,7 +181,7 @@ void LineEdit::dropEvent(TQDropEvent* e) } else { - int newline = txt.find('\n'); + int newline = txt.tqfind('\n'); newText = (newline >= 0) ? txt.left(newline) : txt; } } diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h index 5d36de3c5..0da536835 100644 --- a/kalarm/lib/lineedit.h +++ b/kalarm/lib/lineedit.h @@ -43,16 +43,17 @@ class LineEdit : public KLineEdit { Q_OBJECT + TQ_OBJECT public: /** Types of drag and drop content which will be accepted. - * @li Text - the line edit tqcontains general text. It accepts text, a URL + * @li Text - the line edit contains general text. It accepts text, a URL * or an email from KMail (the subject line is used). If multiple * URLs or emails are dropped, only the first is used; the * rest are ignored. - * @li Url - the line edit tqcontains a URL. It accepts text or a URL. If + * @li Url - the line edit contains a URL. It accepts text or a URL. If * multiple URLs are dropped, only the first URL is used; the * rest are ignored. - * @li Emails - the line edit tqcontains email addresses. It accepts text, + * @li Emails - the line edit contains email addresses. It accepts text, * mailto: URLs, emails from KMail (the From address is used) * or vcard data (e.g. from KAddressBook). If multiple emails * are dropped, only the first is used; the rest are ignored. @@ -61,15 +62,15 @@ class LineEdit : public KLineEdit enum Type { Text, Url, Emails }; /** Constructor. * @param type The content type for the line edit. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit LineEdit(Type type, TQWidget* parent = 0, const char* name = 0); + explicit LineEdit(Type type, TQWidget* tqparent = 0, const char* name = 0); /** Constructs a line edit whose content type is Text. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit LineEdit(TQWidget* parent = 0, const char* name = 0); + explicit LineEdit(TQWidget* tqparent = 0, const char* name = 0); /** Prevents the line edit's contents being selected when the widget receives focus. */ void setNoSelect() { mNoSelect = true; } /** Sets whether the cursor should be set at the beginning or end of the text when diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp index 3345c9c4b..dced4ce6a 100644 --- a/kalarm/lib/messagebox.cpp +++ b/kalarm/lib/messagebox.cpp @@ -45,7 +45,7 @@ KMessageBox::ButtonCode MessageBox::getContinueDefault(const TQString& dontAskAg ButtonCode defaultButton = Continue; if (!dontAskAgainName.isEmpty()) { - TQMap<TQString, ButtonCode>::ConstIterator it = mContinueDefaults.find(dontAskAgainName); + TQMap<TQString, ButtonCode>::ConstIterator it = mContinueDefaults.tqfind(dontAskAgainName); if (it != mContinueDefaults.end()) defaultButton = it.data(); } @@ -60,11 +60,11 @@ KMessageBox::ButtonCode MessageBox::getContinueDefault(const TQString& dontAskAg * warningContinueCancel() for that 'dontAskAgainName' value. If neither method * has set a default button, Continue is the default. */ -int MessageBox::warningContinueCancel(TQWidget* parent, const TQString& text, const TQString& caption, +int MessageBox::warningContinueCancel(TQWidget* tqparent, const TQString& text, const TQString& caption, const KGuiItem& buttonContinue, const TQString& dontAskAgainName) { ButtonCode defaultButton = getContinueDefault(dontAskAgainName); - return warningContinueCancel(parent, defaultButton, text, caption, buttonContinue, dontAskAgainName); + return warningContinueCancel(tqparent, defaultButton, text, caption, buttonContinue, dontAskAgainName); } /****************************************************************************** @@ -72,13 +72,13 @@ int MessageBox::warningContinueCancel(TQWidget* parent, const TQString& text, co * If 'dontAskAgainName' is specified, the message box will only be suppressed * if the user chose Continue last time. */ -int MessageBox::warningContinueCancel(TQWidget* parent, ButtonCode defaultButton, const TQString& text, +int MessageBox::warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButton, const TQString& text, const TQString& caption, const KGuiItem& buttonContinue, const TQString& dontAskAgainName) { setContinueDefault(dontAskAgainName, defaultButton); if (defaultButton != Cancel) - return KMessageBox::warningContinueCancel(parent, text, caption, buttonContinue, dontAskAgainName); + return KMessageBox::warningContinueCancel(tqparent, text, caption, buttonContinue, dontAskAgainName); // Cancel is the default button, so we have to use KMessageBox::warningYesNo() if (!dontAskAgainName.isEmpty()) @@ -92,7 +92,7 @@ int MessageBox::warningContinueCancel(TQWidget* parent, ButtonCode defaultButton saveDontShowAgain(dontAskAgainName, true, false); } } - return warningYesNo(parent, text, caption, buttonContinue, KStdGuiItem::cancel(), dontAskAgainName); + return warningYesNo(tqparent, text, caption, buttonContinue, KStdGuiItem::cancel(), dontAskAgainName); } /****************************************************************************** diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h index 6d65b0934..21d321b13 100644 --- a/kalarm/lib/messagebox.h +++ b/kalarm/lib/messagebox.h @@ -58,7 +58,7 @@ class MessageBox : public KMessageBox */ static void setContinueDefault(const TQString& dontAskAgainName, ButtonCode defaultButton); /** Displays a Continue/Cancel message box with the option as to which button is the default. - * @param parent Parent widget + * @param tqparent Parent widget * @param defaultButton The default button for the message box. Valid values are Continue or Cancel. * @param text Message string * @param caption Caption (window title) of the message box @@ -66,12 +66,12 @@ class MessageBox : public KMessageBox * @param dontAskAgainName If specified, the message box will only be suppressed * if the user chose Continue last time. */ - static int warningContinueCancel(TQWidget* parent, ButtonCode defaultButton, const TQString& text, - const TQString& caption = TQString::null, + static int warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButton, const TQString& text, + const TQString& caption = TQString(), const KGuiItem& buttonContinue = KStdGuiItem::cont(), - const TQString& dontAskAgainName = TQString::null); + const TQString& dontAskAgainName = TQString()); /** Displays a Continue/Cancel message box. - * @param parent Parent widget + * @param tqparent Parent widget * @param text Message string * @param caption Caption (window title) of the message box * @param buttonContinue The text for the first button (default = i18n("Continue")) @@ -81,9 +81,9 @@ class MessageBox : public KMessageBox * @p dontAskAgainName value. If neither method has been used to set a default button, * Continue is the default. */ - static int warningContinueCancel(TQWidget* parent, const TQString& text, const TQString& caption = TQString::null, + static int warningContinueCancel(TQWidget* tqparent, const TQString& text, const TQString& caption = TQString(), const KGuiItem& buttonContinue = KStdGuiItem::cont(), - const TQString& dontAskAgainName = TQString::null); + const TQString& dontAskAgainName = TQString()); /** If there is no current setting for whether a non-Yes/No message box should be * shown, sets it to @p defaultShow. * If a Continue/Cancel message box has Cancel as the default button, either diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp index ed8440a05..e1e04099a 100644 --- a/kalarm/lib/pushbutton.cpp +++ b/kalarm/lib/pushbutton.cpp @@ -21,20 +21,20 @@ #include "pushbutton.moc" -PushButton::PushButton(TQWidget* parent, const char* name) - : TQPushButton(parent, name), +PushButton::PushButton(TQWidget* tqparent, const char* name) + : TQPushButton(tqparent, name), mFocusPolicy(focusPolicy()), mReadOnly(false) { } -PushButton::PushButton(const TQString& text, TQWidget* parent, const char* name) - : TQPushButton(text, parent, name), +PushButton::PushButton(const TQString& text, TQWidget* tqparent, const char* name) + : TQPushButton(text, tqparent, name), mFocusPolicy(focusPolicy()), mReadOnly(false) { } -PushButton::PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name) - : TQPushButton(icon, text, parent, name), +PushButton::PushButton(const TQIconSet& icon, const TQString& text, TQWidget* tqparent, const char* name) + : TQPushButton(icon, text, tqparent, name), mFocusPolicy(focusPolicy()), mReadOnly(false) { } @@ -55,7 +55,7 @@ void PushButton::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQPushButton::mousePressEvent(e); @@ -66,7 +66,7 @@ void PushButton::mouseReleaseEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQPushButton::mouseReleaseEvent(e); @@ -83,10 +83,10 @@ void PushButton::keyPressEvent(TQKeyEvent* e) if (mReadOnly) switch (e->key()) { - case Qt::Key_Up: - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_Down: + case TQt::Key_Up: + case TQt::Key_Left: + case TQt::Key_Right: + case TQt::Key_Down: // Process keys which shift the focus break; default: diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h index 8d82ac96e..615ea10cb 100644 --- a/kalarm/lib/pushbutton.h +++ b/kalarm/lib/pushbutton.h @@ -34,29 +34,30 @@ * * @author David Jarvie <software@astrojar.org.uk> */ -class PushButton : public QPushButton +class PushButton : public TQPushButton { Q_OBJECT - Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly) + TQ_OBJECT + TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly) public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit PushButton(TQWidget* parent, const char* name = 0); + explicit PushButton(TQWidget* tqparent, const char* name = 0); /** Constructor for a push button which displays a text. * @param text The text to show on the button. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - PushButton(const TQString& text, TQWidget* parent, const char* name = 0); + PushButton(const TQString& text, TQWidget* tqparent, const char* name = 0); /** Constructor for a push button which displays an icon and a text. * @param icon The icon to show on the button. * @param text The text to show on the button. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name = 0); + PushButton(const TQIconSet& icon, const TQString& text, TQWidget* tqparent, const char* name = 0); /** Sets whether the push button is read-only for the user. * @param readOnly True to set the widget read-only, false to enable its action. */ @@ -70,7 +71,7 @@ class PushButton : public QPushButton virtual void keyPressEvent(TQKeyEvent*); virtual void keyReleaseEvent(TQKeyEvent*); private: - TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the QPushButton + TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQPushButton bool mReadOnly; // value cannot be changed }; diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp index 7cf58f082..d08097887 100644 --- a/kalarm/lib/radiobutton.cpp +++ b/kalarm/lib/radiobutton.cpp @@ -21,15 +21,15 @@ #include "radiobutton.moc" -RadioButton::RadioButton(TQWidget* parent, const char* name) - : TQRadioButton(parent, name), +RadioButton::RadioButton(TQWidget* tqparent, const char* name) + : TQRadioButton(tqparent, name), mFocusPolicy(focusPolicy()), mFocusWidget(0), mReadOnly(false) { } -RadioButton::RadioButton(const TQString& text, TQWidget* parent, const char* name) - : TQRadioButton(text, parent, name), +RadioButton::RadioButton(const TQString& text, TQWidget* tqparent, const char* name) + : TQRadioButton(text, tqparent, name), mFocusPolicy(focusPolicy()), mFocusWidget(0), mReadOnly(false) @@ -86,7 +86,7 @@ void RadioButton::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQRadioButton::mousePressEvent(e); @@ -97,7 +97,7 @@ void RadioButton::mouseReleaseEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQRadioButton::mouseReleaseEvent(e); @@ -114,12 +114,12 @@ void RadioButton::keyPressEvent(TQKeyEvent* e) if (mReadOnly) switch (e->key()) { - case Qt::Key_Up: - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_Down: + case TQt::Key_Up: + case TQt::Key_Left: + case TQt::Key_Right: + case TQt::Key_Down: // Process keys which shift the focus - case Qt::Key_Escape: + case TQt::Key_Escape: break; default: return; diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h index d95d13fa5..9395be608 100644 --- a/kalarm/lib/radiobutton.h +++ b/kalarm/lib/radiobutton.h @@ -39,21 +39,22 @@ * * @author David Jarvie <software@astrojar.org.uk> */ -class RadioButton : public QRadioButton +class RadioButton : public TQRadioButton { Q_OBJECT + TQ_OBJECT public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit RadioButton(TQWidget* parent, const char* name = 0); + explicit RadioButton(TQWidget* tqparent, const char* name = 0); /** Constructor. * @param text Text to display. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - RadioButton(const TQString& text, TQWidget* parent, const char* name = 0); + RadioButton(const TQString& text, TQWidget* tqparent, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the radio button is read-only for the user. If read-only, @@ -79,7 +80,7 @@ class RadioButton : public QRadioButton protected slots: void slotClicked(); private: - TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the QRadioButton + TQWidget::FocusPolicy mFocusPolicy; // default focus policy for the TQRadioButton TQWidget* mFocusWidget; // widget to receive focus when button is clicked on bool mFocusWidgetEnable; // enable focus widget before setting focus bool mReadOnly; // value cannot be changed diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index 209f1aad8..09daf91db 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -40,7 +40,7 @@ bool ShellProcess::mAuthorised = false; ShellProcess::ShellProcess(const TQString& command) : KShellProcess(shellName()), mCommand(command), - mStatus(INACTIVE), + mtqStatus(INACTIVE), mStdinExit(false) { } @@ -52,7 +52,7 @@ bool ShellProcess::start(Communication comm) { if (!authorised()) { - mStatus = UNAUTHORISED; + mtqStatus = UNAUTHORISED; return false; } KShellProcess::operator<<(mCommand); @@ -60,10 +60,10 @@ bool ShellProcess::start(Communication comm) connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotExited(KProcess*))); if (!KShellProcess::start(KProcess::NotifyOnExit, comm)) { - mStatus = START_FAIL; + mtqStatus = START_FAIL; return false; } - mStatus = RUNNING; + mtqStatus = RUNNING; return true; } @@ -76,11 +76,11 @@ void ShellProcess::slotExited(KProcess* proc) { kdDebug(5950) << "ShellProcess::slotExited()\n"; mStdinQueue.clear(); - mStatus = SUCCESS; + mtqStatus = SUCCESS; if (!proc->normalExit()) { kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": died/killed\n"; - mStatus = DIED; + mtqStatus = DIED; } else { @@ -90,7 +90,7 @@ void ShellProcess::slotExited(KProcess* proc) || mShellName == "ksh" && status == 127) { kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": not found or not executable\n"; - mStatus = NOT_FOUND; + mtqStatus = NOT_FOUND; } } emit shellExited(this); @@ -140,7 +140,7 @@ void ShellProcess::stdinExit() */ TQString ShellProcess::errorMessage() const { - switch (mStatus) + switch (mtqStatus) { case UNAUTHORISED: return i18n("Failed to execute command (shell access not authorized):"); @@ -153,7 +153,7 @@ TQString ShellProcess::errorMessage() const case RUNNING: case SUCCESS: default: - return TQString::null; + return TQString(); } } @@ -174,8 +174,8 @@ const TQCString& ShellProcess::shellPath() struct stat fileinfo; if (stat(envshell.data(), &fileinfo) != -1 // ensure file exists && !S_ISDIR(fileinfo.st_mode) // and it's not a directory - && !S_ISCHR(fileinfo.st_mode) // and it's not a character device - && !S_ISBLK(fileinfo.st_mode) // and it's not a block device + && !S_ISCHR(fileinfo.st_mode) // and it's not a character tqdevice + && !S_ISBLK(fileinfo.st_mode) // and it's not a block tqdevice #ifdef S_ISSOCK && !S_ISSOCK(fileinfo.st_mode) // and it's not a socket #endif diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h index a3b8a574b..fd303bea0 100644 --- a/kalarm/lib/shellprocess.h +++ b/kalarm/lib/shellprocess.h @@ -50,6 +50,7 @@ class ShellProcess : public KShellProcess { Q_OBJECT + TQ_OBJECT public: /** Current status of the shell process. * @li INACTIVE - start() has not yet been called to run the command. @@ -60,7 +61,7 @@ class ShellProcess : public KShellProcess * @li NOT_FOUND - the command was either not found or not executable. * @li START_FAIL - the command couldn't be started for other reasons. */ - enum Status { + enum tqStatus { INACTIVE, // start() has not yet been called to run the command RUNNING, // command is currently running SUCCESS, // command appears to have exited successfully @@ -79,11 +80,11 @@ class ShellProcess : public KShellProcess */ bool start(Communication comm = NoCommunication); /** Returns the current status of the shell process. */ - Status status() const { return mStatus; } + tqStatus status() const { return mtqStatus; } /** Returns whether the command was run successfully. * @return True if the command has been run and appears to have exited successfully. */ - bool normalExit() const { return mStatus == SUCCESS; } + bool normalExit() const { return mtqStatus == SUCCESS; } /** Returns the command configured to be run. */ const TQString& command() const { return mCommand; } /** Returns the error message corresponding to the command exit status. @@ -131,7 +132,7 @@ class ShellProcess : public KShellProcess static bool mAuthorised; // true if shell commands are authorised TQString mCommand; // copy of command to be executed TQValueList<TQCString> mStdinQueue; // queued strings to send to STDIN - Status mStatus; // current execution status + tqStatus mtqStatus; // current execution status bool mStdinExit; // exit once STDIN queue has been written }; diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp index afe7d679c..0b30f744a 100644 --- a/kalarm/lib/slider.cpp +++ b/kalarm/lib/slider.cpp @@ -21,18 +21,18 @@ #include "slider.moc" -Slider::Slider(TQWidget* parent, const char* name) - : TQSlider(parent, name), +Slider::Slider(TQWidget* tqparent, const char* name) + : TQSlider(tqparent, name), mReadOnly(false) { } -Slider::Slider(Orientation o, TQWidget* parent, const char* name) - : TQSlider(o, parent, name), +Slider::Slider(Qt::Orientation o, TQWidget* tqparent, const char* name) + : TQSlider(o, tqparent, name), mReadOnly(false) { } -Slider::Slider(int minval, int maxval, int pageStep, int value, Orientation o, TQWidget* parent, const char* name) - : TQSlider(minval, maxval, pageStep, value, o, parent, name), +Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* tqparent, const char* name) + : TQSlider(minval, maxval, pageStep, value, o, tqparent, name), mReadOnly(false) { } @@ -54,7 +54,7 @@ void Slider::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQSlider::mousePressEvent(e); @@ -74,7 +74,7 @@ void Slider::mouseMoveEvent(TQMouseEvent* e) void Slider::keyPressEvent(TQKeyEvent* e) { - if (!mReadOnly || e->key() == Qt::Key_Escape) + if (!mReadOnly || e->key() == TQt::Key_Escape) TQSlider::keyPressEvent(e); } diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h index 8fa54d452..f79ac0158 100644 --- a/kalarm/lib/slider.h +++ b/kalarm/lib/slider.h @@ -34,33 +34,34 @@ * * @author David Jarvie <software@astrojar.org.uk> */ -class Slider : public QSlider +class Slider : public TQSlider { Q_OBJECT - Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly) + TQ_OBJECT + TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly) public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit Slider(TQWidget* parent = 0, const char* name = 0); + explicit Slider(TQWidget* tqparent = 0, const char* name = 0); /** Constructor. - * @param orient The orientation of the slider, either Qt::Horizonal or Qt::Vertical. - * @param parent The parent object of this widget. + * @param orient The orientation of the slider, either TQt::Horizonal or TQt::Vertical. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit Slider(Orientation orient, TQWidget* parent = 0, const char* name = 0); + explicit Slider(Qt::Orientation orient, TQWidget* tqparent = 0, const char* name = 0); /** Constructor. * @param minValue The minimum value which the slider can have. * @param maxValue The maximum value which the slider can have. * @param pageStep The page step increment. * @param value The initial value for the slider. - * @param orient The orientation of the slider, either Qt::Horizonal or Qt::Vertical. - * @param parent The parent object of this widget. + * @param orient The orientation of the slider, either TQt::Horizonal or TQt::Vertical. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - Slider(int minValue, int maxValue, int pageStep, int value, Orientation orient, - TQWidget* parent = 0, const char* name = 0); + Slider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orient, + TQWidget* tqparent = 0, const char* name = 0); /** Returns true if the slider is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the slider is read-only for the user. diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index 8ae5962a2..19608eabe 100644 --- a/kalarm/lib/spinbox.cpp +++ b/kalarm/lib/spinbox.cpp @@ -24,16 +24,16 @@ #include "spinbox.moc" -SpinBox::SpinBox(TQWidget* parent, const char* name) - : TQSpinBox(0, 99999, 1, parent, name), +SpinBox::SpinBox(TQWidget* tqparent, const char* name) + : TQSpinBox(0, 99999, 1, tqparent, name), mMinValue(TQSpinBox::minValue()), mMaxValue(TQSpinBox::maxValue()) { init(); } -SpinBox::SpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name) - : TQSpinBox(minValue, maxValue, step, parent, name), +SpinBox::SpinBox(int minValue, int maxValue, int step, TQWidget* tqparent, const char* name) + : TQSpinBox(minValue, maxValue, step, tqparent, name), mMinValue(minValue), mMaxValue(maxValue) { @@ -212,18 +212,18 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) // Up and down arrow keys step the value TQKeyEvent* ke = (TQKeyEvent*)e; int key = ke->key(); - if (key == Qt::Key_Up) + if (key == TQt::Key_Up) step = 1; - else if (key == Qt::Key_Down) + else if (key == TQt::Key_Down) step = -1; - shift = ((ke->state() & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton); + shift = ((ke->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton); break; } case TQEvent::Wheel: { TQWheelEvent* we = (TQWheelEvent*)e; step = (we->delta() > 0) ? 1 : -1; - shift = ((we->state() & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton); + shift = ((we->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton); break; } #if KDE_IS_VERSION(3,1,90) @@ -263,7 +263,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) case TQEvent::MouseButtonDblClick: { TQMouseEvent* me = (TQMouseEvent*)e; - if (me->button() == Qt::LeftButton) + if (me->button() == TQt::LeftButton) { // It's a left button press. Set normal or shift stepping as appropriate. if (mReadOnly) @@ -271,7 +271,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) mCurrentButton = whichButton(me->pos()); if (mCurrentButton == NO_BUTTON) return true; - bool shift = (me->state() & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton; + bool shift = (me->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton; if (setShiftStepping(shift, mCurrentButton)) return true; // hide the event from the spin widget return false; // forward event to the destination widget @@ -281,7 +281,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) case TQEvent::MouseButtonRelease: { TQMouseEvent* me = (TQMouseEvent*)e; - if (me->button() == Qt::LeftButton && mShiftMouse) + if (me->button() == TQt::LeftButton && mShiftMouse) { setShiftStepping(false, mCurrentButton); // cancel shift stepping return false; // forward event to the destination widget @@ -291,7 +291,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) case TQEvent::MouseMove: { TQMouseEvent* me = (TQMouseEvent*)e; - if (me->state() & Qt::LeftButton) + if (me->state() & TQt::LeftButton) { // The left button is down. Track which spin button it's in. if (mReadOnly) @@ -302,7 +302,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) // The mouse has moved to a new spin button. // Set normal or shift stepping as appropriate. mCurrentButton = newButton; - bool shift = (me->state() & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton; + bool shift = (me->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton; if (setShiftStepping(shift, mCurrentButton)) return true; // hide the event from the spin widget } @@ -313,7 +313,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) case TQEvent::Wheel: { TQWheelEvent* we = (TQWheelEvent*)e; - bool shift = (we->state() & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton; + bool shift = (we->state() & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton; if (setShiftStepping(shift, (we->delta() > 0 ? UP : DOWN))) return true; // hide the event from the spin widget return false; // forward event to the destination widget @@ -325,14 +325,14 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) TQKeyEvent* ke = (TQKeyEvent*)e; int key = ke->key(); int state = ke->state(); - if ((state & Qt::LeftButton) - && (key == Qt::Key_Shift || key == Qt::Key_Alt)) + if ((state & TQt::LeftButton) + && (key == TQt::Key_Shift || key == TQt::Key_Alt)) { // The left mouse button is down, and the Shift or Alt key has changed if (mReadOnly) return true; // discard the event - state ^= (key == Qt::Key_Shift) ? Qt::ShiftButton : Qt::AltButton; // new state - bool shift = (state & (Qt::ShiftButton | Qt::AltButton)) == Qt::ShiftButton; + state ^= (key == TQt::Key_Shift) ? TQt::ShiftButton : TQt::AltButton; // new state + bool shift = (state & (TQt::ShiftButton | TQt::AltButton)) == TQt::ShiftButton; if ((!shift && mShiftMouse) || (shift && !mShiftMouse)) { // The effective shift state has changed. diff --git a/kalarm/lib/spinbox.h b/kalarm/lib/spinbox.h index cf74e9deb..4b269d6a5 100644 --- a/kalarm/lib/spinbox.h +++ b/kalarm/lib/spinbox.h @@ -39,23 +39,24 @@ * * @author David Jarvie <software@astrojar.org.uk> */ -class SpinBox : public QSpinBox +class SpinBox : public TQSpinBox { Q_OBJECT + TQ_OBJECT public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit SpinBox(TQWidget* parent = 0, const char* name = 0); + explicit SpinBox(TQWidget* tqparent = 0, const char* name = 0); /** Constructor. * @param minValue The minimum value which the spin box can have. * @param maxValue The maximum value which the spin box can have. * @param step The (unshifted) step interval. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - SpinBox(int minValue, int maxValue, int step = 1, TQWidget* parent = 0, const char* name = 0); + SpinBox(int minValue, int maxValue, int step = 1, TQWidget* tqparent = 0, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the spin box can be changed by the user. diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp index 8b3faa706..8627838b6 100644 --- a/kalarm/lib/spinbox2.cpp +++ b/kalarm/lib/spinbox2.cpp @@ -1,5 +1,5 @@ /* - * spinbox2.cpp - spin box with extra pair of spin buttons (for Qt 3) + * spinbox2.cpp - spin box with extra pair of spin buttons (for TQt 3) * Program: kalarm * Copyright © 2001-2005,2008 by David Jarvie <djarvie@kde.org> * @@ -48,8 +48,8 @@ static bool mirrorStyle(const TQStyle&); int SpinBox2::mReverseLayout = -1; -SpinBox2::SpinBox2(TQWidget* parent, const char* name) - : TQFrame(parent, name), +SpinBox2::SpinBox2(TQWidget* tqparent, const char* name) + : TQFrame(tqparent, name), mReverseWithLayout(true) { mUpdown2Frame = new TQFrame(this); @@ -60,8 +60,8 @@ SpinBox2::SpinBox2(TQWidget* parent, const char* name) init(); } -SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, TQWidget* parent, const char* name) - : TQFrame(parent, name), +SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, TQWidget* tqparent, const char* name) + : TQFrame(tqparent, name), mReverseWithLayout(true) { mUpdown2Frame = new TQFrame(this); @@ -371,7 +371,7 @@ int SpinBox2::MainSpinBox::shiftStepAdjustment(int oldValue, int shiftStep) /****************************************************************************** * Repaint the widget. -* If it's the first time since a style change, tell the parent SpinBox2 to +* If it's the first time since a style change, tell the tqparent SpinBox2 to * update the SpinMirror with the new unpressed button image. We make the * presumably reasonable assumption that when a style change occurs, the spin * buttons are unpressed. @@ -391,8 +391,8 @@ void ExtraSpinBox::paintEvent(TQPaintEvent* e) = Class SpinMirror =============================================================================*/ -SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* parent, const char* name) - : TQCanvasView(new TQCanvas, parent, name), +SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* tqparent, const char* name) + : TQCanvasView(new TQCanvas, tqparent, name), mSpinbox(spinbox), mSpinFrame(spinFrame), mReadOnly(false) diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h index b1d2927d4..f83db252a 100644 --- a/kalarm/lib/spinbox2.h +++ b/kalarm/lib/spinbox2.h @@ -1,5 +1,5 @@ /* - * spinbox2.h - spin box with extra pair of spin buttons (for Qt 3) + * spinbox2.h - spin box with extra pair of spin buttons (for TQt 3) * Program: kalarm * Copyright © 2001-2007 by David Jarvie <software@astrojar.org.uk> * @@ -53,25 +53,26 @@ class ExtraSpinBox; * * @author David Jarvie <software@astrojar.org.uk> */ -class SpinBox2 : public QFrame +class SpinBox2 : public TQFrame { Q_OBJECT + TQ_OBJECT public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit SpinBox2(TQWidget* parent = 0, const char* name = 0); + explicit SpinBox2(TQWidget* tqparent = 0, const char* name = 0); /** Constructor. * @param minValue The minimum value which the spin box can have. * @param maxValue The maximum value which the spin box can have. * @param step The (unshifted) step interval for the right-hand spin buttons. * @param step2 The (unshifted) step interval for the left-hand spin buttons. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ SpinBox2(int minValue, int maxValue, int step = 1, int step2 = 1, - TQWidget* parent = 0, const char* name = 0); + TQWidget* tqparent = 0, const char* name = 0); /** Sets whether the spin box can be changed by the user. * @param readOnly True to set the widget read-only, false to set it read-write. */ @@ -281,10 +282,10 @@ class SpinBox2 : public QFrame class MainSpinBox : public SpinBox { public: - MainSpinBox(SpinBox2* sb2, TQWidget* parent, const char* name = 0) - : SpinBox(parent, name), owner(sb2) { } - MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* parent, const char* name = 0) - : SpinBox(minValue, maxValue, step, parent, name), owner(sb2) { } + MainSpinBox(SpinBox2* sb2, TQWidget* tqparent, const char* name = 0) + : SpinBox(tqparent, name), owner(sb2) { } + MainSpinBox(int minValue, int maxValue, int step, SpinBox2* sb2, TQWidget* tqparent, const char* name = 0) + : SpinBox(minValue, maxValue, step, tqparent, name), owner(sb2) { } void tqsetAlignment(int a) { editor()->tqsetAlignment(a); } virtual TQString mapValueToText(int v) { return owner->mapValueToText(v); } virtual int mapTextToValue(bool* ok) { return owner->mapTextToValue(ok); } @@ -298,8 +299,8 @@ class SpinBox2 : public QFrame enum { NO_BUTTON = -1, UP, DOWN, UP2, DOWN2 }; static int mReverseLayout; // widgets are mirrored right to left - TQFrame* mUpdown2Frame; // tqcontains visible part of the extra pair of spin buttons - TQFrame* mSpinboxFrame; // tqcontains the main spin box + TQFrame* mUpdown2Frame; // contains visible part of the extra pair of spin buttons + TQFrame* mSpinboxFrame; // contains the main spin box ExtraSpinBox* mUpdown2; // the extra pair of spin buttons MainSpinBox* mSpinbox; // the visible spin box SpinMirror* mSpinMirror; // image of the extra pair of spin buttons diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h index d25579f9d..ec7d2d16f 100644 --- a/kalarm/lib/spinbox2private.h +++ b/kalarm/lib/spinbox2private.h @@ -1,5 +1,5 @@ /* - * spinbox2private.h - private classes for SpinBox2 (for Qt 3) + * spinbox2private.h - private classes for SpinBox2 (for TQt 3) * Program: kalarm * Copyright © 2005,2006,2008 by David Jarvie <djarvie@kde.org> * @@ -34,11 +34,12 @@ class ExtraSpinBox : public SpinBox { Q_OBJECT + TQ_OBJECT public: - explicit ExtraSpinBox(TQWidget* parent, const char* name = 0) - : SpinBox(parent, name), mNewStylePending(false) { } - ExtraSpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name = 0) - : SpinBox(minValue, maxValue, step, parent, name), mNewStylePending(false) { } + explicit ExtraSpinBox(TQWidget* tqparent, const char* name = 0) + : SpinBox(tqparent, name), mNewStylePending(false) { } + ExtraSpinBox(int minValue, int maxValue, int step, TQWidget* tqparent, const char* name = 0) + : SpinBox(minValue, maxValue, step, tqparent, name), mNewStylePending(false) { } signals: void styleUpdated(); protected: @@ -57,11 +58,12 @@ class ExtraSpinBox : public SpinBox * Mirroring in this way allows styles with rounded corners to display correctly. =============================================================================*/ -class SpinMirror : public QCanvasView +class SpinMirror : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: - explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* parent = 0, const char* name = 0); + explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* tqparent = 0, const char* name = 0); void setReadOnly(bool ro) { mReadOnly = ro; } bool isReadOnly() const { return mReadOnly; } void setNormalButtons(const TQPixmap&); diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp index caed93d7b..7be3c17c2 100644 --- a/kalarm/lib/synchtimer.cpp +++ b/kalarm/lib/synchtimer.cpp @@ -46,7 +46,7 @@ SynchTimer::~SynchTimer() void SynchTimer::connecT(TQObject* receiver, const char* member) { Connection connection(receiver, member); - if (mConnections.find(connection) != mConnections.end()) + if (mConnections.tqfind(connection) != mConnections.end()) return; // the slot is already connected, so ignore request connect(mTimer, TQT_SIGNAL(timeout()), receiver, member); mConnections.append(connection); diff --git a/kalarm/lib/synchtimer.h b/kalarm/lib/synchtimer.h index bbb3ae833..144c8a830 100644 --- a/kalarm/lib/synchtimer.h +++ b/kalarm/lib/synchtimer.h @@ -34,9 +34,10 @@ class TQTimer; * * @author David Jarvie <software@astrojar.org.uk> */ -class SynchTimer : public QObject +class SynchTimer : public TQObject { Q_OBJECT + TQ_OBJECT public: virtual ~SynchTimer(); @@ -76,6 +77,7 @@ class SynchTimer : public QObject class MinuteTimer : public SynchTimer { Q_OBJECT + TQ_OBJECT public: virtual ~MinuteTimer() { mInstance = 0; } /** Connect to the timer signal. @@ -115,6 +117,7 @@ class MinuteTimer : public SynchTimer class DailyTimer : public SynchTimer { Q_OBJECT + TQ_OBJECT public: virtual ~DailyTimer(); /** Connect to the timer signal which triggers at the given fixed time of day. diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp index 170914922..923bef8b3 100644 --- a/kalarm/lib/timeedit.cpp +++ b/kalarm/lib/timeedit.cpp @@ -28,8 +28,8 @@ #include "timeedit.moc" -TimeEdit::TimeEdit(TQWidget* parent, const char* name) - : TQHBox(parent, name), +TimeEdit::TimeEdit(TQWidget* tqparent, const char* name) + : TQHBox(tqparent, name), mAmPm(0), mAmIndex(-1), mPmIndex(-1), diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h index 45c0abd8e..7be73c1f9 100644 --- a/kalarm/lib/timeedit.h +++ b/kalarm/lib/timeedit.h @@ -47,15 +47,16 @@ class TimeSpinBox; * * @author David Jarvie <software@astrojar.org.uk> */ -class TimeEdit : public QHBox +class TimeEdit : public TQHBox { Q_OBJECT + TQ_OBJECT public: /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit TimeEdit(TQWidget* parent = 0, const char* name = 0); + explicit TimeEdit(TQWidget* tqparent = 0, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the widget is read-only for the user. If read-only, @@ -64,7 +65,7 @@ class TimeEdit : public QHBox * @param readOnly True to set the widget read-only, false to set it read-write. */ virtual void setReadOnly(bool readOnly); - /** Returns true if the widget tqcontains a valid value. */ + /** Returns true if the widget contains a valid value. */ bool isValid() const; /** Sets whether the edit value is valid. * If newly invalid, the value is displayed as asterisks. diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp index 291ba0872..9b41e40d4 100644 --- a/kalarm/lib/timeperiod.cpp +++ b/kalarm/lib/timeperiod.cpp @@ -50,8 +50,8 @@ static const int maxMinutes = 1000*60-1; // absolute maximum value for hours:m = Contains a time unit combo box, plus a time spinbox, to select a time period. =============================================================================*/ -TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name) - : TQHBox(parent, name), +TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* tqparent, const char* name) + : TQHBox(tqparent, name), mMaxDays(9999), mNoHourMinute(!allowHourMinute), mReadOnly(false) diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h index f6f6304fb..86b663798 100644 --- a/kalarm/lib/timeperiod.h +++ b/kalarm/lib/timeperiod.h @@ -47,9 +47,10 @@ class TimeSpinBox; * * @author David Jarvie <software@astrojar.org.uk> */ -class TimePeriod : public QHBox +class TimePeriod : public TQHBox { Q_OBJECT + TQ_OBJECT public: /** Units for the time period. * @li MINUTES - the time period is entered as a number of minutes. @@ -64,10 +65,10 @@ class TimePeriod : public QHBox * being allowed as units; only days and weeks can ever be used, * regardless of other method calls. Set true to allow minutes, * hours/minutes, days or weeks as units. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - TimePeriod(bool allowMinute, TQWidget* parent, const char* name = 0); + TimePeriod(bool allowMinute, TQWidget* tqparent, const char* name = 0); /** Returns true if the widget is read only. */ bool isReadOnly() const { return mReadOnly; } /** Sets whether the widget is read-only for the user. If read-only, @@ -103,7 +104,7 @@ class TimePeriod : public QHBox /** Sets separate WhatsThis texts for the count spin boxes and the units combo box. * If @p hourMin is omitted, both spin boxes are set to the same WhatsThis text. */ - void setWhatsThis(const TQString& units, const TQString& dayWeek, const TQString& hourMin = TQString::null); + void setWhatsThis(const TQString& units, const TQString& dayWeek, const TQString& hourMin = TQString()); static TQString i18n_minutes(); // text of 'minutes' units, lower case static TQString i18n_Minutes(); // text of 'Minutes' units, initial capitals diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp index ea10cb1aa..f8700a505 100644 --- a/kalarm/lib/timespinbox.cpp +++ b/kalarm/lib/timespinbox.cpp @@ -27,11 +27,11 @@ #include "timespinbox.moc" -class TimeSpinBox::TimeValidator : public QValidator +class TimeSpinBox::TimeValidator : public TQValidator { public: - TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0) - : TQValidator(parent, name), + TimeValidator(int minMin, int maxMin, TQWidget* tqparent, const char* name = 0) + : TQValidator(tqparent, name), minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { } virtual State validate(TQString&, int&) const; int minMinute, maxMinute; @@ -54,8 +54,8 @@ class TimeSpinBox::TimeValidator : public QValidator /****************************************************************************** * Construct a wrapping 00:00 - 23:59, or 12:00 - 11:59 time spin box. */ -TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name) - : SpinBox2(0, 1439, 1, 60, parent, name), +TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* tqparent, const char* name) + : SpinBox2(0, 1439, 1, 60, tqparent, name), mMinimumValue(0), m12Hour(!use24hour), mPm(false), @@ -69,15 +69,15 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name) setReverseWithLayout(false); // keep buttons the same way round even if right-to-left language setShiftSteps(5, 360); // shift-left button increments 5 min / 6 hours setSelectOnStep(false); - tqsetAlignment(Qt::AlignHCenter); + tqsetAlignment(TQt::AlignHCenter); connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); } /****************************************************************************** * Construct a non-wrapping time spin box. */ -TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const char* name) - : SpinBox2(minMinute, maxMinute, 1, 60, parent, name), +TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* tqparent, const char* name) + : SpinBox2(minMinute, maxMinute, 1, 60, tqparent, name), mMinimumValue(minMinute), m12Hour(false), mInvalid(false), @@ -88,7 +88,7 @@ TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const c setReverseWithLayout(false); // keep buttons the same way round even if right-to-left language setShiftSteps(5, 300); // shift-left button increments 5 min / 5 hours setSelectOnStep(false); - tqsetAlignment(TQApplication::reverseLayout() ? Qt::AlignLeft : Qt::AlignRight); + tqsetAlignment(TQApplication::reverseLayout() ? TQt::AlignLeft : TQt::AlignRight); } TQString TimeSpinBox::shiftWhatsThis() @@ -124,7 +124,7 @@ TQString TimeSpinBox::mapValueToText(int v) int TimeSpinBox::mapTextToValue(bool* ok) { TQString text = cleanText(); - int colon = text.find(':'); + int colon = text.tqfind(':'); if (colon >= 0) { // [h]:m format for any time value @@ -309,7 +309,7 @@ TQValidator::State TimeSpinBox::TimeValidator::validate(TQString& text, int& /*c bool ok; int hr = 0; int mn = 0; - int colon = cleanText.find(':'); + int colon = cleanText.tqfind(':'); if (colon >= 0) { TQString minute = cleanText.mid(colon + 1); diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h index 901c97e2e..4bacd4947 100644 --- a/kalarm/lib/timespinbox.h +++ b/kalarm/lib/timespinbox.h @@ -45,21 +45,22 @@ class TimeSpinBox : public SpinBox2 { Q_OBJECT + TQ_OBJECT public: /** Constructor for a wrapping time spin box which can be used to enter a time of day. * @param use24hour True for entry of 24-hour clock times (range 00:00 to 23:59). * False for entry of 12-hour clock times (range 12:00 to 11:59). - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit TimeSpinBox(bool use24hour, TQWidget* parent = 0, const char* name = 0); + explicit TimeSpinBox(bool use24hour, TQWidget* tqparent = 0, const char* name = 0); /** Constructor for a non-wrapping time spin box which can be used to enter a length of time. * @param minMinute The minimum value which the spin box can hold, in minutes. * @param maxMinute The maximum value which the spin box can hold, in minutes. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent = 0, const char* name = 0); + TimeSpinBox(int minMinute, int maxMinute, TQWidget* tqparent = 0, const char* name = 0); /** Returns true if the spin box holds a valid value. * An invalid value is displayed as asterisks. */ diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index 6ebe19c81..07e976c6a 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -221,7 +221,7 @@ void MainWindow::readProperties(KConfig* config) } /****************************************************************************** -* Get the main main window, i.e. the parent of the system tray icon, or if +* Get the main main window, i.e. the tqparent of the system tray icon, or if * none, the first main window to be created. Visible windows take precedence * over hidden ones. */ @@ -241,7 +241,7 @@ MainWindow* MainWindow::mainMainWindow() } /****************************************************************************** -* Check whether this main window is the parent of the system tray icon. +* Check whether this main window is the tqparent of the system tray icon. */ bool MainWindow::isTrayParent() const { @@ -330,17 +330,17 @@ void MainWindow::initActions() mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), this, TQT_SLOT(slotNew()), actions, "new"); mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl"); mActionCreateTemplate = new KAction(i18n("Create Tem&plate..."), 0, this, TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); - mActionCopy = new KAction(i18n("&Copy..."), "editcopy", Qt::SHIFT+Qt::Key_Insert, this, TQT_SLOT(slotCopy()), actions, "copy"); - mActionModify = new KAction(i18n("&Edit..."), "edit", Qt::CTRL+Qt::Key_E, this, TQT_SLOT(slotModify()), actions, "modify"); - mActionDelete = new KAction(i18n("&Delete"), "editdelete", Qt::Key_Delete, this, TQT_SLOT(slotDelete()), actions, "delete"); - mActionReactivate = new KAction(i18n("Reac&tivate"), 0, Qt::CTRL+Qt::Key_R, this, TQT_SLOT(slotReactivate()), actions, "undelete"); - mActionEnable = new KAction(TQString::null, 0, Qt::CTRL+Qt::Key_B, this, TQT_SLOT(slotEnable()), actions, "disable"); - mActionView = new KAction(i18n("&View"), "viewmag", Qt::CTRL+Qt::Key_W, this, TQT_SLOT(slotView()), actions, "view"); - mActionShowTime = new KToggleAction(i18n_a_ShowAlarmTimes(), Qt::CTRL+Qt::Key_M, this, TQT_SLOT(slotShowTime()), actions, "showAlarmTimes"); + mActionCopy = new KAction(i18n("&Copy..."), "editcopy", TQt::SHIFT+TQt::Key_Insert, this, TQT_SLOT(slotCopy()), actions, "copy"); + mActionModify = new KAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, this, TQT_SLOT(slotModify()), actions, "modify"); + mActionDelete = new KAction(i18n("&Delete"), "editdelete", TQt::Key_Delete, this, TQT_SLOT(slotDelete()), actions, "delete"); + mActionReactivate = new KAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, this, TQT_SLOT(slotReactivate()), actions, "undelete"); + mActionEnable = new KAction(TQString(), 0, TQt::CTRL+TQt::Key_B, this, TQT_SLOT(slotEnable()), actions, "disable"); + mActionView = new KAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, this, TQT_SLOT(slotView()), actions, "view"); + mActionShowTime = new KToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, this, TQT_SLOT(slotShowTime()), actions, "showAlarmTimes"); mActionShowTime->setCheckedState(i18n("Hide &Alarm Times")); - mActionShowTimeTo = new KToggleAction(i18n_o_ShowTimeToAlarms(), Qt::CTRL+Qt::Key_I, this, TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); + mActionShowTimeTo = new KToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, this, TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms")); - mActionShowExpired = new KToggleAction(i18n_e_ShowExpiredAlarms(), "history", Qt::CTRL+Qt::Key_P, this, TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); + mActionShowExpired = new KToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, this, TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms()); mActionToggleTrayIcon = new KToggleAction(i18n("Show in System &Tray"), 0, this, TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray")); @@ -366,9 +366,9 @@ void MainWindow::initActions() } mActionUndo = new KToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQT_SLOT(slotUndo()), actions, "edit_undo"); mActionRedo = new KToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQT_SLOT(slotRedo()), actions, "edit_redo"); - KStdAction::find(mListView, TQT_SLOT(slotFind()), actions); - mActionFindNext = KStdAction::tqfindNext(mListView, TQT_SLOT(slotFindNext()), actions); - mActionFindPrev = KStdAction::tqfindPrev(mListView, TQT_SLOT(slotFindPrev()), actions); + KStdAction::tqfind(mListView, TQT_SLOT(slotFind()), actions); + mActionFindNext = KStdAction::findNext(mListView, TQT_SLOT(slotFindNext()), actions); + mActionFindPrev = KStdAction::findPrev(mListView, TQT_SLOT(slotFindPrev()), actions); KStdAction::selectAll(mListView, TQT_SLOT(slotSelectAll()), actions); KStdAction::deselect(mListView, TQT_SLOT(slotDeselect()), actions); KStdAction::quit(this, TQT_SLOT(slotQuit()), actions); @@ -386,7 +386,7 @@ void MainWindow::initActions() connect(mActionUndo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotUndoItem(int))); connect(mActionRedo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitRedoMenu())); connect(mActionRedo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotRedoItem(int))); - connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndoStatus(const TQString&, const TQString&))); + connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndotqStatus(const TQString&, const TQString&))); connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool))); Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPrefsChanged())); connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction())); @@ -415,7 +415,7 @@ void MainWindow::initActions() tb->applySettings(KGlobal::config(), "Toolbars"); Undo::emitChanged(); // set the Undo/Redo menu texts - Daemon::checkStatus(); + Daemon::checktqStatus(); Daemon::monitoringAlarms(); } @@ -947,7 +947,7 @@ void MainWindow::updateTrayIconAction() */ void MainWindow::updateActionsMenu() { - Daemon::checkStatus(); // update the Alarms Enabled item status + Daemon::checktqStatus(); // update the Alarms Enabled item status } /****************************************************************************** @@ -1033,7 +1033,7 @@ void MainWindow::initUndoMenu(KPopupMenu* menu, Undo::Type type) * Called when the status of the Undo or Redo list changes. * Change the Undo or Redo text to include the action which would be undone/redone. */ -void MainWindow::slotUndoStatus(const TQString& undo, const TQString& redo) +void MainWindow::slotUndotqStatus(const TQString& undo, const TQString& redo) { if (undo.isNull()) { @@ -1118,7 +1118,7 @@ void MainWindow::closeEvent(TQCloseEvent* ce) if (!theApp()->sessionClosingDown() && isTrayParent()) { // The user (not the session manager) wants to close the window. - // It's the parent window of the system tray icon, so just hide + // It's the tqparent window of the system tray icon, so just hide // it to prevent the system tray icon closing. hide(); theApp()->quitIf(); @@ -1181,7 +1181,7 @@ void MainWindow::dropEvent(TQDropEvent* e) static TQString getMailHeader(const char* header, KMime::Content& content) { KMime::Headers::Base* hd = content.getHeaderByType(header); - return hd ? hd->asUnicodeString() : TQString::null; + return hd ? hd->asUnicodeString() : TQString(); } /****************************************************************************** @@ -1257,7 +1257,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e) TQDateTime dt; dt.setTime_t(summary.date()); TQString body = KAMail::getMailBody(summary.serialNumber()); - alarmText.setEmail(summary.to(), summary.from(), TQString::null, + alarmText.setEmail(summary.to(), summary.from(), TQString(), KGlobal::locale()->formatDateTime(dt), summary.subject(), body, summary.serialNumber()); } @@ -1350,7 +1350,7 @@ void MainWindow::slotContextMenuRequested(TQListViewItem* item, const TQPoint& p */ void MainWindow::slotMouseClicked(int button, TQListViewItem* item, const TQPoint& pt, int) { - if (button != Qt::RightButton && !item) + if (button != TQt::RightButton && !item) { kdDebug(5950) << "MainWindow::slotMouseClicked(left)" << endl; mListView->clearSelection(); @@ -1397,7 +1397,7 @@ void MainWindow::setEnableText(bool enable) */ MainWindow* MainWindow::toggleWindow(MainWindow* win) { - if (win && mWindowList.find(win) != mWindowList.end()) + if (win && mWindowList.tqfind(win) != mWindowList.end()) { // A window is specified (and it exists) if (win->isVisible()) diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h index 0faaa75e8..cb070e9a2 100644 --- a/kalarm/mainwindow.h +++ b/kalarm/mainwindow.h @@ -42,6 +42,7 @@ class TemplateMenuAction; class MainWindow : public MainWindowBase { Q_OBJECT + TQ_OBJECT public: static MainWindow* create(bool restored = false); @@ -125,7 +126,7 @@ class MainWindow : public MainWindowBase void slotRedoItem(int id); void slotInitUndoMenu(); void slotInitRedoMenu(); - void slotUndoStatus(const TQString&, const TQString&); + void slotUndotqStatus(const TQString&, const TQString&); void slotFindActive(bool); void slotPrefsChanged(); void updateTrayIconAction(); diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h index 63467258e..45bb7fb66 100644 --- a/kalarm/mainwindowbase.h +++ b/kalarm/mainwindowbase.h @@ -34,10 +34,11 @@ class MainWindowBase : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - explicit MainWindowBase(TQWidget* parent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose) - : KMainWindow(parent, name, f), disableQuit(false) { } + explicit MainWindowBase(TQWidget* tqparent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose) + : KMainWindow(tqparent, name, f), disableQuit(false) { } protected: virtual void closeEvent(TQCloseEvent*); diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 0b527ac35..c6a0916c8 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -90,11 +90,11 @@ static const int proximityMultiple = 10; // multiple of button height di static bool wantModal(); // A text label widget which can be scrolled and copied with the mouse -class MessageText : public QTextEdit +class MessageText : public TQTextEdit { public: - MessageText(const TQString& text, const TQString& context = TQString::null, TQWidget* parent = 0, const char* name = 0) - : TQTextEdit(text, context, parent, name) + MessageText(const TQString& text, const TQString& context = TQString(), TQWidget* tqparent = 0, const char* name = 0) + : TQTextEdit(text, context, tqparent, name) { setReadOnly(true); setWordWrap(TQTextEdit::NoWrap); @@ -105,7 +105,7 @@ class MessageText : public QTextEdit }; -class MWMimeSourceFactory : public QMimeSourceFactory +class MWMimeSourceFactory : public TQMimeSourceFactory { public: MWMimeSourceFactory(const TQString& absPath, KTextBrowser*); @@ -123,7 +123,7 @@ class MWMimeSourceFactory : public QMimeSourceFactory // Basic flags for the window -static const Qt::WFlags WFLAGS = Qt::WStyle_StaysOnTop | Qt::WDestructiveClose; +static const TQt::WFlags WFLAGS = TQt::WStyle_StaysOnTop | TQt::WDestructiveClose; // Error message bit tqmasks enum { @@ -144,8 +144,8 @@ TQMap<TQString, unsigned> MessageWin::mErrorMessages; * displayed. */ MessageWin::MessageWin(const KAEvent& event, const KAAlarm& alarm, bool reschedule_event, bool allowDefer) - : MainWindowBase(0, "MessageWin", WFLAGS | Qt::WGroupLeader | Qt::WStyle_ContextHelp - | (wantModal() ? 0 : Qt::WX11BypassWM)), + : MainWindowBase(0, "MessageWin", WFLAGS | TQt::WGroupLeader | TQt::WStyle_ContextHelp + | (wantModal() ? 0 : TQt::WX11BypassWM)), mMessage(event.cleanText()), mFont(event.font()), mBgColour(event.bgColour()), @@ -155,7 +155,7 @@ MessageWin::MessageWin(const KAEvent& event, const KAAlarm& alarm, bool reschedu mAudioFile(event.audioFile()), mVolume(event.soundVolume()), mFadeVolume(event.fadeVolume()), - mFadeSeconds(QMIN(event.fadeSeconds(), 86400)), + mFadeSeconds(TQMIN(event.fadeSeconds(), 86400)), mDefaultDeferMinutes(event.deferDefaultMinutes()), mAlarmType(alarm.type()), mAction(event.action()), @@ -202,7 +202,7 @@ MessageWin::MessageWin(const KAEvent& event, const KAAlarm& alarm, bool reschedu * Construct the message window for a specified error message. */ MessageWin::MessageWin(const KAEvent& event, const DateTime& alarmDateTime, const TQStringList& errmsgs) - : MainWindowBase(0, "MessageWin", WFLAGS | Qt::WGroupLeader | Qt::WStyle_ContextHelp), + : MainWindowBase(0, "MessageWin", WFLAGS | TQt::WGroupLeader | TQt::WStyle_ContextHelp), mMessage(event.cleanText()), mDateTime(alarmDateTime), mEventID(event.id()), @@ -303,7 +303,7 @@ void MessageWin::initView() { frame = new TQFrame(topWidget); frame->setFrameStyle(TQFrame::Box | TQFrame::Raised); - topLayout->addWidget(frame, 0, Qt::AlignHCenter); + topLayout->addWidget(frame, 0, TQt::AlignHCenter); tqlayout = new TQVBoxLayout(frame, leading + frame->frameWidth(), leading); } @@ -315,7 +315,7 @@ void MessageWin::initView() if (!frame) label->setFrameStyle(TQFrame::Box | TQFrame::Raised); label->setFixedSize(label->tqsizeHint()); - tqlayout->addWidget(label, 0, Qt::AlignHCenter); + tqlayout->addWidget(label, 0, TQt::AlignHCenter); TQWhatsThis::add(label, i18n("The scheduled date/time for the message (as opposed to the actual time of display).")); @@ -324,7 +324,7 @@ void MessageWin::initView() label = new TQLabel(frame); label->setText(i18n("Reminder")); label->setFixedSize(label->tqsizeHint()); - tqlayout->addWidget(label, 0, Qt::AlignHCenter); + tqlayout->addWidget(label, 0, TQt::AlignHCenter); frame->setFixedSize(frame->tqsizeHint()); } } @@ -341,7 +341,7 @@ void MessageWin::initView() label->setFrameStyle(TQFrame::Box | TQFrame::Raised); label->setFixedSize(label->tqsizeHint()); TQWhatsThis::add(label, i18n("The file whose contents are displayed below")); - topLayout->addWidget(label, 0, Qt::AlignHCenter); + topLayout->addWidget(label, 0, TQt::AlignHCenter); // Display contents of file bool opened = false; @@ -382,7 +382,7 @@ void MessageWin::initView() { // Message label // Using MessageText instead of TQLabel allows scrolling and mouse copying - MessageText* text = new MessageText(mMessage, TQString::null, topWidget); + MessageText* text = new MessageText(mMessage, TQString(), topWidget); text->setFrameStyle(TQFrame::NoFrame); text->setPaper(mBgColour); text->setPaletteForegroundColor(mFgColour); @@ -391,7 +391,7 @@ void MessageWin::initView() TQSize s = text->tqsizeHint(); int h = s.height(); text->setMaximumHeight(h + text->scrollBarHeight()); - text->setMinimumHeight(QMIN(h, lineSpacing*4)); + text->setMinimumHeight(TQMIN(h, lineSpacing*4)); text->setMaximumWidth(s.width() + text->scrollBarWidth()); TQWhatsThis::add(text, i18n("The alarm message")); int vspace = lineSpacing/2; @@ -402,12 +402,12 @@ void MessageWin::initView() if (!mWinModule) mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP); if (text->tqsizeHint().width() >= mWinModule->workArea().width()*2/3) - topLayout->addWidget(text, 1, Qt::AlignHCenter); + topLayout->addWidget(text, 1, TQt::AlignHCenter); else { TQBoxLayout* tqlayout = new TQHBoxLayout(topLayout); tqlayout->addSpacing(hspace); - tqlayout->addWidget(text, 1, Qt::AlignHCenter); + tqlayout->addWidget(text, 1, TQt::AlignHCenter); tqlayout->addSpacing(hspace); } if (!reminder) @@ -436,7 +436,7 @@ void MessageWin::initView() setRemainingTextMinute(); MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute())); // update every minute } - topLayout->addWidget(mRemainingText, 0, Qt::AlignHCenter); + topLayout->addWidget(mRemainingText, 0, TQt::AlignHCenter); topLayout->addSpacing(KDialog::spacingHint()); topLayout->addStretch(); } @@ -452,22 +452,22 @@ void MessageWin::initView() TQFrame* frame = new TQFrame(topWidget); frame->setFrameStyle(TQFrame::Box | TQFrame::Raised); TQWhatsThis::add(frame, i18n("The email to send")); - topLayout->addWidget(frame, 0, Qt::AlignHCenter); + topLayout->addWidget(frame, 0, TQt::AlignHCenter); TQGridLayout* grid = new TQGridLayout(frame, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); TQLabel* label = new TQLabel(i18n("Email addressee", "To:"), frame); label->setFixedSize(label->tqsizeHint()); - grid->addWidget(label, 0, 0, Qt::AlignLeft); + grid->addWidget(label, 0, 0, TQt::AlignLeft); label = new TQLabel(mEvent.emailAddresses("\n"), frame); label->setFixedSize(label->tqsizeHint()); - grid->addWidget(label, 0, 1, Qt::AlignLeft); + grid->addWidget(label, 0, 1, TQt::AlignLeft); label = new TQLabel(i18n("Email subject", "Subject:"), frame); label->setFixedSize(label->tqsizeHint()); - grid->addWidget(label, 1, 0, Qt::AlignLeft); + grid->addWidget(label, 1, 0, TQt::AlignLeft); label = new TQLabel(mEvent.emailSubject(), frame); label->setFixedSize(label->tqsizeHint()); - grid->addWidget(label, 1, 1, Qt::AlignLeft); + grid->addWidget(label, 1, 1, TQt::AlignLeft); break; } case KAEvent::COMMAND: @@ -490,13 +490,13 @@ void MessageWin::initView() TQLabel* label = new TQLabel(topWidget); label->setPixmap(DesktopIcon("error")); label->setFixedSize(label->tqsizeHint()); - tqlayout->addWidget(label, 0, Qt::AlignRight); + tqlayout->addWidget(label, 0, TQt::AlignRight); TQBoxLayout* vtqlayout = new TQVBoxLayout(tqlayout); for (TQStringList::Iterator it = mErrorMsgs.begin(); it != mErrorMsgs.end(); ++it) { label = new TQLabel(*it, topWidget); label->setFixedSize(label->tqsizeHint()); - vtqlayout->addWidget(label, 0, Qt::AlignLeft); + vtqlayout->addWidget(label, 0, TQt::AlignLeft); } tqlayout->addStretch(); } @@ -600,7 +600,7 @@ void MessageWin::initView() topLayout->activate(); setMinimumSize(TQSize(grid->tqsizeHint().width() + 2*KDialog::marginHint(), tqsizeHint().height())); - bool modal = !(getWFlags() & Qt::WX11BypassWM); + bool modal = !(getWFlags() & TQt::WX11BypassWM); unsigned long wstate = (modal ? NET::Modal : 0) | NET::Sticky | NET::KeepAbove; WId winid = winId(); @@ -883,7 +883,7 @@ void MessageWin::slotPlayAudio() if (!haveErrorMessage(ErrMsg_Volume)) { KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").arg(mKMixError), - TQString::null, TQString::tqfromLatin1("KMixError")); + TQString(), TQString::tqfromLatin1("KMixError")); clearErrorMessage(ErrMsg_Volume); } } @@ -1058,7 +1058,7 @@ void MessageWin::stopPlay() if (!mLocalAudioFile.isEmpty()) { KIO::NetAccess::removeTempFile(mLocalAudioFile); // removes it only if it IS a temporary file - mLocalAudioFile = TQString::null; + mLocalAudioFile = TQString(); } if (mSilenceButton) mSilenceButton->setEnabled(false); @@ -1249,7 +1249,7 @@ void MessageWin::showEvent(TQShowEvent* se) * N.B. This can't be done in show(), since the tqgeometry of the window * is not known until it is displayed. Unfortunately by moving the * window in showEvent(), a flicker is unavoidable. - * See the Qt documentation on window tqgeometry for more details. + * See the TQt documentation on window tqgeometry for more details. */ // PROBLEM: The frame size is not known yet! @@ -1437,7 +1437,7 @@ void MessageWin::slotShowKMailMessage() TQCString replyType; TQByteArray data, replyData; TQDataStream arg(data, IO_WriteOnly); - arg << (TQ_UINT32)mKMailSerialNumber << TQString::null; + arg << (TQ_UINT32)mKMailSerialNumber << TQString(); if (kapp->dcopClient()->call("kmail", KMAIL_DCOP_OBJECT, "showMail(TQ_UINT32,TQString)", data, replyType, replyData) && replyType == "bool") { @@ -1465,10 +1465,10 @@ void MessageWin::slotEdit() editDlg.getEvent(event); // Update the displayed lists and the calendar file - KAlarm::UpdateStatus status; + KAlarm::UpdatetqStatus status; if (AlarmCalendar::activeCalendar()->event(mEventID)) { - // The old alarm hasn't expired yet, so tqreplace it + // The old alarm hasn't expired yet, so replace it status = KAlarm::modifyEvent(mEvent, event, 0, &editDlg); Undo::saveEdit(mEvent, event); } @@ -1673,7 +1673,7 @@ MWMimeSourceFactory::MWMimeSourceFactory(const TQString& absPath, KTextBrowser* mLast(0) { view->setMimeSourceFactory(this); - TQString type = KMimeType::tqfindByPath(absPath)->name(); + TQString type = KMimeType::findByPath(absPath)->name(); switch (KAlarm::fileType(type)) { case KAlarm::TextPlain: diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h index 52c86c5fc..f39d2a715 100644 --- a/kalarm/messagewin.h +++ b/kalarm/messagewin.h @@ -44,6 +44,7 @@ namespace KDE { class PlayObject; } class MessageWin : public MainWindowBase { Q_OBJECT + TQ_OBJECT public: MessageWin(); // for session management restoration only MessageWin(const KAEvent&, const KAAlarm&, bool reschedule_event = true, bool allowDefer = true); diff --git a/kalarm/pickfileradio.cpp b/kalarm/pickfileradio.cpp index 15b56d942..dfe0f41a9 100644 --- a/kalarm/pickfileradio.cpp +++ b/kalarm/pickfileradio.cpp @@ -30,15 +30,15 @@ #include "pickfileradio.moc" -PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name) - : RadioButton(text, parent, name), - mGroup(parent), +PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* tqparent, const char* name) + : RadioButton(text, tqparent, name), + mGroup(tqparent), mEdit(edit), mButton(button), mLastId(-1), // set to an invalid value mRevertId(false) { - Q_ASSERT(parent); + Q_ASSERT(tqparent); Q_ASSERT(button); mButton->setEnabled(false); connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); @@ -47,15 +47,15 @@ PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQStrin connect(mGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotSelectionChanged(int))); } -PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name) - : RadioButton(text, parent, name), - mGroup(parent), +PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name) + : RadioButton(text, tqparent, name), + mGroup(tqparent), mEdit(0), mButton(0), mLastId(-1), // set to an invalid value mRevertId(false) { - Q_ASSERT(parent); + Q_ASSERT(tqparent); } void PickFileRadio::init(TQPushButton* button, LineEdit* edit) diff --git a/kalarm/pickfileradio.h b/kalarm/pickfileradio.h index 6d989d5c2..a8d12383e 100644 --- a/kalarm/pickfileradio.h +++ b/kalarm/pickfileradio.h @@ -38,7 +38,7 @@ class LineEdit; * To achieve this, whenever the button is newly selected and the * file name is currently blank, the file picker dialogue is displayed to choose a * file. If the dialogue exits without a file being chosen, the radio button selection - * is reverted to the previously selected button in the parent button group. + * is reverted to the previously selected button in the tqparent button group. * * The class handles the activation of the file picker dialogue (via a virtual method * which must be supplied by deriving a class from this one). It also handles all @@ -50,22 +50,23 @@ class LineEdit; class PickFileRadio : public RadioButton { Q_OBJECT + TQ_OBJECT public: /** Constructor. * @param button Push button to invoke the file picker dialogue. * @param edit File name edit widget, or null if there is none. * @param text Radio button's text. - * @param parent Button group which is to be the parent object for the radio button. + * @param tqparent Button group which is to be the tqparent object for the radio button. * @param name The name of this widget. */ - PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name = 0); + PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* tqparent, const char* name = 0); /** Constructor. * The init() method must be called before the widget can be used. * @param text Radio button's text. - * @param parent Button group which is to be the parent object for the radio button. + * @param tqparent Button group which is to be the tqparent object for the radio button. * @param name The name of this widget. */ - PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = 0); + PickFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name = 0); /** Initialises the widget. * @param button Push button to invoke the file picker dialogue. * @param edit File name edit widget, or null if there is none. @@ -79,7 +80,7 @@ class PickFileRadio : public RadioButton /** Chooses a file, for example by displaying a file selection dialogue. * This method is called when the push button is clicked - the client * should not activate a file selection dialogue directly. - * @return Selected file name, or TQString::null if no selection made. + * @return Selected file name, or TQString() if no selection made. */ virtual TQString pickFile() = 0; /** Notifies the widget of the currently selected file name. diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index 70e720dc0..ec6aa4837 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -43,7 +43,7 @@ #include <kiconloader.h> #include <kcolorcombo.h> #include <kstdguiitem.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <kwin.h> #endif #include <kdebug.h> @@ -87,7 +87,7 @@ static TQString xtermCommands[] = { TQString::tqfromLatin1("eterm --pause -T %t -e %C"), // some systems use eterm... TQString::tqfromLatin1("Eterm --pause -T %t -e %C"), // while some use Eterm TQString::tqfromLatin1("rxvt -title %t -e ${SHELL:-sh} -c %w"), - TQString::null // end of list indicator - don't change! + TQString() // end of list indicator - don't change! }; @@ -106,7 +106,7 @@ void KAlarmPrefDlg::display() } else { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KWin::WindowInfo info = KWin::windowInfo(mInstance->winId(), static_cast<unsigned long>(NET::WMGeometry | NET::WMDesktop)); KWin::setCurrentDesktop(info.desktop()); #endif @@ -119,7 +119,7 @@ void KAlarmPrefDlg::display() KAlarmPrefDlg::KAlarmPrefDlg() : KDialogBase(IconList, i18n("Preferences"), Help | Default | Ok | Apply | Cancel, Ok, 0, "PrefDlg", false, true) { - setWFlags(Qt::WDestructiveClose); + setWFlags(TQt::WDestructiveClose); setIconListAllVisible(true); TQVBox* frame = addVBoxPage(i18n("General"), i18n("General"), DesktopIcon("misc")); @@ -251,7 +251,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) : PrefsTabBase(frame) { // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft; + int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; TQGroupBox* group = new TQButtonGroup(i18n("Run Mode"), mPage, "modeGroup"); TQGridLayout* grid = new TQGridLayout(group, 6, 2, KDialog::marginHint(), KDialog::spacingHint()); @@ -405,12 +405,12 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) cmd.tqreplace("%C", "[command]"); cmd.tqreplace("%W", "[command; sleep]"); TQWhatsThis::add(radio, whatsThis.arg(cmd)); - grid->addWidget(radio, (row = index/3 + 1), index % 3, Qt::AlignAuto); + grid->addWidget(radio, (row = index/3 + 1), index % 3, TQt::AlignAuto); ++index; } box = new TQHBox(group); - grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, Qt::AlignAuto); + grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, TQt::AlignAuto); TQRadioButton* radio = new TQRadioButton(i18n("Other:"), box); radio->setFixedSize(radio->tqsizeHint()); connect(radio, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOtherTerminalToggled(bool))); @@ -444,7 +444,7 @@ void MiscPrefTab::restore() { for ( ; id < mXtermCount; ++id) { - if (mXtermType->find(id) && xtermCmd == xtermCommands[id]) + if (mXtermType->tqfind(id) && xtermCmd == xtermCommands[id]) break; } } @@ -466,7 +466,7 @@ void MiscPrefTab::apply(bool syncToDisc) else { TQStringList args = KShell::splitArgs(cmd); - cmd = args.isEmpty() ? TQString::null : args[0]; + cmd = args.isEmpty() ? TQString() : args[0]; if (KStandardDirs::findExe(cmd).isEmpty()) { mXtermCommand->setFocus(); @@ -526,7 +526,7 @@ void MiscPrefTab::slotAutostartDaemonClicked() if (!mAutostartDaemon->isChecked() && KMessageBox::warningYesNo(this, i18n("You should not uncheck this option unless you intend to discontinue use of KAlarm"), - TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel() + TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel() ) != KMessageBox::Yes) mAutostartDaemon->setChecked(true); } @@ -659,7 +659,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE); TQWhatsThis::add(radio, i18n("Check to use the email address set in the KDE Control Center, to identify you as the sender when sending email alarms.")); - grid->addMultiCellWidget(radio, 2, 2, 1, 2, Qt::AlignAuto); + grid->addMultiCellWidget(radio, 2, 2, 1, 2, TQt::AlignAuto); // 'From' email address to be picked from KMail's identities when the email alarm is configured radio = new RadioButton(i18n("Use KMail &identities"), group); @@ -669,7 +669,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) i18n("Check to use KMail's email identities to identify you as the sender when sending email alarms. " "For existing email alarms, KMail's default identity will be used. " "For new email alarms, you will be able to pick which of KMail's identities to use.")); - grid->addMultiCellWidget(radio, 3, 3, 1, 2, Qt::AlignAuto); + grid->addMultiCellWidget(radio, 3, 3, 1, 2, TQt::AlignAuto); // 'Bcc' email address controls ... grid->addRowSpacing(4, KDialog::spacingHint()); @@ -700,7 +700,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE); TQWhatsThis::add(radio, i18n("Check to use the email address set in the KDE Control Center, for blind copying email alarms to yourself.")); - grid->addMultiCellWidget(radio, 6, 6, 1, 2, Qt::AlignAuto); + grid->addMultiCellWidget(radio, 6, 6, 1, 2, TQt::AlignAuto); group->setFixedHeight(group->tqsizeHint().height()); @@ -788,7 +788,7 @@ TQString EmailPrefTab::validate() mBccAddressChanged = false; return validateAddr(mBccAddressGroup, mEmailBccAddress, i18n("No valid 'Bcc' email address is specified.")); } - return TQString::null; + return TQString(); } TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const TQString& msg) @@ -798,17 +798,17 @@ TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const { case Preferences::MAIL_FROM_CONTROL_CENTRE: if (!KAMail::controlCentreAddress().isEmpty()) - return TQString::null; + return TQString(); errmsg = i18n("No email address is currently set in the KDE Control Center. %1").arg(errmsg); break; case Preferences::MAIL_FROM_KMAIL: if (KAMail::identitiesExist()) - return TQString::null; + return TQString(); errmsg = i18n("No KMail identities currently exist. %1").arg(errmsg); break; case Preferences::MAIL_FROM_ADDR: if (!addr->text().stripWhiteSpace().isEmpty()) - return TQString::null; + return TQString(); break; } return errmsg; @@ -887,9 +887,9 @@ void FontColourPrefTab::setDefaults() EditPrefTab::EditPrefTab(TQVBox* frame) : PrefsTabBase(frame) { - // Get tqalignment to use in TQLabel::tqsetAlignment(tqalignment | Qt::WordBreak) + // Get tqalignment to use in TQLabel::tqsetAlignment(tqalignment | TQt::WordBreak) // (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft; + int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; int groupTopMargin = fontMetrics().lineSpacing()/2; TQString defsetting = i18n("The default setting for \"%1\" in the alarm edit dialog."); @@ -903,12 +903,12 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck"); mConfirmAck->setMinimumSize(mConfirmAck->tqsizeHint()); TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck())); - tqlayout->addWidget(mConfirmAck, 0, Qt::AlignAuto); + tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto); mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose"); mAutoClose->setMinimumSize(mAutoClose->tqsizeHint()); TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin())); - tqlayout->addWidget(mAutoClose, 0, Qt::AlignAuto); + tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto); TQHBox* box = new TQHBox(group); box->setSpacing(KDialog::spacingHint()); @@ -996,7 +996,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc"); mEmailBcc->setMinimumSize(mEmailBcc->tqsizeHint()); TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf())); - tqlayout->addWidget(mEmailBcc, 0, Qt::AlignAuto); + tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto); // MISCELLANEOUS // Show in KOrganizer @@ -1035,7 +1035,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame) TQVBox* vbox = new TQVBox(mPage); // this is to control the TQWhatsThis text display area vbox->setSpacing(KDialog::spacingHint()); label = new TQLabel(i18n("In non-leap years, repeat yearly February 29th alarms on:"), vbox); - label->tqsetAlignment(tqalignment | Qt::WordBreak); + label->tqsetAlignment(tqalignment | TQt::WordBreak); itemBox = new TQHBox(vbox); itemBox->setSpacing(2*KDialog::spacingHint()); mFeb29 = new TQButtonGroup(itemBox); @@ -1181,7 +1181,7 @@ TQString EditPrefTab::validate() mSoundFile->setFocus(); return i18n("You must enter a sound file when %1 is selected as the default sound type").arg(SoundPicker::i18n_File());; } - return TQString::null; + return TQString(); } @@ -1204,7 +1204,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) connect(mTooltipShowAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipAlarmsToggled(bool))); TQWhatsThis::add(mTooltipShowAlarms, i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours")); - grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, Qt::AlignAuto); + grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, TQt::AlignAuto); TQHBox* box = new TQHBox(group); box->setSpacing(KDialog::spacingHint()); @@ -1217,21 +1217,21 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) TQWhatsThis::add(box, i18n("Uncheck to display all of the next 24 hours' alarms in the system tray tooltip. " "Check to enter an upper limit on the number to be displayed.")); - grid->addMultiCellWidget(box, 2, 2, 1, 2, Qt::AlignAuto); + grid->addMultiCellWidget(box, 2, 2, 1, 2, TQt::AlignAuto); mTooltipShowTime = new TQCheckBox(MainWindow::i18n_m_ShowAlarmTime(), group, "tooltipTime"); mTooltipShowTime->setMinimumSize(mTooltipShowTime->tqsizeHint()); connect(mTooltipShowTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToggled(bool))); TQWhatsThis::add(mTooltipShowTime, i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due")); - grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, Qt::AlignAuto); + grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, TQt::AlignAuto); mTooltipShowTimeTo = new TQCheckBox(MainWindow::i18n_l_ShowTimeToAlarm(), group, "tooltipTimeTo"); mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->tqsizeHint()); connect(mTooltipShowTimeTo, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToToggled(bool))); TQWhatsThis::add(mTooltipShowTimeTo, i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due")); - grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, Qt::AlignAuto); + grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, TQt::AlignAuto); box = new TQHBox(group); // this is to control the TQWhatsThis text display area box->setSpacing(KDialog::spacingHint()); @@ -1242,7 +1242,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) TQWhatsThis::add(box, i18n("Enter the text to be displayed in front of the time until the alarm, in the system tray tooltip")); box->setFixedHeight(box->tqsizeHint().height()); - grid->addWidget(box, 5, 2, Qt::AlignAuto); + grid->addWidget(box, 5, 2, TQt::AlignAuto); group->setMaximumHeight(group->tqsizeHint().height()); mModalMessages = new TQCheckBox(i18n("Message &windows have a title bar and take keyboard focus"), mPage, "modalMsg"); diff --git a/kalarm/prefdlg.h b/kalarm/prefdlg.h index 6e7c30c55..5f8f55430 100644 --- a/kalarm/prefdlg.h +++ b/kalarm/prefdlg.h @@ -54,6 +54,7 @@ class MiscPrefTab; class KAlarmPrefDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: static void display(); ~KAlarmPrefDlg(); @@ -80,9 +81,10 @@ class KAlarmPrefDlg : public KDialogBase }; // Base class for each tab in the Preferences dialog -class PrefsTabBase : public QWidget +class PrefsTabBase : public TQWidget { Q_OBJECT + TQ_OBJECT public: PrefsTabBase(TQVBox*); @@ -104,6 +106,7 @@ class PrefsTabBase : public QWidget class MiscPrefTab : public PrefsTabBase { Q_OBJECT + TQ_OBJECT public: MiscPrefTab(TQVBox*); @@ -149,6 +152,7 @@ class MiscPrefTab : public PrefsTabBase class EmailPrefTab : public PrefsTabBase { Q_OBJECT + TQ_OBJECT public: EmailPrefTab(TQVBox*); @@ -184,6 +188,7 @@ class EmailPrefTab : public PrefsTabBase class EditPrefTab : public PrefsTabBase { Q_OBJECT + TQ_OBJECT public: EditPrefTab(TQVBox*); @@ -222,6 +227,7 @@ class EditPrefTab : public PrefsTabBase class ViewPrefTab : public PrefsTabBase { Q_OBJECT + TQ_OBJECT public: ViewPrefTab(TQVBox*); @@ -254,6 +260,7 @@ class ViewPrefTab : public PrefsTabBase class FontColourPrefTab : public PrefsTabBase { Q_OBJECT + TQ_OBJECT public: FontColourPrefTab(TQVBox*); diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp index 93e6a60b0..be1e5e6a9 100644 --- a/kalarm/preferences.cpp +++ b/kalarm/preferences.cpp @@ -42,10 +42,10 @@ static TQString translateXTermPath(KConfig*, const TQString& cmdline, bool write Preferences* Preferences::mInstance = 0; // Default config file settings -TQColor defaultMessageColours[] = { Qt::red, Qt::green, Qt::blue, Qt::cyan, Qt::magenta, Qt::yellow, Qt::white, Qt::lightGray, Qt::black, TQColor() }; +TQColor defaultMessageColours[] = { TQt::red, TQt::green, TQt::blue, TQt::cyan, TQt::magenta, TQt::yellow, TQt::white, TQt::lightGray, TQt::black, TQColor() }; const ColourList Preferences::default_messageColours(defaultMessageColours); -const TQColor Preferences::default_defaultBgColour(Qt::red); -const TQColor Preferences::default_defaultFgColour(Qt::black); +const TQColor Preferences::default_defaultBgColour(TQt::red); +const TQColor Preferences::default_defaultFgColour(TQt::black); TQFont Preferences::mDefault_messageFont; // initialised in constructor const TQTime Preferences::default_startOfDay(0, 0); const bool Preferences::default_runInSystemTray = true; @@ -62,10 +62,10 @@ const TQString Preferences::default_tooltipTimeToPrefix = const int Preferences::default_daemonTrayCheckInterval = 10; // (seconds) const bool Preferences::default_emailCopyToKMail = false; const bool Preferences::default_emailQueuedNotify = false; -const TQColor Preferences::default_disabledColour(Qt::lightGray); -const TQColor Preferences::default_expiredColour(Qt::darkRed); +const TQColor Preferences::default_disabledColour(TQt::lightGray); +const TQColor Preferences::default_expiredColour(TQt::darkRed); const int Preferences::default_expiredKeepDays = 7; -const TQString Preferences::default_defaultSoundFile = TQString::null; +const TQString Preferences::default_defaultSoundFile = TQString(); const float Preferences::default_defaultSoundVolume = -1; const int Preferences::default_defaultLateCancel = 0; const bool Preferences::default_defaultAutoClose = false; @@ -76,8 +76,8 @@ const bool Preferences::default_defaultConfirmAck = const bool Preferences::default_defaultCmdScript = false; const EditAlarmDlg::CmdLogType Preferences::default_defaultCmdLogType = EditAlarmDlg::DISCARD_OUTPUT; const bool Preferences::default_defaultEmailBcc = false; -const TQString Preferences::default_emailAddress = TQString::null; -const TQString Preferences::default_emailBccAddress = TQString::null; +const TQString Preferences::default_emailAddress = TQString(); +const TQString Preferences::default_emailBccAddress = TQString(); const Preferences::MailClient Preferences::default_emailClient = KMAIL; const Preferences::MailFrom Preferences::default_emailBccFrom = MAIL_FROM_CONTROL_CENTRE; const RecurrenceEdit::RepeatType Preferences::default_defaultRecurPeriod = RecurrenceEdit::NO_RECUR; @@ -195,9 +195,9 @@ static const TQString FROM_CONTROL_CENTRE = TQString::tqfromLatin1("@Contro static const TQString FROM_KMAIL = TQString::tqfromLatin1("@KMail"); // Config file entry names for notification messages -const TQString Preferences::QUIT_WARN = TQString::tqfromLatin1("QuitWarn"); +const TQString Preferences::TQUIT_WARN = TQString::tqfromLatin1("QuitWarn"); const TQString Preferences::CONFIRM_ALARM_DELETION = TQString::tqfromLatin1("ConfirmAlarmDeletion"); -const TQString Preferences::EMAIL_QUEUED_NOTIFY = TQString::tqfromLatin1("EmailQueuedNotify"); +const TQString Preferences::EMAIL_TQUEUED_NOTIFY = TQString::tqfromLatin1("EmailQueuedNotify"); static const int SODxor = 0x82451630; inline int Preferences::startOfDayCheck() @@ -222,9 +222,9 @@ void Preferences::initialise() read(); // Set the default button for the Quit warning message box to Cancel - MessageBox::setContinueDefault(QUIT_WARN, KMessageBox::Cancel); - MessageBox::setDefaultShouldBeShownContinue(QUIT_WARN, default_quitWarn); - MessageBox::setDefaultShouldBeShownContinue(EMAIL_QUEUED_NOTIFY, default_emailQueuedNotify); + MessageBox::setContinueDefault(TQUIT_WARN, KMessageBox::Cancel); + MessageBox::setDefaultShouldBeShownContinue(TQUIT_WARN, default_quitWarn); + MessageBox::setDefaultShouldBeShownContinue(EMAIL_TQUEUED_NOTIFY, default_emailQueuedNotify); MessageBox::setDefaultShouldBeShownContinue(CONFIRM_ALARM_DELETION, default_confirmAlarmDeletion); } } @@ -410,7 +410,7 @@ void Preferences::save(bool syncToDisc) case TimePeriod::HOURS_MINUTES: value = TQString::tqfromLatin1("HoursMinutes"); break; case TimePeriod::DAYS: value = TQString::tqfromLatin1("Days"); break; case TimePeriod::WEEKS: value = TQString::tqfromLatin1("Weeks"); break; - default: value = TQString::null; break; + default: value = TQString(); break; } config->writeEntry(DEF_REMIND_UNITS, value); config->writeEntry(DEF_PRE_ACTION, mDefaultPreAction); @@ -449,9 +449,9 @@ TQString Preferences::emailFrom(Preferences::MailFrom from, bool useAddress, boo case MAIL_FROM_CONTROL_CENTRE: return FROM_CONTROL_CENTRE; case MAIL_FROM_ADDR: - return useAddress ? (bcc ? mEmailBccAddress : mEmailAddress) : TQString::null; + return useAddress ? (bcc ? mEmailBccAddress : mEmailAddress) : TQString(); default: - return TQString::null; + return TQString(); } } @@ -478,7 +478,7 @@ TQString Preferences::emailAddress() case MAIL_FROM_ADDR: return mEmailAddress; default: - return TQString::null; + return TQString(); } } @@ -491,7 +491,7 @@ TQString Preferences::emailBccAddress() case MAIL_FROM_ADDR: return mEmailBccAddress; default: - return TQString::null; + return TQString(); } } @@ -607,8 +607,8 @@ void Preferences::convertOldPrefs() static const TQString EMAIL_USE_CTRL_CENTRE = TQString::tqfromLatin1("EmailUseControlCenter"); static const TQString EMAIL_BCC_USE_CTRL_CENTRE = TQString::tqfromLatin1("EmailBccUseControlCenter"); TQMap<TQString, TQString> entries = config->entryMap(GENERAL_SECTION); - if (entries.find(EMAIL_FROM) == entries.end() - && entries.find(EMAIL_USE_CTRL_CENTRE) != entries.end()) + if (entries.tqfind(EMAIL_FROM) == entries.end() + && entries.tqfind(EMAIL_USE_CTRL_CENTRE) != entries.end()) { // Preferences were written by KAlarm pre-1.2.1 config->setGroup(GENERAL_SECTION); diff --git a/kalarm/preferences.h b/kalarm/preferences.h index de3e04911..4b3042d25 100644 --- a/kalarm/preferences.h +++ b/kalarm/preferences.h @@ -39,9 +39,10 @@ class TQWidget; // Settings configured in the Preferences dialog -class Preferences : public QObject +class Preferences : public TQObject { Q_OBJECT + TQ_OBJECT public: enum MailClient { SENDMAIL, KMAIL }; enum MailFrom { MAIL_FROM_KMAIL, MAIL_FROM_CONTROL_CENTRE, MAIL_FROM_ADDR }; @@ -62,8 +63,8 @@ class Preferences : public QObject static bool hasStartOfDayChanged() { return mStartOfDayChanged; } static bool runInSystemTray() { return mRunInSystemTray; } static bool disableAlarmsIfStopped() { return mDisableAlarmsIfStopped; } - static bool quitWarn() { return notifying(QUIT_WARN); } - static void setQuitWarn(bool yes) { setNotify(QUIT_WARN, yes); } + static bool quitWarn() { return notifying(TQUIT_WARN); } + static void setQuitWarn(bool yes) { setNotify(TQUIT_WARN, yes); } static bool autostartTrayIcon() { return mAutostartTrayIcon; } static bool confirmAlarmDeletion() { return notifying(CONFIRM_ALARM_DELETION); } static void setConfirmAlarmDeletion(bool yes){ setNotify(CONFIRM_ALARM_DELETION, yes); } @@ -76,8 +77,8 @@ class Preferences : public QObject static int daemonTrayCheckInterval() { return mDaemonTrayCheckInterval; } static MailClient emailClient() { return mEmailClient; } static bool emailCopyToKMail() { return mEmailCopyToKMail && mEmailClient == SENDMAIL; } - static bool emailQueuedNotify() { return notifying(EMAIL_QUEUED_NOTIFY); } - static void setEmailQueuedNotify(bool yes) { setNotify(EMAIL_QUEUED_NOTIFY, yes); } + static bool emailQueuedNotify() { return notifying(EMAIL_TQUEUED_NOTIFY); } + static void setEmailQueuedNotify(bool yes) { setNotify(EMAIL_TQUEUED_NOTIFY, yes); } static MailFrom emailFrom() { return mEmailFrom; } static bool emailBccUseControlCentre() { return mEmailBccFrom == MAIL_FROM_CONTROL_CENTRE; } static TQString emailAddress(); @@ -108,9 +109,9 @@ class Preferences : public QObject static const TQString& defaultPostAction() { return mDefaultPostAction; } // Config file entry names for notification messages - static const TQString QUIT_WARN; + static const TQString TQUIT_WARN; static const TQString CONFIRM_ALARM_DELETION; - static const TQString EMAIL_QUEUED_NOTIFY; + static const TQString EMAIL_TQUEUED_NOTIFY; // Default values for settings static const ColourList default_messageColours; @@ -169,7 +170,7 @@ class Preferences : public QObject static void read(); static void convertOldPrefs(); static int startOfDayCheck(); - static QString emailFrom(MailFrom, bool useAddress, bool bcc); + static TQString emailFrom(MailFrom, bool useAddress, bool bcc); static MailFrom emailFrom(const TQString&); static void setNotify(const TQString& messageID, bool notify); static bool notifying(const TQString& messageID); diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 3924d428b..5ac3c9bf5 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -82,8 +82,8 @@ TQString RecurrenceEdit::i18n_Yearly() { return i18n("Yearly"); } TQString RecurrenceEdit::i18n_y_Yearly() { return i18n("&Yearly"); } -RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name) - : TQFrame(parent, name), +RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* name) + : TQFrame(tqparent, name), mRule(0), mRuleButtonType(INVALID_RECUR), mDailyShown(false), @@ -103,7 +103,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name * selection of its corresponding radio button. */ - TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup"); + TQGroupBox* recurGroup = new TQGroupBox(1, TQt::Vertical, i18n("Recurrence Rule"), this, "recurGroup"); topLayout->addWidget(recurGroup); TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame"); tqlayout = new TQVBoxLayout(ruleFrame, 0); @@ -111,7 +111,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name tqlayout = new TQHBoxLayout(tqlayout, 0); TQBoxLayout* lay = new TQVBoxLayout(tqlayout, 0); - mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame); + mRuleButtonGroup = new ButtonGroup(1, TQt::Horizontal, ruleFrame); mRuleButtonGroup->setInsideMargin(0); mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame); lay->addWidget(mRuleButtonGroup); @@ -213,7 +213,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mRuleStack->addWidget(mYearlyRule, 5); tqlayout->addSpacing(KDialog::marginHint()); - // Create the recurrence range group which tqcontains the controls + // Create the recurrence range group which contains the controls // which specify how long the recurrence is to last. mRangeButtonGroup = new ButtonGroup(i18n("Recurrence End"), this, "mRangeButtonGroup"); @@ -226,7 +226,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mNoEndDateButton->setFixedSize(mNoEndDateButton->tqsizeHint()); mNoEndDateButton->setReadOnly(mReadOnly); TQWhatsThis::add(mNoEndDateButton, i18n("Repeat the alarm indefinitely")); - vtqlayout->addWidget(mNoEndDateButton, 1, Qt::AlignAuto); + vtqlayout->addWidget(mNoEndDateButton, 1, TQt::AlignAuto); TQSize size = mNoEndDateButton->size(); tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); @@ -1019,8 +1019,8 @@ bool RecurrenceEdit::stateChanged() const = Base class for rule widgets, including recurrence frequency. =============================================================================*/ -Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, TQWidget* parent, const char* name) - : NoRule(parent, name) +Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, TQWidget* tqparent, const char* name) + : NoRule(tqparent, name) { mLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQHBox* freqBox = new TQHBox(this); @@ -1095,10 +1095,10 @@ bool Rule::stateChanged() const = Sub-daily rule widget. =============================================================================*/ -SubDailyRule::SubDailyRule(bool readOnly, TQWidget* parent, const char* name) +SubDailyRule::SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name) : Rule(i18n("hours:minutes"), i18n("Enter the number of hours and minutes between repetitions of the alarm"), - true, readOnly, parent, name) + true, readOnly, tqparent, name) { } @@ -1108,8 +1108,8 @@ SubDailyRule::SubDailyRule(bool readOnly, TQWidget* parent, const char* name) =============================================================================*/ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis, - bool readOnly, TQWidget* parent, const char* name) - : Rule(freqText, freqWhatsThis, false, readOnly, parent, name), + bool readOnly, TQWidget* tqparent, const char* name) + : Rule(freqText, freqWhatsThis, false, readOnly, tqparent, name), mSavedDays(7) { TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint()); @@ -1117,7 +1117,7 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis TQLabel* label = new TQLabel(i18n("On: Tuesday", "O&n:"), this); label->setFixedSize(label->tqsizeHint()); - grid->addWidget(label, 0, 0, Qt::AlignRight | Qt::AlignTop); + grid->addWidget(label, 0, 0, TQt::AlignRight | TQt::AlignTop); grid->addColSpacing(1, KDialog::spacingHint()); // List the days of the week starting at the user's start day of the week. @@ -1131,11 +1131,11 @@ DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis mDayBox[i] = new CheckBox(calendar->weekDayName(day), box); mDayBox[i]->setFixedSize(mDayBox[i]->tqsizeHint()); mDayBox[i]->setReadOnly(readOnly); - dgrid->addWidget(mDayBox[i], i%4, i/4, Qt::AlignAuto); + dgrid->addWidget(mDayBox[i], i%4, i/4, TQt::AlignAuto); } box->setFixedSize(box->tqsizeHint()); TQWhatsThis::add(box, daysWhatsThis); - grid->addWidget(box, 0, 2, Qt::AlignAuto); + grid->addWidget(box, 0, 2, TQt::AlignAuto); label->setBuddy(mDayBox[0]); grid->setColStretch(3, 1); } @@ -1221,11 +1221,11 @@ bool DayWeekRule::stateChanged() const = Daily rule widget. =============================================================================*/ -DailyRule::DailyRule(bool readOnly, TQWidget* parent, const char* name) +DailyRule::DailyRule(bool readOnly, TQWidget* tqparent, const char* name) : DayWeekRule(i18n("day(s)"), i18n("Enter the number of days between repetitions of the alarm"), i18n("Select the days of the week on which the alarm is allowed to occur"), - readOnly, parent, name) + readOnly, tqparent, name) { } @@ -1234,11 +1234,11 @@ DailyRule::DailyRule(bool readOnly, TQWidget* parent, const char* name) = Weekly rule widget. =============================================================================*/ -WeeklyRule::WeeklyRule(bool readOnly, TQWidget* parent, const char* name) +WeeklyRule::WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name) : DayWeekRule(i18n("week(s)"), i18n("Enter the number of weeks between repetitions of the alarm"), i18n("Select the days of the week on which to repeat the alarm"), - readOnly, parent, name) + readOnly, tqparent, name) { } @@ -1248,8 +1248,8 @@ WeeklyRule::WeeklyRule(bool readOnly, TQWidget* parent, const char* name) =============================================================================*/ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhatsThis, bool allowEveryWeek, - bool readOnly, TQWidget* parent, const char* name) - : Rule(freqText, freqWhatsThis, false, readOnly, parent, name), + bool readOnly, TQWidget* tqparent, const char* name) + : Rule(freqText, freqWhatsThis, false, readOnly, tqparent, name), mEveryWeek(allowEveryWeek) { mButtonGroup = new ButtonGroup(this); @@ -1438,10 +1438,10 @@ bool MonthYearRule::stateChanged() const = Monthly rule widget. =============================================================================*/ -MonthlyRule::MonthlyRule(bool readOnly, TQWidget* parent, const char* name) +MonthlyRule::MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name) : MonthYearRule(i18n("month(s)"), i18n("Enter the number of months between repetitions of the alarm"), - false, readOnly, parent, name) + false, readOnly, tqparent, name) { } @@ -1450,20 +1450,20 @@ MonthlyRule::MonthlyRule(bool readOnly, TQWidget* parent, const char* name) = Yearly rule widget. =============================================================================*/ -YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) +YearlyRule::YearlyRule(bool readOnly, TQWidget* tqparent, const char* name) : MonthYearRule(i18n("year(s)"), i18n("Enter the number of years between repetitions of the alarm"), - true, readOnly, parent, name) + true, readOnly, tqparent, name) { // Set up the month selection widgets TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint()); TQLabel* label = new TQLabel(i18n("List of months to select", "Months:"), this); label->setFixedSize(label->tqsizeHint()); - htqlayout->addWidget(label, 0, Qt::AlignAuto | Qt::AlignTop); + htqlayout->addWidget(label, 0, TQt::AlignAuto | TQt::AlignTop); // List the months of the year. TQWidget* w = new TQWidget(this); // this is to control the TQWhatsThis text display area - htqlayout->addWidget(w, 1, Qt::AlignAuto); + htqlayout->addWidget(w, 1, TQt::AlignAuto); TQGridLayout* grid = new TQGridLayout(w, 4, 3, 0, KDialog::spacingHint()); const KCalendarSystem* calendar = KGlobal::locale()->calendar(); int year = TQDate::tqcurrentDate().year(); @@ -1472,7 +1472,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) mMonthBox[i] = new CheckBox(calendar->monthName(i + 1, year, true), w); mMonthBox[i]->setFixedSize(mMonthBox[i]->tqsizeHint()); mMonthBox[i]->setReadOnly(readOnly); - grid->addWidget(mMonthBox[i], i%3, i/3, Qt::AlignAuto); + grid->addWidget(mMonthBox[i], i%3, i/3, TQt::AlignAuto); } connect(mMonthBox[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(enableFeb29())); w->setFixedHeight(w->tqsizeHint().height()); diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h index ca428645f..893b4456d 100644 --- a/kalarm/recurrenceedit.h +++ b/kalarm/recurrenceedit.h @@ -53,14 +53,15 @@ class MonthlyRule; class YearlyRule; -class RecurrenceEdit : public QFrame +class RecurrenceEdit : public TQFrame { Q_OBJECT + TQ_OBJECT public: // Don't alter the order of these recurrence types enum RepeatType { INVALID_RECUR = -1, NO_RECUR, AT_LOGIN, SUBDAILY, DAILY, WEEKLY, MONTHLY, ANNUAL }; - RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name = 0); + RecurrenceEdit(bool readOnly, TQWidget* tqparent, const char* name = 0); virtual ~RecurrenceEdit() { } /** Set widgets to default values */ diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h index 51a7085db..659921d5b 100644 --- a/kalarm/recurrenceeditprivate.h +++ b/kalarm/recurrenceeditprivate.h @@ -36,10 +36,10 @@ class TimeSpinBox; class TQString; -class NoRule : public QFrame +class NoRule : public TQFrame { public: - NoRule(TQWidget* parent, const char* name = 0) : TQFrame(parent, name) + NoRule(TQWidget* tqparent, const char* name = 0) : TQFrame(tqparent, name) { setFrameStyle(TQFrame::NoFrame); } virtual int frequency() const { return 0; } }; @@ -47,9 +47,10 @@ class NoRule : public QFrame class Rule : public NoRule { Q_OBJECT + TQ_OBJECT public: Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, - TQWidget* parent, const char* name = 0); + TQWidget* tqparent, const char* name = 0); int frequency() const; void setFrequency(int); virtual void setFrequencyFocus() { mSpinBox->setFocus(); } @@ -72,17 +73,19 @@ class Rule : public NoRule class SubDailyRule : public Rule { Q_OBJECT + TQ_OBJECT public: - SubDailyRule(bool readOnly, TQWidget* parent, const char* name = 0); + SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name = 0); }; // Daily/weekly rule choices base class class DayWeekRule : public Rule { Q_OBJECT + TQ_OBJECT public: DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis, - bool readOnly, TQWidget* parent, const char* name = 0); + bool readOnly, TQWidget* tqparent, const char* name = 0); TQBitArray days() const; void setDays(bool); void setDays(const TQBitArray& days); @@ -100,25 +103,26 @@ class DayWeekRule : public Rule class DailyRule : public DayWeekRule { public: - DailyRule(bool readOnly, TQWidget* parent, const char* name = 0); + DailyRule(bool readOnly, TQWidget* tqparent, const char* name = 0); }; // Weekly rule choices class WeeklyRule : public DayWeekRule { public: - WeeklyRule(bool readOnly, TQWidget* parent, const char* name = 0); + WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name = 0); }; // Monthly/yearly rule choices base class class MonthYearRule : public Rule { Q_OBJECT + TQ_OBJECT public: enum DayPosType { DATE, POS }; MonthYearRule(const TQString& freqText, const TQString& freqWhatsThis, bool allowEveryWeek, - bool readOnly, TQWidget* parent, const char* name = 0); + bool readOnly, TQWidget* tqparent, const char* name = 0); DayPosType type() const; int date() const; // if date in month is selected int week() const; // if position is selected @@ -161,15 +165,16 @@ class MonthYearRule : public Rule class MonthlyRule : public MonthYearRule { public: - MonthlyRule(bool readOnly, TQWidget* parent, const char* name = 0); + MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name = 0); }; // Yearly rule choices class YearlyRule : public MonthYearRule { Q_OBJECT + TQ_OBJECT public: - YearlyRule(bool readOnly, TQWidget* parent, const char* name = 0); + YearlyRule(bool readOnly, TQWidget* tqparent, const char* name = 0); TQValueList<int> months() const; void setMonths(const TQValueList<int>& months); void setDefaultValues(int dayOfMonth, int dayOfWeek, int month); diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp index e10e04e22..ee197e73a 100644 --- a/kalarm/reminder.cpp +++ b/kalarm/reminder.cpp @@ -41,8 +41,8 @@ TQString Reminder::i18n_u_first_recurrence_only() { return i18n("Reminder for fi Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis, - bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name) - : TQFrame(parent, name), + bool allowHourMinute, bool showOnceOnly, TQWidget* tqparent, const char* name) + : TQFrame(tqparent, name), mReadOnly(false), mOnceOnlyEnabled(showOnceOnly) { diff --git a/kalarm/reminder.h b/kalarm/reminder.h index 2470a0c3d..f9e2b57fc 100644 --- a/kalarm/reminder.h +++ b/kalarm/reminder.h @@ -27,12 +27,13 @@ class TimeSelector; class CheckBox; -class Reminder : public QFrame +class Reminder : public TQFrame { Q_OBJECT + TQ_OBJECT public: Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis, - bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name = 0); + bool allowHourMinute, bool showOnceOnly, TQWidget* tqparent, const char* name = 0); bool isReminder() const; bool isOnceOnly() const; int minutes() const; diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp index b2241b716..5dac94dcf 100644 --- a/kalarm/repetition.cpp +++ b/kalarm/repetition.cpp @@ -40,8 +40,8 @@ = Button to display the Alarm Sub-Repetition dialogue. =============================================================================*/ -RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name) - : TQPushButton(caption, parent, name), +RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* tqparent, const char* name) + : TQPushButton(caption, tqparent, name), mDialog(0), mInterval(0), mCount(0), @@ -149,8 +149,8 @@ void RepetitionButton::displayDialog() static const int MAX_COUNT = 9999; // maximum range for count spinbox -RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, caption, Ok|Cancel), +RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, caption, Ok|Cancel), mMaxDuration(-1), mDateOnly(false), mReadOnly(readOnly) @@ -160,7 +160,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p setMainWidget(page); TQVBoxLayout* topLayout = new TQVBoxLayout(page, 0, spacing); - mTimeSelector = new TimeSelector(i18n("Repeat every 10 minutes", "&Repeat every"), TQString::null, + mTimeSelector = new TimeSelector(i18n("Repeat every 10 minutes", "&Repeat every"), TQString(), i18n("Instead of the alarm triggering just once at each recurrence, " "checking this option makes the alarm trigger multiple times at each recurrence."), i18n("Enter the time between repetitions of the alarm"), @@ -168,7 +168,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p mTimeSelector->setFixedSize(mTimeSelector->tqsizeHint()); connect(mTimeSelector, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int))); connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(repetitionToggled(bool))); - topLayout->addWidget(mTimeSelector, 0, Qt::AlignAuto); + topLayout->addWidget(mTimeSelector, 0, TQt::AlignAuto); mButtonGroup = new ButtonGroup(page, "buttonGroup"); connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked())); diff --git a/kalarm/repetition.h b/kalarm/repetition.h index c8a32ce88..c2b0ebd6c 100644 --- a/kalarm/repetition.h +++ b/kalarm/repetition.h @@ -32,11 +32,12 @@ class TimePeriod; class RepetitionDlg; -class RepetitionButton : public QPushButton +class RepetitionButton : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name = 0); + RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* tqparent, const char* name = 0); void set(int interval, int count); void set(int interval, int count, bool dateOnly, int maxDuration = -1); void initialise(int interval, int count, bool dateOnly, int maxDuration = -1); // use only after needsInitialisation() signal @@ -70,8 +71,9 @@ class RepetitionButton : public QPushButton class RepetitionDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent = 0, const char* name = 0); + RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* tqparent = 0, const char* name = 0); void setReadOnly(bool); void set(int interval, int count, bool dateOnly = false, int maxDuration = -1); int interval() const; // get the interval between repetitions, in minutes diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index 691ba936f..02d3af55b 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -69,8 +69,8 @@ static const char SOUND_DIALOG_NAME[] = "SoundDialog"; SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat, - const TQString& caption, TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false), + const TQString& caption, TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false), mReadOnly(false), mArtsDispatcher(0), mPlayObject(0), @@ -120,7 +120,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad grid->addColSpacing(0, indentWidth); grid->addColSpacing(1, indentWidth); // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there) - int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft; + int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft; // 'Set volume' checkbox box = new TQHBox(group); @@ -133,7 +133,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad i18n("Select to choose the volume for playing the sound file.")); // Volume slider - mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box); + mVolumeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, box); mVolumeSlider->setTickmarks(TQSlider::Below); mVolumeSlider->setTickInterval(10); mVolumeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); @@ -168,7 +168,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad grid->addWidget(mFadeVolumeBox, 4, 2); label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox); label->setFixedSize(label->tqsizeHint()); - mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox); + mFadeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, mFadeVolumeBox); mFadeSlider->setTickmarks(TQSlider::Below); mFadeSlider->setTickInterval(10); mFadeSlider->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); @@ -370,7 +370,7 @@ void SoundDlg::stopPlay() if (!mLocalAudioFile.isEmpty()) { KIO::NetAccess::removeTempFile(mLocalAudioFile); // removes it only if it IS a temporary file - mLocalAudioFile = TQString::null; + mLocalAudioFile = TQString(); } mFilePlay->setPixmap(SmallIcon("player_play")); TQToolTip::add(mFilePlay, i18n("Test the sound")); @@ -412,7 +412,7 @@ bool SoundDlg::checkFile() #endif { // It's a relative path. - // Find the first sound resource that tqcontains files. + // Find the first sound resource that contains files. TQStringList soundDirs = KGlobal::dirs()->resourceDirs("sound"); if (!soundDirs.isEmpty()) { @@ -443,7 +443,7 @@ bool SoundDlg::checkFile() } #ifdef WITHOUT_ARTS KMessageBox::sorry(this, i18n("File not found")); - mFileName = TQString::null; + mFileName = TQString(); return false; #else return true; diff --git a/kalarm/sounddlg.h b/kalarm/sounddlg.h index 639a1c83f..bcc8dd92d 100644 --- a/kalarm/sounddlg.h +++ b/kalarm/sounddlg.h @@ -39,9 +39,10 @@ class Slider; class SoundDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat, - const TQString& caption, TQWidget* parent, const char* name = 0); + const TQString& caption, TQWidget* tqparent, const char* name = 0); ~SoundDlg(); void setReadOnly(bool); bool isReadOnly() const { return mReadOnly; } diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index ec09c2b86..25d871c41 100644 --- a/kalarm/soundpicker.cpp +++ b/kalarm/soundpicker.cpp @@ -55,8 +55,8 @@ TQString SoundPicker::i18n_Speak() { return i18n("Speak"); } TQString SoundPicker::i18n_File() { return i18n("Sound file"); } -SoundPicker::SoundPicker(TQWidget* parent, const char* name) - : TQFrame(parent, name) +SoundPicker::SoundPicker(TQWidget* tqparent, const char* name) + : TQFrame(tqparent, name) { setFrameStyle(TQFrame::NoFrame); TQHBoxLayout* soundLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); @@ -144,7 +144,7 @@ SoundPicker::Type SoundPicker::sound() const */ TQString SoundPicker::file() const { - return (mTypeCombo->currentItem() == PLAY_FILE) ? mFile : TQString::null; + return (mTypeCombo->currentItem() == PLAY_FILE) ? mFile : TQString(); } /****************************************************************************** diff --git a/kalarm/soundpicker.h b/kalarm/soundpicker.h index a0a9b83cd..eaf0ec16b 100644 --- a/kalarm/soundpicker.h +++ b/kalarm/soundpicker.h @@ -30,9 +30,10 @@ class ComboBox; class PushButton; -class SoundPicker : public QFrame +class SoundPicker : public TQFrame { Q_OBJECT + TQ_OBJECT public: /** Sound options which can be selected for when the alarm is displayed. * @li NONE - silence. @@ -42,10 +43,10 @@ class SoundPicker : public QFrame */ enum Type { NONE = 0, BEEP, PLAY_FILE, SPEAK }; /** Constructor. - * @param parent The parent object of this widget. + * @param tqparent The tqparent object of this widget. * @param name The name of this widget. */ - explicit SoundPicker(TQWidget* parent, const char* name = 0); + explicit SoundPicker(TQWidget* tqparent, const char* name = 0); /** Initialises the widget's state. * @param type The option to select. * @param filename The full path or URL of the sound file to select. If the 'file' option is @@ -103,7 +104,7 @@ class SoundPicker : public QFrame * If null, no file will be highlighted. * @return URL selected, in human readable format. If none is selected, URL.isEmpty() is true. */ - static TQString browseFile(TQString& initialDir, const TQString& initialFile = TQString::null); + static TQString browseFile(TQString& initialDir, const TQString& initialFile = TQString()); static TQString i18n_Sound(); // plain text of Sound label static TQString i18n_None(); // plain text of None combo box item diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp index fabff6edd..919524aff 100644 --- a/kalarm/specialactions.cpp +++ b/kalarm/specialactions.cpp @@ -40,8 +40,8 @@ = Button to display the Special Alarm Actions dialogue. =============================================================================*/ -SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* parent, const char* name) - : TQPushButton(caption, parent, name), +SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* tqparent, const char* name) + : TQPushButton(caption, tqparent, name), mReadOnly(false) { setToggleButton(true); @@ -90,8 +90,8 @@ static const char SPEC_ACT_DIALOG_NAME[] = "SpecialActionsDialog"; SpecialActionsDlg::SpecialActionsDlg(const TQString& preAction, const TQString& postAction, - const TQString& caption, TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false) + const TQString& caption, TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false) { TQWidget* page = new TQWidget(this); setMainWidget(page); @@ -134,8 +134,8 @@ void SpecialActionsDlg::resizeEvent(TQResizeEvent* re) = Pre- and post-alarm actions widget. =============================================================================*/ -SpecialActions::SpecialActions(TQWidget* parent, const char* name) - : TQWidget(parent, name), +SpecialActions::SpecialActions(TQWidget* tqparent, const char* name) + : TQWidget(tqparent, name), mReadOnly(false) { TQBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -143,7 +143,7 @@ SpecialActions::SpecialActions(TQWidget* parent, const char* name) // Pre-alarm action TQLabel* label = new TQLabel(i18n("Pre-a&larm action:"), this); label->setFixedSize(label->tqsizeHint()); - topLayout->addWidget(label, 0, Qt::AlignAuto); + topLayout->addWidget(label, 0, TQt::AlignAuto); mPreAction = new KLineEdit(this); label->setBuddy(mPreAction); @@ -157,7 +157,7 @@ SpecialActions::SpecialActions(TQWidget* parent, const char* name) // Post-alarm action label = new TQLabel(i18n("Post-alar&m action:"), this); label->setFixedSize(label->tqsizeHint()); - topLayout->addWidget(label, 0, Qt::AlignAuto); + topLayout->addWidget(label, 0, TQt::AlignAuto); mPostAction = new KLineEdit(this); label->setBuddy(mPostAction); diff --git a/kalarm/specialactions.h b/kalarm/specialactions.h index 4cc7b698d..58f5c7d62 100644 --- a/kalarm/specialactions.h +++ b/kalarm/specialactions.h @@ -28,11 +28,12 @@ class KLineEdit; -class SpecialActionsButton : public QPushButton +class SpecialActionsButton : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - SpecialActionsButton(const TQString& caption, TQWidget* parent = 0, const char* name = 0); + SpecialActionsButton(const TQString& caption, TQWidget* tqparent = 0, const char* name = 0); void setActions(const TQString& pre, const TQString& post); const TQString& preAction() const { return mPreAction; } const TQString& postAction() const { return mPostAction; } @@ -53,11 +54,12 @@ class SpecialActionsButton : public QPushButton // Pre- and post-alarm actions widget -class SpecialActions : public QWidget +class SpecialActions : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SpecialActions(TQWidget* parent = 0, const char* name = 0); + SpecialActions(TQWidget* tqparent = 0, const char* name = 0); void setActions(const TQString& pre, const TQString& post); TQString preAction() const; TQString postAction() const; @@ -75,9 +77,10 @@ class SpecialActions : public QWidget class SpecialActionsDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: SpecialActionsDlg(const TQString& preAction, const TQString& postAction, - const TQString& caption, TQWidget* parent = 0, const char* name = 0); + const TQString& caption, TQWidget* tqparent = 0, const char* name = 0); TQString preAction() const { return mActions->preAction(); } TQString postAction() const { return mActions->postAction(); } void setReadOnly(bool ro) { mActions->setReadOnly(ro); } diff --git a/kalarm/startdaytimer.h b/kalarm/startdaytimer.h index d8a305ac9..ae0a5580f 100644 --- a/kalarm/startdaytimer.h +++ b/kalarm/startdaytimer.h @@ -35,6 +35,7 @@ class StartOfDayTimer : public DailyTimer { Q_OBJECT + TQ_OBJECT public: virtual ~StartOfDayTimer() { } /** Connect to the timer signal. diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index dab8b45d2..6e493b91e 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -43,8 +43,8 @@ static const char TMPL_DIALOG_NAME[] = "TemplateDialog"; TemplateDlg* TemplateDlg::mInstance = 0; -TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) - : KDialogBase(KDialogBase::Plain, i18n("Alarm Templates"), Close, Ok, parent, name, false, true) +TemplateDlg::TemplateDlg(TQWidget* tqparent, const char* name) + : KDialogBase(KDialogBase::Plain, i18n("Alarm Templates"), Close, Ok, tqparent, name, false, true) { TQWidget* topWidget = plainPage(); TQBoxLayout* topLayout = new TQHBoxLayout(topWidget); @@ -103,11 +103,11 @@ TemplateDlg::~TemplateDlg() /****************************************************************************** * Create an instance, if none already exists. */ -TemplateDlg* TemplateDlg::create(TQWidget* parent, const char* name) +TemplateDlg* TemplateDlg::create(TQWidget* tqparent, const char* name) { if (mInstance) return 0; - mInstance = new TemplateDlg(parent, name); + mInstance = new TemplateDlg(tqparent, name); return mInstance; } @@ -138,9 +138,9 @@ void TemplateDlg::slotCopy() * Create a new template. * If 'event' is non-zero, base the new template on an existing event or template. */ -void TemplateDlg::createTemplate(const KAEvent* event, TQWidget* parent, TemplateListView* view) +void TemplateDlg::createTemplate(const KAEvent* event, TQWidget* tqparent, TemplateListView* view) { - EditAlarmDlg editDlg(true, i18n("New Alarm Template"), parent, 0, event); + EditAlarmDlg editDlg(true, i18n("New Alarm Template"), tqparent, 0, event); if (editDlg.exec() == TQDialog::Accepted) { KAEvent event; @@ -192,14 +192,14 @@ void TemplateDlg::slotDelete() return; int warnErr = 0; - KAlarm::UpdateStatus status = KAlarm::UPDATE_OK; + KAlarm::UpdatetqStatus status = KAlarm::UPDATE_OK; TQValueList<KAEvent> events; AlarmCalendar::templateCalendar()->startUpdate(); // prevent multiple saves of the calendar until we're finished for (TQValueList<EventListViewItemBase*>::Iterator it = items.begin(); it != items.end(); ++it) { TemplateListViewItem* item = (TemplateListViewItem*)(*it); events.append(item->event()); - KAlarm::UpdateStatus st = KAlarm::deleteTemplate(item->event()); + KAlarm::UpdatetqStatus st = KAlarm::deleteTemplate(item->event()); if (st != KAlarm::UPDATE_OK) { status = st; diff --git a/kalarm/templatedlg.h b/kalarm/templatedlg.h index 25b7b66f6..18ff7224c 100644 --- a/kalarm/templatedlg.h +++ b/kalarm/templatedlg.h @@ -30,10 +30,11 @@ class KAEvent; class TemplateDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - static TemplateDlg* create(TQWidget* parent = 0, const char* name = 0); + static TemplateDlg* create(TQWidget* tqparent = 0, const char* name = 0); ~TemplateDlg(); - static void createTemplate(const KAEvent* = 0, TQWidget* parent = 0, TemplateListView* = 0); + static void createTemplate(const KAEvent* = 0, TQWidget* tqparent = 0, TemplateListView* = 0); signals: void emptyToggled(bool notEmpty); @@ -49,7 +50,7 @@ class TemplateDlg : public KDialogBase void slotSelectionChanged(); private: - TemplateDlg(TQWidget* parent, const char* name); + TemplateDlg(TQWidget* tqparent, const char* name); static TemplateDlg* mInstance; // the current instance, to prevent multiple dialogues diff --git a/kalarm/templatelistview.cpp b/kalarm/templatelistview.cpp index 1c0dd504b..435789ce4 100644 --- a/kalarm/templatelistview.cpp +++ b/kalarm/templatelistview.cpp @@ -35,17 +35,17 @@ TQValueList<EventListViewBase*> TemplateListView::mInstanceList; -TemplateListView::TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent, const char* name) - : EventListViewBase(parent, name), +TemplateListView::TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* tqparent, const char* name) + : EventListViewBase(tqparent, name), mWhatsThisText(whatsThisText), mIconColumn(0), mNameColumn(1), mExcludeCmdAlarms(!includeCmdAlarms) { - addColumn(TQString::null); // icon column + addColumn(TQString()); // icon column addLastColumn(i18n("Name")); setSorting(mNameColumn); // sort initially by name - setColumnAlignment(mIconColumn, Qt::AlignHCenter); + setColumnAlignment(mIconColumn, TQt::AlignHCenter); setColumnWidthMode(mIconColumn, TQListView::Maximum); mInstanceList.append(this); @@ -92,8 +92,8 @@ TQString TemplateListView::whatsThisText(int column) const = Contains the details of one alarm for display in the TemplateListView. =============================================================================*/ -TemplateListViewItem::TemplateListViewItem(TemplateListView* parent, const KAEvent& event) - : EventListViewItemBase(parent, event) +TemplateListViewItem::TemplateListViewItem(TemplateListView* tqparent, const KAEvent& event) + : EventListViewItemBase(tqparent, event) { setLastColumnText(); // set the template name column text diff --git a/kalarm/templatelistview.h b/kalarm/templatelistview.h index 0a629eb36..512b1ad91 100644 --- a/kalarm/templatelistview.h +++ b/kalarm/templatelistview.h @@ -34,7 +34,7 @@ class TemplateListView; class TemplateListViewItem : public EventListViewItemBase { public: - TemplateListViewItem(TemplateListView* parent, const KAEvent&); + TemplateListViewItem(TemplateListView* tqparent, const KAEvent&); TemplateListView* templateListView() const { return (TemplateListView*)listView(); } // Overridden base class methods TemplateListViewItem* nextSibling() const { return (TemplateListViewItem*)TQListViewItem::nextSibling(); } @@ -49,8 +49,9 @@ class TemplateListViewItem : public EventListViewItemBase class TemplateListView : public EventListViewBase { Q_OBJECT + TQ_OBJECT public: - explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent = 0, const char* name = 0); + explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* tqparent = 0, const char* name = 0); ~TemplateListView(); int iconColumn() const { return mIconColumn; } int nameColumn() const { return mNameColumn; } diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h index de7151982..e32293690 100644 --- a/kalarm/templatemenuaction.h +++ b/kalarm/templatemenuaction.h @@ -28,9 +28,10 @@ class KAEvent; class TemplateMenuAction : public KActionMenu { Q_OBJECT + TQ_OBJECT public: TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver, - const char* slot, KActionCollection* parent, const char* name = 0); + const char* slot, KActionCollection* tqparent, const char* name = 0); signals: void selected(const KAEvent&); diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp index 3df2d8dd7..fd0a5ebf8 100644 --- a/kalarm/templatepickdlg.cpp +++ b/kalarm/templatepickdlg.cpp @@ -34,8 +34,8 @@ static const char TMPL_PICK_DIALOG_NAME[] = "TemplatePickDialog"; -TemplatePickDlg::TemplatePickDlg(TQWidget* parent, const char* name) - : KDialogBase(KDialogBase::Plain, i18n("Choose Alarm Template"), Ok|Cancel, Ok, parent, name) +TemplatePickDlg::TemplatePickDlg(TQWidget* tqparent, const char* name) + : KDialogBase(KDialogBase::Plain, i18n("Choose Alarm Template"), Ok|Cancel, Ok, tqparent, name) { TQWidget* topWidget = plainPage(); TQBoxLayout* topLayout = new TQVBoxLayout(topWidget); diff --git a/kalarm/templatepickdlg.h b/kalarm/templatepickdlg.h index 2f003d91a..7c99f6f35 100644 --- a/kalarm/templatepickdlg.h +++ b/kalarm/templatepickdlg.h @@ -29,8 +29,9 @@ class KAEvent; class TemplatePickDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TemplatePickDlg(TQWidget* parent = 0, const char* name = 0); + TemplatePickDlg(TQWidget* tqparent = 0, const char* name = 0); const KAEvent* selectedTemplate() const; protected: virtual void resizeEvent(TQResizeEvent*); diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp index 31e69d749..0c88d93c5 100644 --- a/kalarm/timeselector.cpp +++ b/kalarm/timeselector.cpp @@ -34,8 +34,8 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis, - const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name) - : TQFrame(parent, name), + const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* tqparent, const char* name) + : TQFrame(tqparent, name), mLabel(0), mReadOnly(false) { diff --git a/kalarm/timeselector.h b/kalarm/timeselector.h index a2b872423..1508194c7 100644 --- a/kalarm/timeselector.h +++ b/kalarm/timeselector.h @@ -28,12 +28,13 @@ class TQLabel; class CheckBox; -class TimeSelector : public QFrame +class TimeSelector : public TQFrame { Q_OBJECT + TQ_OBJECT public: TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis, - const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name = 0); + const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* tqparent, const char* name = 0); bool isChecked() const; void setChecked(bool on); int minutes() const; diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 41fd9e4db..190cb5384 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -50,10 +50,10 @@ #include "traywindow.moc" -class TrayTooltip : public QToolTip +class TrayTooltip : public TQToolTip { public: - TrayTooltip(TQWidget* parent) : TQToolTip(parent) { } + TrayTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { } virtual ~TrayTooltip() {} protected: virtual void maybeTip(const TQPoint&); @@ -71,9 +71,9 @@ struct TipItem = The KDE system tray window. =============================================================================*/ -TrayWindow::TrayWindow(MainWindow* parent, const char* name) - : KSystemTray((theApp()->wantRunInSystemTray() ? parent : 0), name), - mAssocMainWindow(parent) +TrayWindow::TrayWindow(MainWindow* tqparent, const char* name) + : KSystemTray((theApp()->wantRunInSystemTray() ? tqparent : 0), name), + mAssocMainWindow(tqparent) { kdDebug(5950) << "TrayWindow::TrayWindow()\n"; // Set up GUI icons @@ -87,7 +87,7 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) KActionCollection* actcol = actionCollection(); AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable"); a->plug(contextMenu()); - connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool))); + connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledtqStatus(bool))); KAlarm::createNewAlarmAction(i18n("&New Alarm..."), this, TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu()); KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu()); KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu()); @@ -99,8 +99,8 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) KStdAction::quit(this, TQT_SLOT(slotQuit()), actcol); // Set icon to correspond with the alarms enabled menu status - Daemon::checkStatus(); - setEnabledStatus(Daemon::monitoringAlarms()); + Daemon::checktqStatus(); + setEnabledtqStatus(Daemon::monitoringAlarms()); mTooltip = new TrayTooltip(this); } @@ -121,7 +121,7 @@ TrayWindow::~TrayWindow() void TrayWindow::contextMenuAboutToShow(KPopupMenu* menu) { KSystemTray::contextMenuAboutToShow(menu); // needed for KDE <= 3.1 compatibility - Daemon::checkStatus(); + Daemon::checktqStatus(); } /****************************************************************************** @@ -160,9 +160,9 @@ void TrayWindow::slotQuit() * Called when the Alarms Enabled action status has changed. * Updates the alarms enabled menu item check state, and the icon pixmap. */ -void TrayWindow::setEnabledStatus(bool status) +void TrayWindow::setEnabledtqStatus(bool status) { - kdDebug(5950) << "TrayWindow::setEnabledStatus(" << (int)status << ")\n"; + kdDebug(5950) << "TrayWindow::setEnabledtqStatus(" << (int)status << ")\n"; setPixmap(status ? mPixmapEnabled : mPixmapDisabled); } @@ -316,7 +316,7 @@ void TrayWindow::removeWindow(MainWindow* win) /****************************************************************************** * Check whether the widget is in the system tray. * Note that it is only sometime AFTER the show event that the system tray -* becomes the widget's parent. So for a definitive status, call this method +* becomes the widget's tqparent. So for a definitive status, call this method * only after waiting a bit... * Reply = true if the widget is in the system tray, or its status can't be determined. * = false if it is not currently in the system tray. @@ -324,18 +324,18 @@ void TrayWindow::removeWindow(MainWindow* win) bool TrayWindow::inSystemTray() const { #ifdef HAVE_X11_HEADERS - Window xParent; // receives parent window + Window xParent; // receives tqparent window Window root; - Window* children = 0; - unsigned int nchildren; - // Find the X parent window of the widget. This is not the same as the Qt parent widget. - if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &children, &nchildren)) - return true; // error determining its parent X window - if (children) - XFree(children); - - // If it is in the system tray, the system tray window will be its X parent. - // Otherwise, the root window will be its X parent. + Window* tqchildren = 0; + unsigned int ntqchildren; + // Find the X tqparent window of the widget. This is not the same as the TQt tqparent widget. + if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &tqchildren, &ntqchildren)) + return true; // error determining its tqparent X window + if (tqchildren) + XFree(tqchildren); + + // If it is in the system tray, the system tray window will be its X tqparent. + // Otherwise, the root window will be its X tqparent. return xParent != root; #else return true; @@ -348,7 +348,7 @@ bool TrayWindow::inSystemTray() const */ void TrayTooltip::maybeTip(const TQPoint&) { - TrayWindow* parent = (TrayWindow*)tqparentWidget(); + TrayWindow* tqparent = (TrayWindow*)tqparentWidget(); TQString text; if (Daemon::monitoringAlarms()) text = kapp->aboutData()->programName(); @@ -356,6 +356,6 @@ void TrayTooltip::maybeTip(const TQPoint&) text = i18n("%1 - disabled").arg(kapp->aboutData()->programName()); kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl; if (Preferences::tooltipAlarmCount()) - parent->tooltipAlarmText(text); - tip(parent->rect(), text); + tqparent->tooltipAlarmText(text); + tip(tqparent->rect(), text); } diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h index 7ca5c6e60..371082cc4 100644 --- a/kalarm/traywindow.h +++ b/kalarm/traywindow.h @@ -32,8 +32,9 @@ class TrayTooltip; class TrayWindow : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - TrayWindow(MainWindow* parent, const char* name = 0); + TrayWindow(MainWindow* tqparent, const char* name = 0); ~TrayWindow(); void removeWindow(MainWindow*); MainWindow* assocMainWindow() const { return mAssocMainWindow; } @@ -58,7 +59,7 @@ class TrayWindow : public KSystemTray void slotNewAlarm(); void slotNewFromTemplate(const KAEvent&); void slotPreferences(); - void setEnabledStatus(bool status); + void setEnabledtqStatus(bool status); private: friend class TrayTooltip; diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp index e1998e9cf..c3b56612d 100644 --- a/kalarm/undo.cpp +++ b/kalarm/undo.cpp @@ -41,19 +41,19 @@ class UndoItem { public: enum Operation { ADD, EDIT, DELETE, REACTIVATE, DEACTIVATE, MULTI }; - UndoItem(); // needed by QValueList + UndoItem(); // needed by TQValueList virtual ~UndoItem(); virtual Operation operation() const = 0; virtual TQString actionText() const = 0; - virtual TQString description() const { return TQString::null; } - virtual TQString eventID() const { return TQString::null; } - virtual TQString oldEventID() const { return TQString::null; } - virtual TQString newEventID() const { return TQString::null; } + virtual TQString description() const { return TQString(); } + virtual TQString eventID() const { return TQString(); } + virtual TQString oldEventID() const { return TQString(); } + virtual TQString newEventID() const { return TQString(); } int id() const { return mId; } Undo::Type type() const { return mType; } void setType(Undo::Type t) { mType = t; } - KAEvent::Status calendar() const { return mCalendar; } - virtual void setCalendar(KAEvent::Status s) { mCalendar = s; } + KAEvent::tqStatus calendar() const { return mCalendar; } + virtual void setCalendar(KAEvent::tqStatus s) { mCalendar = s; } virtual UndoItem* restore() = 0; virtual bool deleteID(const TQString& /*id*/) { return false; } @@ -66,13 +66,13 @@ class UndoItem protected: UndoItem(Undo::Type); - static TQString addDeleteActionText(KAEvent::Status, bool add); + static TQString addDeleteActionText(KAEvent::tqStatus, bool add); TQString description(const KAEvent&) const; - void tqreplaceWith(UndoItem* item) { Undo::tqreplace(this, item); } + void replaceWith(UndoItem* item) { Undo::tqreplace(this, item); } int mId; // unique identifier (only for mType = UNDO, REDO) Undo::Type mType; // which list (if any) the object is in - KAEvent::Status mCalendar; + KAEvent::tqStatus mCalendar; }; class UndoMultiBase : public UndoItem @@ -101,7 +101,7 @@ class UndoAdd : public UndoItem { public: UndoAdd(Undo::Type, const KAEvent&); - UndoAdd(Undo::Type, const KAEvent&, KAEvent::Status); + UndoAdd(Undo::Type, const KAEvent&, KAEvent::tqStatus); virtual Operation operation() const { return ADD; } virtual TQString actionText() const; virtual TQString description() const { return mDescription; } @@ -298,7 +298,7 @@ void Undo::removeRedos(const TQString& eventID) { if (item->deleteID(id)) { - // The old multi-redo was tqreplaced with a new single redo + // The old multi-redo was replaced with a new single redo delete item; } ++it; @@ -320,7 +320,7 @@ void Undo::removeRedos(const TQString& eventID) * Undo or redo a specified item. * Reply = true if success, or if the item no longer exists. */ -bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQString& action) +bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* tqparent, const TQString& action) { UndoItem::mRestoreError = UndoItem::ERR_NONE; UndoItem::mRestoreWarning = UndoItem::WARN_NONE; @@ -347,7 +347,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQSt default: return true; } - KAlarm::displayKOrgUpdateError(parent, errcode, UndoItem::mRestoreWarningCount); + KAlarm::displayKOrgUpdateError(tqparent, errcode, UndoItem::mRestoreWarningCount); return true; } case UndoItem::ERR_NOT_FOUND: err = i18n("Alarm not found"); break; @@ -357,7 +357,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQSt case UndoItem::ERR_PROG: err = i18n("Program error"); break; default: err = i18n("Unknown error"); break; } - KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").arg(action).arg(err)); + KMessageBox::sorry(tqparent, i18n("Undo-action: message", "%1: %2").arg(action).arg(err)); return false; } @@ -404,7 +404,7 @@ void Undo::tqreplace(UndoItem* old, UndoItem* New) List* list = (type == UNDO) ? &mUndoList : (type == REDO) ? &mRedoList : 0; if (!list) return; - Iterator it = list->find(old); + Iterator it = list->tqfind(old); if (it != list->end()) { New->setType(type); // ensure the item points to the correct list @@ -419,7 +419,7 @@ void Undo::tqreplace(UndoItem* old, UndoItem* New) TQString Undo::actionText(Undo::Type type) { List* list = (type == UNDO) ? &mUndoList : (type == REDO) ? &mRedoList : 0; - return (list && !list->isEmpty()) ? list->first()->actionText() : TQString::null; + return (list && !list->isEmpty()) ? list->first()->actionText() : TQString(); } /****************************************************************************** @@ -428,7 +428,7 @@ TQString Undo::actionText(Undo::Type type) TQString Undo::actionText(Undo::Type type, int id) { UndoItem* undo = getItem(id, type); - return undo ? undo->actionText() : TQString::null; + return undo ? undo->actionText() : TQString(); } /****************************************************************************** @@ -437,7 +437,7 @@ TQString Undo::actionText(Undo::Type type, int id) TQString Undo::description(Undo::Type type, int id) { UndoItem* undo = getItem(id, type); - return undo ? undo->description() : TQString::null; + return undo ? undo->description() : TQString(); } /****************************************************************************** @@ -468,7 +468,7 @@ TQValueList<int> Undo::ids(Undo::Type type) for (Undo::List::ConstIterator u = undos.begin(); u != undos.end(); ++u) { TQString evid = (*u)->eventID(); - if (ignoreIDs.find(evid) != ignoreIDs.end()) + if (ignoreIDs.tqfind(evid) != ignoreIDs.end()) omit = true; else if (omit) ignoreIDs.append(evid); @@ -483,7 +483,7 @@ TQValueList<int> Undo::ids(Undo::Type type) } else { - omit = (ignoreIDs.find(item->eventID()) != ignoreIDs.end()); + omit = (ignoreIDs.tqfind(item->eventID()) != ignoreIDs.end()); if (!omit) ignoreIDs.append(item->eventID()); if (item->operation() == UndoItem::EDIT) @@ -586,7 +586,7 @@ TQString UndoItem::description(const KAEvent& event) const /****************************************************************************** * Return the action description of an add or delete Undo/Redo item for displaying. */ -TQString UndoItem::addDeleteActionText(KAEvent::Status calendar, bool add) +TQString UndoItem::addDeleteActionText(KAEvent::tqStatus calendar, bool add) { switch (calendar) { @@ -605,7 +605,7 @@ TQString UndoItem::addDeleteActionText(KAEvent::Status calendar, bool add) default: break; } - return TQString::null; + return TQString(); } @@ -654,8 +654,8 @@ UndoItem* UndoMulti<T>::restore() /****************************************************************************** * If one of the multiple items has the specified ID, delete it. * If an item is deleted and there is only one item left, the UndoMulti -* instance is removed from its list and tqreplaced by the remaining UndoItem instead. -* Reply = true if this instance was tqreplaced. The caller must delete it. +* instance is removed from its list and replaced by the remaining UndoItem instead. +* Reply = true if this instance was replaced. The caller must delete it. * = false otherwise. */ template <class T> @@ -672,7 +672,7 @@ bool UndoMulti<T>::deleteID(const TQString& id) { // There is only one entry left after removal. // Replace 'this' multi instance with the remaining single entry. - tqreplaceWith(item); + replaceWith(item); return true; } else @@ -695,11 +695,11 @@ UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event) : UndoItem(type), mEventID(event.id()) { - setCalendar(KAEvent::uidStatus(mEventID)); + setCalendar(KAEvent::uidtqStatus(mEventID)); mDescription = UndoItem::description(event); // calendar must be set before calling this } -UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event, KAEvent::Status cal) +UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event, KAEvent::tqStatus cal) : UndoItem(type), mEventID(KAEvent::uid(event.id(), cal)) { @@ -793,7 +793,7 @@ UndoEdit::UndoEdit(Undo::Type type, const KAEvent& oldEvent, const TQString& new mNewEventID(newEventID), mDescription(description) { - setCalendar(KAEvent::uidStatus(mNewEventID)); + setCalendar(KAEvent::uidtqStatus(mNewEventID)); } UndoEdit::~UndoEdit() @@ -867,7 +867,7 @@ TQString UndoEdit::actionText() const default: break; } - return TQString::null; + return TQString(); } @@ -880,7 +880,7 @@ UndoDelete::UndoDelete(Undo::Type type, const KAEvent& event) : UndoItem(type), mEvent(new KAEvent(event)) { - setCalendar(KAEvent::uidStatus(mEvent->id())); + setCalendar(KAEvent::uidtqStatus(mEvent->id())); } UndoDelete::~UndoDelete() @@ -998,7 +998,7 @@ UndoItem* UndoDeletes::createRedo(Undo::List& undos) TQString UndoDeletes::actionText() const { if (mUndos.isEmpty()) - return TQString::null; + return TQString(); for (Undo::List::ConstIterator it = mUndos.begin(); it != mUndos.end(); ++it) { switch ((*it)->calendar()) @@ -1010,7 +1010,7 @@ TQString UndoDeletes::actionText() const case KAEvent::EXPIRED: break; // check if they are ALL expired default: - return TQString::null; + return TQString(); } } return i18n("Delete multiple expired alarms"); diff --git a/kalarm/undo.h b/kalarm/undo.h index cca197f89..0f65cb9fa 100644 --- a/kalarm/undo.h +++ b/kalarm/undo.h @@ -30,9 +30,10 @@ class KAEvent; class UndoItem; -class Undo : public QObject +class Undo : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Type { NONE, UNDO, REDO }; @@ -43,14 +44,14 @@ class Undo : public QObject static void saveDeletes(const TQValueList<KAEvent>&); static void saveReactivate(const KAEvent&); static void saveReactivates(const TQValueList<KAEvent>&); - static bool undo(TQWidget* parent, const TQString& action) - { return undo(mUndoList.begin(), UNDO, parent, action); } - static bool undo(int id, TQWidget* parent, const TQString& action) - { return undo(findItem(id, UNDO), UNDO, parent, action); } - static bool redo(TQWidget* parent, const TQString& action) - { return undo(mRedoList.begin(), REDO, parent, action); } - static bool redo(int id, TQWidget* parent, const TQString& action) - { return undo(findItem(id, REDO), REDO, parent, action); } + static bool undo(TQWidget* tqparent, const TQString& action) + { return undo(mUndoList.begin(), UNDO, tqparent, action); } + static bool undo(int id, TQWidget* tqparent, const TQString& action) + { return undo(findItem(id, UNDO), UNDO, tqparent, action); } + static bool redo(TQWidget* tqparent, const TQString& action) + { return undo(mRedoList.begin(), REDO, tqparent, action); } + static bool redo(int id, TQWidget* tqparent, const TQString& action) + { return undo(findItem(id, REDO), REDO, tqparent, action); } static void clear(); static bool haveUndo() { return !mUndoList.isEmpty(); } static bool haveRedo() { return !mRedoList.isEmpty(); } @@ -75,9 +76,9 @@ class Undo : public QObject private: typedef TQValueList<UndoItem*>::Iterator Iterator; - Undo(TQObject* parent) : TQObject(parent) { } + Undo(TQObject* tqparent) : TQObject(tqparent) { } static void removeRedos(const TQString& eventID); - static bool undo(Iterator, Type, TQWidget* parent, const TQString& action); + static bool undo(Iterator, Type, TQWidget* tqparent, const TQString& action); static UndoItem* getItem(int id, Type); static Iterator findItem(int id, Type); void emitChanged(const TQString& undo, const TQString& redo) |