diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 36a36a5c1015aa0d03f4515c401e907ddb9d6291 (patch) | |
| tree | 0212ba6d2c749043134005a41f2bd0379619d40f /kalarm/kalarmd | |
| parent | 4c6f8d69e2d1501837affb472c4eb8fec4462240 (diff) | |
| download | tdepim-36a36a5c1015aa0d03f4515c401e907ddb9d6291.tar.gz tdepim-36a36a5c1015aa0d03f4515c401e907ddb9d6291.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kalarm/kalarmd')
| -rw-r--r-- | kalarm/kalarmd/alarmdaemon.cpp | 6 | ||||
| -rw-r--r-- | kalarm/kalarmd/alarmdaemon.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index a8460167f..3bc75205f 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 *tqparent, const char *name) +AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) : DCOPObject(name), - TQObject(tqparent, name), + TQObject(parent, name), mAlarmTimer(0) { kdDebug(5900) << "AlarmDaemon::AlarmDaemon()" << endl; @@ -373,7 +373,7 @@ 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)->tqparent()); + KCal::Event* event = dynamic_cast<KCal::Event*>((*it)->parent()); if (!event || eventsDone.find(event) != eventsDone.end()) continue; // either not an event, or the event has already been processed eventsDone += event; diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h index c05a4725c..c2c34e10f 100644 --- a/kalarm/kalarmd/alarmdaemon.h +++ b/kalarm/kalarmd/alarmdaemon.h @@ -34,7 +34,7 @@ class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface Q_OBJECT TQ_OBJECT public: - AlarmDaemon(bool autostart, TQObject* tqparent = 0, const char* name = 0); + AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0); private slots: //#ifdef AUTOSTART_KALARM |