summaryrefslogtreecommitdiffstats
path: root/kalarm
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit36a36a5c1015aa0d03f4515c401e907ddb9d6291 (patch)
tree0212ba6d2c749043134005a41f2bd0379619d40f /kalarm
parent4c6f8d69e2d1501837affb472c4eb8fec4462240 (diff)
downloadtdepim-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')
-rw-r--r--kalarm/Changelog2
-rw-r--r--kalarm/alarmcalendar.cpp12
-rw-r--r--kalarm/alarmevent.h8
-rw-r--r--kalarm/alarmlistview.cpp20
-rw-r--r--kalarm/alarmlistview.h4
-rw-r--r--kalarm/alarmtimewidget.cpp8
-rw-r--r--kalarm/alarmtimewidget.h4
-rw-r--r--kalarm/birthdaydlg.cpp14
-rw-r--r--kalarm/birthdaydlg.h12
-rw-r--r--kalarm/daemon.cpp4
-rw-r--r--kalarm/daemon.h2
-rw-r--r--kalarm/deferdlg.cpp4
-rw-r--r--kalarm/deferdlg.h2
-rw-r--r--kalarm/editdlg.cpp32
-rw-r--r--kalarm/editdlg.h10
-rw-r--r--kalarm/editdlgprivate.h4
-rw-r--r--kalarm/emailidcombo.cpp4
-rw-r--r--kalarm/emailidcombo.h2
-rw-r--r--kalarm/eventlistviewbase.cpp14
-rw-r--r--kalarm/eventlistviewbase.h4
-rw-r--r--kalarm/find.cpp6
-rw-r--r--kalarm/find.h4
-rw-r--r--kalarm/fontcolour.cpp4
-rw-r--r--kalarm/fontcolour.h2
-rw-r--r--kalarm/fontcolourbutton.cpp8
-rw-r--r--kalarm/fontcolourbutton.h4
-rw-r--r--kalarm/functions.cpp18
-rw-r--r--kalarm/functions.h8
-rw-r--r--kalarm/kalarmapp.cpp16
-rw-r--r--kalarm/kalarmapp.h8
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp6
-rw-r--r--kalarm/kalarmd/alarmdaemon.h2
-rw-r--r--kalarm/latecancel.cpp4
-rw-r--r--kalarm/latecancel.h2
-rw-r--r--kalarm/lib/buttongroup.cpp16
-rw-r--r--kalarm/lib/buttongroup.h16
-rw-r--r--kalarm/lib/checkbox.cpp8
-rw-r--r--kalarm/lib/checkbox.h8
-rw-r--r--kalarm/lib/colourcombo.cpp4
-rw-r--r--kalarm/lib/colourcombo.h4
-rw-r--r--kalarm/lib/combobox.cpp8
-rw-r--r--kalarm/lib/combobox.h8
-rw-r--r--kalarm/lib/dateedit.cpp4
-rw-r--r--kalarm/lib/dateedit.h4
-rw-r--r--kalarm/lib/label.cpp20
-rw-r--r--kalarm/lib/label.h14
-rw-r--r--kalarm/lib/lineedit.cpp8
-rw-r--r--kalarm/lib/lineedit.h8
-rw-r--r--kalarm/lib/messagebox.cpp10
-rw-r--r--kalarm/lib/messagebox.h8
-rw-r--r--kalarm/lib/pushbutton.cpp12
-rw-r--r--kalarm/lib/pushbutton.h12
-rw-r--r--kalarm/lib/radiobutton.cpp8
-rw-r--r--kalarm/lib/radiobutton.h8
-rw-r--r--kalarm/lib/slider.cpp12
-rw-r--r--kalarm/lib/slider.h12
-rw-r--r--kalarm/lib/spinbox.cpp8
-rw-r--r--kalarm/lib/spinbox.h8
-rw-r--r--kalarm/lib/spinbox2.cpp14
-rw-r--r--kalarm/lib/spinbox2.h16
-rw-r--r--kalarm/lib/spinbox2private.h10
-rw-r--r--kalarm/lib/timeedit.cpp4
-rw-r--r--kalarm/lib/timeedit.h4
-rw-r--r--kalarm/lib/timeperiod.cpp4
-rw-r--r--kalarm/lib/timeperiod.h4
-rw-r--r--kalarm/lib/timespinbox.cpp12
-rw-r--r--kalarm/lib/timespinbox.h8
-rw-r--r--kalarm/mainwindow.cpp6
-rw-r--r--kalarm/mainwindowbase.h4
-rw-r--r--kalarm/messagewin.cpp4
-rw-r--r--kalarm/pickfileradio.cpp16
-rw-r--r--kalarm/pickfileradio.h10
-rw-r--r--kalarm/recurrenceedit.cpp36
-rw-r--r--kalarm/recurrenceedit.h2
-rw-r--r--kalarm/recurrenceeditprivate.h18
-rw-r--r--kalarm/reminder.cpp4
-rw-r--r--kalarm/reminder.h2
-rw-r--r--kalarm/repetition.cpp8
-rw-r--r--kalarm/repetition.h4
-rw-r--r--kalarm/sounddlg.cpp4
-rw-r--r--kalarm/sounddlg.h2
-rw-r--r--kalarm/soundpicker.cpp4
-rw-r--r--kalarm/soundpicker.h4
-rw-r--r--kalarm/specialactions.cpp12
-rw-r--r--kalarm/specialactions.h6
-rw-r--r--kalarm/templatedlg.cpp12
-rw-r--r--kalarm/templatedlg.h6
-rw-r--r--kalarm/templatelistview.cpp8
-rw-r--r--kalarm/templatelistview.h4
-rw-r--r--kalarm/templatemenuaction.h2
-rw-r--r--kalarm/templatepickdlg.cpp4
-rw-r--r--kalarm/templatepickdlg.h2
-rw-r--r--kalarm/timeselector.cpp4
-rw-r--r--kalarm/timeselector.h2
-rw-r--r--kalarm/traywindow.cpp26
-rw-r--r--kalarm/traywindow.h2
-rw-r--r--kalarm/undo.cpp6
-rw-r--r--kalarm/undo.h20
98 files changed, 403 insertions, 403 deletions
diff --git a/kalarm/Changelog b/kalarm/Changelog
index 90b5b05bb..2671941a5 100644
--- a/kalarm/Changelog
+++ b/kalarm/Changelog
@@ -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 tqparent window.
+- Make dialogs modal only for their parent window.
=== Version 0.2 --- 20 October 2001 ===
- Implement repeating alarms.
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 7bdd767a6..85bc17392 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -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: tqparent = tqparent widget for error message boxes
+* Parameters: parent = parent 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* tqparent)
+bool AlarmCalendar::importAlarms(TQWidget* parent)
{
KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"),
- TQString::tqfromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), tqparent);
+ TQString::tqfromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), parent);
if (url.isEmpty())
{
kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl;
@@ -468,7 +468,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
if (!KStandardDirs::exists(filename))
{
kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl;
- KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
+ KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
return false;
}
}
@@ -477,7 +477,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl;
- KMessageBox::error(tqparent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL()));
+ KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL()));
return false;
}
kdDebug(5950) << "--- Downloaded to " << filename << endl;
@@ -490,7 +490,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
if (!success)
{
kdDebug(5950) << "AlarmCalendar::importAlarms(): error loading calendar '" << filename << "'" << endl;
- KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
+ KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
}
else
{
diff --git a/kalarm/alarmevent.h b/kalarm/alarmevent.h
index 75ff7cbef..b5bc41e2e 100644
--- a/kalarm/alarmevent.h
+++ b/kalarm/alarmevent.h
@@ -153,7 +153,7 @@ class KAAlarm : public KAAlarmEventBase
{
INVALID_ALARM = 0, // not an alarm
MAIN_ALARM = 1, // THE real alarm. Must be the first in the enumeration.
- // The following values may be used in combination as a bitqmask 0x0E
+ // The following values may be used in combination as a bimask 0x0E
REMINDER_ALARM = 0x02, // reminder in advance of main alarm
DEFERRED_ALARM = 0x04, // deferred alarm
DEFERRED_REMINDER_ALARM = REMINDER_ALARM | DEFERRED_ALARM, // deferred early warning
@@ -170,7 +170,7 @@ class KAAlarm : public KAAlarmEventBase
{
INVALID__ALARM = INVALID_ALARM,
MAIN__ALARM = MAIN_ALARM,
- // The following values may be used in combination as a bitqmask 0x0E
+ // The following values may be used in combination as a bimask 0x0E
REMINDER__ALARM = REMINDER_ALARM,
TIMED_DEFERRAL_FLAG = 0x08, // deferral has a time; if clear, it is date-only
DEFERRED_DATE__ALARM = DEFERRED_ALARM, // deferred alarm - date-only
@@ -263,7 +263,7 @@ class KAEvent : public KAAlarmEventBase
DATE_DEFERRAL = DEFERRAL,
TIME_DEFERRAL = DEFERRAL | TIMED_FLAG,
DISPLAYING_ = 0x80000,
- READ_ONLY_FLAGS = 0xF0000 // tqmask for all read-only internal values
+ READ_ONLY_FLAGS = 0xF0000 // mask for all read-only internal values
};
/** The category of an event, indicated by the middle part of its UID. */
enum tqStatus
@@ -288,7 +288,7 @@ class KAEvent : public KAAlarmEventBase
RECURRENCE_DATE = 0x02, // a recurrence with only a date, not a time
RECURRENCE_DATE_TIME = 0x03, // a recurrence with a date and time
LAST_RECURRENCE = 0x04, // the last recurrence
- OCCURRENCE_REPEAT = 0x10, // (bitqmask for a repetition of an occurrence)
+ OCCURRENCE_REPEAT = 0x10, // (bimask for a repetition of an occurrence)
FIRST_OR_ONLY_OCCURRENCE_REPEAT = OCCURRENCE_REPEAT | FIRST_OR_ONLY_OCCURRENCE, // a repetition of the first occurrence
RECURRENCE_DATE_REPEAT = OCCURRENCE_REPEAT | RECURRENCE_DATE, // a repetition of a date-only recurrence
RECURRENCE_DATE_TIME_REPEAT = OCCURRENCE_REPEAT | RECURRENCE_DATE_TIME, // a repetition of a date/time recurrence
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index 546752ea2..355cc4e3e 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -44,7 +44,7 @@
class AlarmListTooltip : public TQToolTip
{
public:
- AlarmListTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { }
+ AlarmListTooltip(TQWidget* parent) : TQToolTip(parent) { }
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* tqparent, const char* name)
- : EventListViewBase(tqparent, name),
+AlarmListView::AlarmListView(const TQValueList<int>& order, TQWidget* parent, const char* name)
+ : EventListViewBase(parent, name),
mMousePressed(false),
mDrawMessageInColour(false),
mShowExpired(false)
@@ -414,20 +414,20 @@ void AlarmListView::contentsMouseReleaseEvent(TQMouseEvent *e)
int AlarmListViewItem::mTimeHourPos = -2;
int AlarmListViewItem::mDigitWidth = -1;
-AlarmListViewItem::AlarmListViewItem(AlarmListView* tqparent, const KAEvent& event, const TQDateTime& now)
- : EventListViewItemBase(tqparent, event),
+AlarmListViewItem::AlarmListViewItem(AlarmListView* parent, const KAEvent& event, const TQDateTime& now)
+ : EventListViewItemBase(parent, event),
mMessageTruncated(false),
mTimeToAlarmShown(false)
{
setLastColumnText(); // set the message column text
DateTime dateTime = event.expired() ? event.startDateTime() : event.displayDateTime();
- if (tqparent->column(AlarmListView::TIME_COLUMN) >= 0)
- setText(tqparent->column(AlarmListView::TIME_COLUMN), alarmTimeText(dateTime));
- if (tqparent->column(AlarmListView::TIME_TO_COLUMN) >= 0)
+ if (parent->column(AlarmListView::TIME_COLUMN) >= 0)
+ setText(parent->column(AlarmListView::TIME_COLUMN), alarmTimeText(dateTime));
+ if (parent->column(AlarmListView::TIME_TO_COLUMN) >= 0)
{
TQString tta = timeToAlarmText(now);
- setText(tqparent->column(AlarmListView::TIME_TO_COLUMN), tta);
+ setText(parent->column(AlarmListView::TIME_TO_COLUMN), tta);
mTimeToAlarmShown = !tta.isNull();
}
TQTime t = dateTime.time();
@@ -468,7 +468,7 @@ AlarmListViewItem::AlarmListViewItem(AlarmListView* tqparent, const KAEvent& eve
break;
}
}
- setText(tqparent->column(AlarmListView::REPEAT_COLUMN), repeatText);
+ setText(parent->column(AlarmListView::REPEAT_COLUMN), repeatText);
mRepeatOrder.sprintf("%c%08d", '0' + repeatOrder, repeatInterval);
bool showColour = (event.action() == KAEvent::MESSAGE || event.action() == KAEvent::FILE);
diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h
index 56b5c5895..f88ea4a85 100644
--- a/kalarm/alarmlistview.h
+++ b/kalarm/alarmlistview.h
@@ -31,7 +31,7 @@ class AlarmListTooltip;
class AlarmListViewItem : public EventListViewItemBase
{
public:
- AlarmListViewItem(AlarmListView* tqparent, const KAEvent&, const TQDateTime& now);
+ AlarmListViewItem(AlarmListView* parent, 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);
@@ -71,7 +71,7 @@ class AlarmListView : public EventListViewBase
COLUMN_COUNT
};
- AlarmListView(const TQValueList<int>& order, TQWidget* tqparent = 0, const char* name = 0);
+ AlarmListView(const TQValueList<int>& order, TQWidget* parent = 0, const char* name = 0);
~AlarmListView();
void showExpired(bool show) { mShowExpired = show; }
bool showingExpired() const { return mShowExpired; }
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 4443ae2fc..2b907d9a1 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* tqparent, const char* name)
- : ButtonGroup(groupBoxTitle, tqparent, name),
+AlarmTimeWidget::AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent, const char* name)
+ : ButtonGroup(groupBoxTitle, parent, 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* tqparent, const char* name)
- : ButtonGroup(tqparent, name),
+AlarmTimeWidget::AlarmTimeWidget(int mode, TQWidget* parent, const char* name)
+ : ButtonGroup(parent, name),
mMinDateTimeIsNow(false),
mPastMax(false),
mMinMaxTimeSet(false)
diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h
index 0b8d6d4f1..a4f438578 100644
--- a/kalarm/alarmtimewidget.h
+++ b/kalarm/alarmtimewidget.h
@@ -41,8 +41,8 @@ class AlarmTimeWidget : public ButtonGroup
DEFER_TIME = 0x01, // "Defer to ..."
NARROW = 0x02 // make a narrow widget
};
- AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* tqparent = 0, const char* name = 0);
- AlarmTimeWidget(int mode, TQWidget* tqparent = 0, const char* name = 0);
+ AlarmTimeWidget(const TQString& groupBoxTitle, int mode, TQWidget* parent = 0, const char* name = 0);
+ AlarmTimeWidget(int mode, TQWidget* parent = 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 71ab86922..97e7bc6f7 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -58,7 +58,7 @@ class AddresseeItem : public TQListViewItem
{
public:
enum columns { NAME = 0, BIRTHDAY = 1 };
- AddresseeItem(TQListView* tqparent, const TQString& name, const TQDate& birthday);
+ AddresseeItem(TQListView* parent, 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 TQListViewItem
const KABC::AddressBook* BirthdayDlg::mAddressBook = 0;
-BirthdayDlg::BirthdayDlg(TQWidget* tqparent)
- : KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, tqparent, "BirthdayDlg"),
+BirthdayDlg::BirthdayDlg(TQWidget* parent)
+ : KDialogBase(KDialogBase::Plain, i18n("Import Birthdays From KAddressBook"), Ok|Cancel, Ok, parent, "BirthdayDlg"),
mSpecialActionsButton(0)
{
TQWidget* topWidget = plainPage();
@@ -396,8 +396,8 @@ void BirthdayDlg::slotTextLostFocus()
= Class: AddresseeItem
=============================================================================*/
-AddresseeItem::AddresseeItem(TQListView* tqparent, const TQString& name, const TQDate& birthday)
- : TQListViewItem(tqparent),
+AddresseeItem::AddresseeItem(TQListView* parent, const TQString& name, const TQDate& birthday)
+ : TQListViewItem(parent),
mBirthday(birthday)
{
setText(NAME, name);
@@ -417,8 +417,8 @@ TQString AddresseeItem::key(int column, bool) const
= Class: BListView
=============================================================================*/
-BListView::BListView(TQWidget* tqparent, const char* name)
- : KListView(tqparent, name)
+BListView::BListView(TQWidget* parent, const char* name)
+ : KListView(parent, name)
{
KAccel* accel = new KAccel(this);
accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()));
diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h
index 776b5f1bd..1abd4c8a3 100644
--- a/kalarm/birthdaydlg.h
+++ b/kalarm/birthdaydlg.h
@@ -45,7 +45,7 @@ class BirthdayDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- BirthdayDlg(TQWidget* tqparent = 0);
+ BirthdayDlg(TQWidget* parent = 0);
TQValueList<KAEvent> events() const;
static void close();
@@ -82,10 +82,10 @@ class BLineEdit : public TQLineEdit
Q_OBJECT
TQ_OBJECT
public:
- 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) {}
+ 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) {}
signals:
void focusLost();
protected:
@@ -97,7 +97,7 @@ class BListView : public KListView
Q_OBJECT
TQ_OBJECT
public:
- BListView(TQWidget* tqparent = 0, const char* name = 0);
+ BListView(TQWidget* parent = 0, const char* name = 0);
public slots:
virtual void slotSelectAll() { selectAll(true); }
virtual void slotDeselect() { selectAll(false); }
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index f7e340f85..70acfa0e5 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -723,8 +723,8 @@ void NotificationHandler::registered(bool reregister, int result, int version)
= Class: AlarmEnableAction
=============================================================================*/
-AlarmEnableAction::AlarmEnableAction(int accel, TQObject* tqparent, const char* name)
- : KToggleAction(i18n("Enable &Alarms"), accel, tqparent, name),
+AlarmEnableAction::AlarmEnableAction(int accel, TQObject* parent, const char* name)
+ : KToggleAction(i18n("Enable &Alarms"), accel, parent, name),
mInitialised(false)
{
setCheckedState(i18n("Disable &Alarms"));
diff --git a/kalarm/daemon.h b/kalarm/daemon.h
index fff7c7554..df3fdd4d2 100644
--- a/kalarm/daemon.h
+++ b/kalarm/daemon.h
@@ -122,7 +122,7 @@ class AlarmEnableAction : public KToggleAction
Q_OBJECT
TQ_OBJECT
public:
- AlarmEnableAction(int accel, TQObject* tqparent, const char* name = 0);
+ AlarmEnableAction(int accel, TQObject* parent, 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/deferdlg.cpp b/kalarm/deferdlg.cpp
index 4709f6a8f..8c7edd3ce 100644
--- a/kalarm/deferdlg.cpp
+++ b/kalarm/deferdlg.cpp
@@ -40,8 +40,8 @@
DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
- bool cancelButton, TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, caption, Ok|Cancel|User1, Ok, false, i18n("Cancel &Deferral"))
+ bool cancelButton, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, caption, Ok|Cancel|User1, Ok, false, i18n("Cancel &Deferral"))
{
if (!cancelButton)
showButton(User1, false);
diff --git a/kalarm/deferdlg.h b/kalarm/deferdlg.h
index 4ab2c9cb5..f7a09f47f 100644
--- a/kalarm/deferdlg.h
+++ b/kalarm/deferdlg.h
@@ -33,7 +33,7 @@ class DeferAlarmDlg : public KDialogBase
TQ_OBJECT
public:
DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
- bool cancelButton, TQWidget* tqparent = 0, const char* name = 0);
+ bool cancelButton, TQWidget* parent = 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 93b6bc5af..2d722dd99 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -97,8 +97,8 @@ static const int maxDelayTime = 99*60 + 59; // < 100 hours
class PickAlarmFileRadio : public PickFileRadio
{
public:
- PickAlarmFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name = 0)
- : PickFileRadio(text, tqparent, name) { }
+ PickAlarmFileRadio(const TQString& text, TQButtonGroup* parent, const char* name = 0)
+ : PickFileRadio(text, parent, 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(),
@@ -114,8 +114,8 @@ class PickAlarmFileRadio : public PickFileRadio
class PickLogFileRadio : public PickFileRadio
{
public:
- PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* tqparent, const char* name = 0)
- : PickFileRadio(b, e, text, tqparent, name) { }
+ PickLogFileRadio(TQPushButton* b, LineEdit* e, const TQString& text, TQButtonGroup* parent, const char* name = 0)
+ : PickFileRadio(b, e, text, parent, 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(),
@@ -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* tqparent, const char* name,
+EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent, const char* name,
const KAEvent* event, bool readOnly)
- : KDialogBase(tqparent, (name ? name : Template ? "TemplEditDlg" : "EditDlg"), true, caption,
+ : KDialogBase(parent, (name ? name : Template ? "TemplEditDlg" : "EditDlg"), true, caption,
(readOnly ? Cancel|Try : Template ? Ok|Cancel|Try : Ok|Cancel|Try|Default),
(readOnly ? Cancel : Ok)),
mMainPageShown(false),
@@ -414,9 +414,9 @@ EditAlarmDlg::~EditAlarmDlg()
/******************************************************************************
* Set up the dialog controls common to display alarms.
*/
-void EditAlarmDlg::initDisplayAlarms(TQWidget* tqparent)
+void EditAlarmDlg::initDisplayAlarms(TQWidget* parent)
{
- mDisplayAlarmsFrame = new TQFrame(tqparent);
+ mDisplayAlarmsFrame = new TQFrame(parent);
mDisplayAlarmsFrame->setFrameStyle(TQFrame::NoFrame);
TQBoxLayout* frameLayout = new TQVBoxLayout(mDisplayAlarmsFrame, 0, spacingHint());
@@ -481,9 +481,9 @@ void EditAlarmDlg::initDisplayAlarms(TQWidget* tqparent)
/******************************************************************************
* Set up the command alarm dialog controls.
*/
-void EditAlarmDlg::initCommand(TQWidget* tqparent)
+void EditAlarmDlg::initCommand(TQWidget* parent)
{
- mCommandFrame = new TQFrame(tqparent);
+ mCommandFrame = new TQFrame(parent);
mCommandFrame->setFrameStyle(TQFrame::NoFrame);
TQBoxLayout* frameLayout = new TQVBoxLayout(mCommandFrame, 0, spacingHint());
@@ -556,9 +556,9 @@ void EditAlarmDlg::initCommand(TQWidget* tqparent)
/******************************************************************************
* Set up the email alarm dialog controls.
*/
-void EditAlarmDlg::initEmail(TQWidget* tqparent)
+void EditAlarmDlg::initEmail(TQWidget* parent)
{
- mEmailFrame = new TQFrame(tqparent);
+ mEmailFrame = new TQFrame(parent);
mEmailFrame->setFrameStyle(TQFrame::NoFrame);
TQBoxLayout* tqlayout = new TQVBoxLayout(mEmailFrame, 0, spacingHint());
TQGridLayout* grid = new TQGridLayout(tqlayout, 3, 3, spacingHint());
@@ -972,9 +972,9 @@ void EditAlarmDlg::setAction(KAEvent::Action action, const AlarmText& alarmText)
/******************************************************************************
* Create an "acknowledgement confirmation required" checkbox.
*/
-CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* tqparent, const char* name)
+CheckBox* EditAlarmDlg::createConfirmAckCheckbox(TQWidget* parent, const char* name)
{
- CheckBox* widget = new CheckBox(i18n_k_ConfirmAck(), tqparent, name);
+ CheckBox* widget = new CheckBox(i18n_k_ConfirmAck(), parent, name);
TQWhatsThis::add(widget,
i18n("Check to be prompted for confirmation when you acknowledge the alarm."));
return widget;
@@ -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* tqparent, const char* name)
- : KTextEdit(tqparent, name)
+TextEdit::TextEdit(TQWidget* parent, const char* name)
+ : KTextEdit(parent, name)
{
TQSize tsize = tqsizeHint();
tsize.setHeight(fontMetrics().lineSpacing()*13/4 + 2*frameWidth());
diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h
index 272deaa3a..626ea5d67 100644
--- a/kalarm/editdlg.h
+++ b/kalarm/editdlg.h
@@ -63,13 +63,13 @@ class EditAlarmDlg : public KDialogBase
enum MessageType { MESSAGE, FILE };
enum CmdLogType { DISCARD_OUTPUT, LOG_TO_FILE, EXEC_IN_TERMINAL };
- EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqparent = 0, const char* name = 0,
+ EditAlarmDlg(bool Template, const TQString& caption, TQWidget* parent = 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* tqparent, const char* name = 0);
+ static CheckBox* createConfirmAckCheckbox(TQWidget* parent, 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
@@ -126,9 +126,9 @@ class EditAlarmDlg : public KDialogBase
bool checkCommandData();
bool checkEmailData();
- void initDisplayAlarms(TQWidget* tqparent);
- void initCommand(TQWidget* tqparent);
- void initEmail(TQWidget* tqparent);
+ void initDisplayAlarms(TQWidget* parent);
+ void initCommand(TQWidget* parent);
+ void initEmail(TQWidget* parent);
void saveState(const KAEvent*);
bool stateChanged() const;
diff --git a/kalarm/editdlgprivate.h b/kalarm/editdlgprivate.h
index 6dffba7eb..ec2bc73d1 100644
--- a/kalarm/editdlgprivate.h
+++ b/kalarm/editdlgprivate.h
@@ -29,7 +29,7 @@ class PageFrame : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- PageFrame(TQWidget* tqparent = 0, const char* name = 0) : TQFrame(tqparent, name) { }
+ PageFrame(TQWidget* parent = 0, const char* name = 0) : TQFrame(parent, name) { }
protected:
virtual void showEvent(TQShowEvent*) { emit shown(); }
signals:
@@ -41,7 +41,7 @@ class TextEdit : public KTextEdit
Q_OBJECT
TQ_OBJECT
public:
- TextEdit(TQWidget* tqparent, const char* name = 0);
+ TextEdit(TQWidget* parent, const char* name = 0);
protected:
virtual void dragEnterEvent(TQDragEnterEvent*);
};
diff --git a/kalarm/emailidcombo.cpp b/kalarm/emailidcombo.cpp
index 388fa4573..99f754c89 100644
--- a/kalarm/emailidcombo.cpp
+++ b/kalarm/emailidcombo.cpp
@@ -21,8 +21,8 @@
#include "emailidcombo.moc"
-EmailIdCombo::EmailIdCombo(KPIM::IdentityManager* manager, TQWidget* tqparent, const char* name)
- : KPIM::IdentityCombo(manager, tqparent, name),
+EmailIdCombo::EmailIdCombo(KPIM::IdentityManager* manager, TQWidget* parent, const char* name)
+ : KPIM::IdentityCombo(manager, parent, name),
mReadOnly(false)
{ }
diff --git a/kalarm/emailidcombo.h b/kalarm/emailidcombo.h
index 6e5294d8d..1d2c2785f 100644
--- a/kalarm/emailidcombo.h
+++ b/kalarm/emailidcombo.h
@@ -30,7 +30,7 @@ class EmailIdCombo : public KPIM::IdentityCombo
Q_OBJECT
TQ_OBJECT
public:
- explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* tqparent = 0, const char* name = 0);
+ explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* parent = 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 c463c8ad0..a8f5b4d18 100644
--- a/kalarm/eventlistviewbase.cpp
+++ b/kalarm/eventlistviewbase.cpp
@@ -45,8 +45,8 @@ class EventListWhatsThisBase : public TQWhatsThis
= Base class for displaying a list of events.
=============================================================================*/
-EventListViewBase::EventListViewBase(TQWidget* tqparent, const char* name)
- : KListView(tqparent, name),
+EventListViewBase::EventListViewBase(TQWidget* parent, const char* name)
+ : KListView(parent, name),
mFind(0),
mLastColumn(-1),
mLastColumnHeaderWidth(0)
@@ -392,8 +392,8 @@ TQPixmap* EventListViewItemBase::mEmailIcon;
int EventListViewItemBase::mIconWidth = 0;
-EventListViewItemBase::EventListViewItemBase(EventListViewBase* tqparent, const KAEvent& event)
- : TQListViewItem(tqparent),
+EventListViewItemBase::EventListViewItemBase(EventListViewBase* parent, const KAEvent& event)
+ : TQListViewItem(parent),
mEvent(event)
{
iconWidth(); // load the icons
@@ -404,9 +404,9 @@ EventListViewItemBase::EventListViewItemBase(EventListViewBase* tqparent, const
*/
void EventListViewItemBase::setLastColumnText()
{
- EventListViewBase* tqparent = (EventListViewBase*)listView();
- setText(tqparent->lastColumn(), lastColumnText());
- mLastColumnWidth = width(tqparent->fontMetrics(), tqparent, tqparent->lastColumn());
+ EventListViewBase* parent = (EventListViewBase*)listView();
+ setText(parent->lastColumn(), lastColumnText());
+ mLastColumnWidth = width(parent->fontMetrics(), parent, parent->lastColumn());
}
/******************************************************************************
diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h
index 6fe74f4f7..86263a7a9 100644
--- a/kalarm/eventlistviewbase.h
+++ b/kalarm/eventlistviewbase.h
@@ -42,7 +42,7 @@ class EventListViewBase : public KListView
typedef TQValueListIterator<EventListViewBase*> InstanceListIterator;
typedef TQValueListConstIterator<EventListViewBase*> InstanceListConstIterator;
- EventListViewBase(TQWidget* tqparent = 0, const char* name = 0);
+ EventListViewBase(TQWidget* parent = 0, const char* name = 0);
virtual ~EventListViewBase() { }
EventListViewItemBase* getEntry(const TQString& eventID) const;
void addEvent(const KAEvent& e) { addEvent(e, instances(), this); }
@@ -107,7 +107,7 @@ class EventListViewBase : public KListView
class EventListViewItemBase : public TQListViewItem
{
public:
- EventListViewItemBase(EventListViewBase* tqparent, const KAEvent&);
+ EventListViewItemBase(EventListViewBase* parent, 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 e3732eaa0..ed302f63b 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* tqparent)
- : TQObject(tqparent),
- mListView(tqparent),
+Find::Find(EventListViewBase* parent)
+ : TQObject(parent),
+ mListView(parent),
mDialog(0),
mFind(0),
mOptions(0)
diff --git a/kalarm/find.h b/kalarm/find.h
index f7170a291..c1eff2ad8 100644
--- a/kalarm/find.h
+++ b/kalarm/find.h
@@ -38,7 +38,7 @@ class Find : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- explicit Find(EventListViewBase* tqparent);
+ explicit Find(EventListViewBase* parent);
~Find();
void display();
void findNext(bool forward) { findNext(forward, true); }
@@ -54,7 +54,7 @@ class Find : public TQObject
void findNext(bool forward, bool sort, bool checkEnd = false, bool fromCurrent = false);
EventListViewItemBase* nextItem(EventListViewItemBase*, bool forward) const;
- EventListViewBase* mListView; // tqparent list view
+ EventListViewBase* mListView; // parent list view
TQGuardedPtr<KFindDialog> mDialog;
TQCheckBox* mExpired;
TQCheckBox* mLive;
diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp
index 3b45dbc49..94497b969 100644
--- a/kalarm/fontcolour.cpp
+++ b/kalarm/fontcolour.cpp
@@ -38,11 +38,11 @@
#include "fontcolour.moc"
-FontColourChooser::FontColourChooser(TQWidget *tqparent, const char *name,
+FontColourChooser::FontColourChooser(TQWidget *parent, const char *name,
bool onlyFixed, const TQStringList &fontList,
const TQString& frameLabel, bool editColours, bool fg, bool defaultFont,
int visibleListSize)
- : TQWidget(tqparent, name),
+ : TQWidget(parent, name),
mFgColourButton(0),
mRemoveColourButton(0),
mColourList(Preferences::messageColours()),
diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h
index b7205602a..c4b3a5517 100644
--- a/kalarm/fontcolour.h
+++ b/kalarm/fontcolour.h
@@ -37,7 +37,7 @@ class FontColourChooser : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- explicit FontColourChooser(TQWidget* tqparent = 0, const char* name = 0,
+ explicit FontColourChooser(TQWidget* parent = 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 ca62d1011..e5dd90b92 100644
--- a/kalarm/fontcolourbutton.cpp
+++ b/kalarm/fontcolourbutton.cpp
@@ -38,8 +38,8 @@
= Font/colour selection button.
=============================================================================*/
-FontColourButton::FontColourButton(TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name),
+FontColourButton::FontColourButton(TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mReadOnly(false)
{
setFrameStyle(NoFrame);
@@ -119,8 +119,8 @@ void FontColourButton::slotButtonPressed()
=============================================================================*/
FontColourDlg::FontColourDlg(const TQColor& bgColour, const TQColor& fgColour, const TQFont& font,
- bool defaultFont, const TQString& caption, TQWidget* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false),
+ bool defaultFont, const TQString& caption, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false),
mReadOnly(false)
{
TQWidget* page = new TQWidget(this);
diff --git a/kalarm/fontcolourbutton.h b/kalarm/fontcolourbutton.h
index 55713605d..be9fff6fe 100644
--- a/kalarm/fontcolourbutton.h
+++ b/kalarm/fontcolourbutton.h
@@ -36,7 +36,7 @@ class FontColourButton : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- FontColourButton(TQWidget* tqparent = 0, const char* name = 0);
+ FontColourButton(TQWidget* parent = 0, const char* name = 0);
void setDefaultFont();
void setFont(const TQFont&);
void setBgColour(const TQColor&);
@@ -71,7 +71,7 @@ class FontColourDlg : public KDialogBase
TQ_OBJECT
public:
FontColourDlg(const TQColor& bg, const TQColor& fg, const TQFont&, bool defaultFont,
- const TQString& caption, TQWidget* tqparent = 0, const char* name = 0);
+ const TQString& caption, TQWidget* parent = 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 2c44e161f..d7a6383f2 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -498,7 +498,7 @@ UpdatetqStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool en
/******************************************************************************
* Display an error message about an error saving an event.
*/
-void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError code, int nAlarms)
+void displayUpdateError(TQWidget* parent, UpdatetqStatus, UpdateError code, int nAlarms)
{
TQString errmsg;
switch (code)
@@ -519,13 +519,13 @@ void displayUpdateError(TQWidget* tqparent, UpdatetqStatus, UpdateError code, in
errmsg = i18n("Error saving alarm template");
break;
}
- KMessageBox::error(tqparent, errmsg);
+ KMessageBox::error(parent, errmsg);
}
/******************************************************************************
* Display an error message corresponding to a specified alarm update error code.
*/
-void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError code, int nAlarms)
+void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms)
{
TQString errmsg;
switch (code)
@@ -542,7 +542,7 @@ void displayKOrgUpdateError(TQWidget* tqparent, KOrgUpdateError code, int nAlarm
: i18n("Unable to delete alarm from KOrganizer");
break;
}
- KMessageBox::error(tqparent, errmsg);
+ KMessageBox::error(parent, errmsg);
}
/******************************************************************************
@@ -628,16 +628,16 @@ 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* tqparent, const KAEvent* event)
+void outputAlarmWarnings(TQWidget* parent, const KAEvent* event)
{
if (event && event->action() == KAEvent::EMAIL
&& Preferences::emailAddress().isEmpty())
- KMessageBox::information(tqparent, i18n("Please set the 'From' email address...",
+ KMessageBox::information(parent, i18n("Please set the 'From' email address...",
"%1\nPlease set it in the Preferences dialog.").tqarg(KAMail::i18n_NeedFromEmailAddress()));
if (!Daemon::monitoringAlarms())
{
- if (KMessageBox::warningYesNo(tqparent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"),
+ if (KMessageBox::warningYesNo(parent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"),
TQString(), i18n("Enable"), i18n("Keep Disabled"),
TQString::tqfromLatin1("EditEnableAlarms"))
== KMessageBox::Yes)
@@ -868,12 +868,12 @@ 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* tqparent, const char* name)
+ const TQString& filter, int mode, TQWidget* parent, const char* name)
{
TQString initialDir = !initialFile.isEmpty() ? TQString(initialFile).remove(TQRegExp("/[^/]*$"))
: !defaultDir.isEmpty() ? defaultDir
: TQDir::homeDirPath();
- KFileDialog fileDlg(initialDir, filter, tqparent, name, true);
+ KFileDialog fileDlg(initialDir, filter, parent, name, true);
fileDlg.setOperationMode(mode & KFile::ExistingOnly ? KFileDialog::Opening : KFileDialog::Saving);
fileDlg.setMode(KFile::File | mode);
fileDlg.setCaption(caption);
diff --git a/kalarm/functions.h b/kalarm/functions.h
index 5a6798640..b8a1a51d3 100644
--- a/kalarm/functions.h
+++ b/kalarm/functions.h
@@ -77,7 +77,7 @@ int getVersionNumber(const TQString& version, TQString* subVersi
inline int currentCalendarVersion() { return KAEvent::calVersion(); }
inline TQString currentCalendarVersionString() { return KAEvent::calVersionString(); }
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);
+ const TQString& filter = TQString(), int mode = 0, TQWidget* parent = 0, const char* name = 0);
bool edit(const TQString& eventID);
bool editNew(const TQString& templateName = TQString());
/** Create a "New Alarm" KAction */
@@ -88,7 +88,7 @@ TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject*
* If shell commands are disabled, command alarm templates are omitted.
*/
TQValueList<KAEvent> templateList();
-void outputAlarmWarnings(TQWidget* tqparent, const KAEvent* = 0);
+void outputAlarmWarnings(TQWidget* parent, const KAEvent* = 0);
void resetDaemon();
void resetDaemonIfQueued(); // must only be called from KAlarmApp::processQueue()
TQString runKMail(bool minimise);
@@ -105,8 +105,8 @@ UpdatetqStatus deleteTemplate(const KAEvent&);
void deleteDisplayEvent(const TQString& eventID);
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);
+void displayUpdateError(TQWidget* parent, UpdatetqStatus, UpdateError, int nAlarms);
+void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError, int nAlarms);
TQString stripAccel(const TQString&);
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 775821c5e..8a620afd5 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -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 tqparent
+ // There are no windows left except perhaps a main window which is a hidden tray icon parent
if (mTrayWindow)
{
// There is a system tray icon.
@@ -816,11 +816,11 @@ 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* tqparent)
+void KAlarmApp::doQuit(TQWidget* parent)
{
kdDebug(5950) << "KAlarmApp::doQuit()\n";
if (mDisableAlarmsIfStopped
- && MessageBox::warningContinueCancel(tqparent, KMessageBox::Cancel,
+ && MessageBox::warningContinueCancel(parent, KMessageBox::Cancel,
i18n("Quitting will disable alarms\n(once any alarm message windows are closed)."),
TQString(), KStdGuiItem::quit(), Preferences::TQUIT_WARN
) != KMessageBox::Yes)
@@ -973,7 +973,7 @@ void KAlarmApp::removeWindow(TrayWindow*)
/******************************************************************************
* Display or close the system tray icon.
*/
-bool KAlarmApp::displayTrayIcon(bool show, MainWindow* tqparent)
+bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent)
{
static bool creating = false;
if (show)
@@ -985,10 +985,10 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* tqparent)
if (!MainWindow::count() && wantRunInSystemTray())
{
creating = true; // prevent main window constructor from creating an additional tray icon
- tqparent = MainWindow::create();
+ parent = MainWindow::create();
creating = false;
}
- mTrayWindow = new TrayWindow(tqparent ? tqparent : MainWindow::firstWindow());
+ mTrayWindow = new TrayWindow(parent ? parent : MainWindow::firstWindow());
connect(mTrayWindow, TQT_SIGNAL(deleted()), TQT_SIGNAL(trayIconToggled()));
mTrayWindow->show();
emit trayIconToggled();
@@ -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* tqparent)
+void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* parent)
{
// 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* tqparent)
ProcData* pd = *it;
if (pd->process == proc)
{
- pd->messageBoxParent = tqparent;
+ pd->messageBoxParent = parent;
break;
}
}
diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h
index 0aa81b1bf..6653e8101 100644
--- a/kalarm/kalarmapp.h
+++ b/kalarm/kalarmapp.h
@@ -62,7 +62,7 @@ class KAlarmApp : public KUniqueApplication
bool restoreSession();
bool sessionClosingDown() const { return mSessionClosingDown; }
void quitIf() { quitIf(0); }
- void doQuit(TQWidget* tqparent);
+ void doQuit(TQWidget* parent);
static void displayFatalError(const TQString& message);
void addWindow(TrayWindow* w) { mTrayWindow = w; }
void removeWindow(TrayWindow*);
@@ -77,7 +77,7 @@ class KAlarmApp : public KUniqueApplication
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* tqparent);
+ void commandMessage(ShellProcess*, TQWidget* parent);
// 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,
@@ -160,9 +160,9 @@ 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 tqparent of the main DCOP receiver object
+ DcopHandler* mDcopHandler; // the parent of the main DCOP receiver object
#ifdef OLD_DCOP
- DcopHandlerOld* mDcopHandlerOld; // the tqparent of the old main DCOP receiver object
+ DcopHandlerOld* mDcopHandlerOld; // the parent of the old main DCOP receiver object
#endif
TrayWindow* mTrayWindow; // active system tray icon
TQTime mStartOfDay; // start-of-day time currently in use
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
diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp
index 51c127d60..4f69be211 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* tqparent, const char* name)
- : TQFrame(tqparent, name),
+LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mDateOnly(false),
mReadOnly(false),
mAutoCloseShown(false)
diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h
index 1d5b53630..ba03d07d7 100644
--- a/kalarm/latecancel.h
+++ b/kalarm/latecancel.h
@@ -35,7 +35,7 @@ class LateCancelSelector : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- LateCancelSelector(bool allowHourMinute, TQWidget* tqparent, const char* name = 0);
+ LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name = 0);
int minutes() const;
void setMinutes(int Minutes, bool dateOnly, TimePeriod::Units defaultUnits);
void setDateOnly(bool dateOnly);
diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp
index b8528316c..018640123 100644
--- a/kalarm/lib/buttongroup.cpp
+++ b/kalarm/lib/buttongroup.cpp
@@ -26,26 +26,26 @@
#include "buttongroup.moc"
-ButtonGroup::ButtonGroup(TQWidget* tqparent, const char* name)
- : TQButtonGroup(tqparent, name)
+ButtonGroup::ButtonGroup(TQWidget* parent, const char* name)
+ : TQButtonGroup(parent, name)
{
connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
}
-ButtonGroup::ButtonGroup(const TQString& title, TQWidget* tqparent, const char* name)
- : TQButtonGroup(title, tqparent, name)
+ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* name)
+ : TQButtonGroup(title, parent, name)
{
connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
}
-ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* tqparent, const char* name)
- : TQButtonGroup(strips, orient, tqparent, name)
+ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name)
+ : TQButtonGroup(strips, orient, parent, name)
{
connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
}
-ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* tqparent, const char* name)
- : TQButtonGroup(strips, orient, title, tqparent, name)
+ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name)
+ : TQButtonGroup(strips, orient, title, parent, name)
{
connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int)));
}
diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h
index 9d4a8886a..f4d812653 100644
--- a/kalarm/lib/buttongroup.h
+++ b/kalarm/lib/buttongroup.h
@@ -41,31 +41,31 @@ class ButtonGroup : public TQButtonGroup
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit ButtonGroup(TQWidget* tqparent, const char* name = 0);
+ explicit ButtonGroup(TQWidget* parent, const char* name = 0);
/** Constructor.
* @param title The title displayed for this button group.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- ButtonGroup(const TQString& title, TQWidget* tqparent, const char* name = 0);
+ ButtonGroup(const TQString& title, TQWidget* parent, const char* name = 0);
/** Constructor.
* @param strips The number of rows or columns of buttons.
* @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- ButtonGroup(int strips, Qt::Orientation orient, TQWidget* tqparent, const char* name = 0);
+ ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name = 0);
/** Constructor.
* @param strips The number of rows or columns of buttons.
* @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group.
* @param title The title displayed for this button group.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* tqparent, const char* name = 0);
+ ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, 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 b5bfde0ee..d6b02373c 100644
--- a/kalarm/lib/checkbox.cpp
+++ b/kalarm/lib/checkbox.cpp
@@ -21,15 +21,15 @@
#include "checkbox.moc"
-CheckBox::CheckBox(TQWidget* tqparent, const char* name)
- : TQCheckBox(tqparent, name),
+CheckBox::CheckBox(TQWidget* parent, const char* name)
+ : TQCheckBox(parent, name),
mFocusPolicy(focusPolicy()),
mFocusWidget(0),
mReadOnly(false)
{ }
-CheckBox::CheckBox(const TQString& text, TQWidget* tqparent, const char* name)
- : TQCheckBox(text, tqparent, name),
+CheckBox::CheckBox(const TQString& text, TQWidget* parent, const char* name)
+ : TQCheckBox(text, parent, name),
mFocusPolicy(focusPolicy()),
mFocusWidget(0),
mReadOnly(false)
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index 61d6a1276..f81490ea9 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -45,16 +45,16 @@ class CheckBox : public TQCheckBox
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit CheckBox(TQWidget* tqparent, const char* name = 0);
+ explicit CheckBox(TQWidget* parent, const char* name = 0);
/** Constructor.
* @param text Text to display.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- CheckBox(const TQString& text, TQWidget* tqparent, const char* name = 0);
+ CheckBox(const TQString& text, TQWidget* parent, 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,
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index cd078a34f..4d10f6e63 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -30,8 +30,8 @@
#include "colourcombo.moc"
-ColourCombo::ColourCombo(TQWidget* tqparent, const char* name, const TQColor& defaultColour)
- : TQComboBox(tqparent, name),
+ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defaultColour)
+ : TQComboBox(parent, name),
mColourList(Preferences::messageColours()),
mSelectedColour(defaultColour),
mCustomColour(255, 255, 255),
diff --git a/kalarm/lib/colourcombo.h b/kalarm/lib/colourcombo.h
index 31fcdbdcc..2a075d235 100644
--- a/kalarm/lib/colourcombo.h
+++ b/kalarm/lib/colourcombo.h
@@ -47,11 +47,11 @@ class ColourCombo : public TQComboBox
TQ_PROPERTY(TQColor color READ color WRITE setColor)
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
* @param defaultColour The colour which is selected by default.
*/
- explicit ColourCombo(TQWidget* tqparent = 0, const char* name = 0, const TQColor& defaultColour = 0xFFFFFF);
+ explicit ColourCombo(TQWidget* parent = 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/combobox.cpp b/kalarm/lib/combobox.cpp
index 2acb5a442..99577506d 100644
--- a/kalarm/lib/combobox.cpp
+++ b/kalarm/lib/combobox.cpp
@@ -22,13 +22,13 @@
#include "combobox.moc"
-ComboBox::ComboBox(TQWidget* tqparent, const char* name)
- : TQComboBox(tqparent, name),
+ComboBox::ComboBox(TQWidget* parent, const char* name)
+ : TQComboBox(parent, name),
mReadOnly(false)
{ }
-ComboBox::ComboBox(bool rw, TQWidget* tqparent, const char* name)
- : TQComboBox(rw, tqparent, name),
+ComboBox::ComboBox(bool rw, TQWidget* parent, const char* name)
+ : TQComboBox(rw, parent, name),
mReadOnly(false)
{ }
diff --git a/kalarm/lib/combobox.h b/kalarm/lib/combobox.h
index 5f8f4cc3c..3d5ff13e6 100644
--- a/kalarm/lib/combobox.h
+++ b/kalarm/lib/combobox.h
@@ -40,16 +40,16 @@ class ComboBox : public TQComboBox
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit ComboBox(TQWidget* tqparent = 0, const char* name = 0);
+ explicit ComboBox(TQWidget* parent = 0, const char* name = 0);
/** Constructor.
* @param rw True for a read-write combo box, false for a read-only combo box.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit ComboBox(bool rw, TQWidget* tqparent = 0, const char* name = 0);
+ explicit ComboBox(bool rw, TQWidget* parent = 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 0a916d9f6..b9699988d 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -25,8 +25,8 @@
#include "dateedit.moc"
-DateEdit::DateEdit(TQWidget* tqparent, const char* name)
- : KDateEdit(tqparent, name)
+DateEdit::DateEdit(TQWidget* parent, const char* name)
+ : KDateEdit(parent, name)
{
connect(this, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(newDateEntered(const TQDate&)));
}
diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h
index 7ad0a7a05..b221871a9 100644
--- a/kalarm/lib/dateedit.h
+++ b/kalarm/lib/dateedit.h
@@ -40,10 +40,10 @@ class DateEdit : public KDateEdit
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit DateEdit(TQWidget* tqparent = 0, const char* name = 0);
+ explicit DateEdit(TQWidget* parent = 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.
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index ee1750e8b..7767a7659 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -23,20 +23,20 @@
#include "label.moc"
-Label::Label(TQWidget* tqparent, const char* name, WFlags f)
- : TQLabel(tqparent, name, f),
+Label::Label(TQWidget* parent, const char* name, WFlags f)
+ : TQLabel(parent, name, f),
mRadioButton(0),
mFocusWidget(0)
{ }
-Label::Label(const TQString& text, TQWidget* tqparent, const char* name, WFlags f)
- : TQLabel(text, tqparent, name, f),
+Label::Label(const TQString& text, TQWidget* parent, const char* name, WFlags f)
+ : TQLabel(text, parent, name, f),
mRadioButton(0),
mFocusWidget(0)
{ }
-Label::Label(TQWidget* buddy, const TQString& text, TQWidget* tqparent, const char* name, WFlags f)
- : TQLabel(buddy, text, tqparent, name, f),
+Label::Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char* name, WFlags f)
+ : TQLabel(buddy, text, parent, name, f),
mRadioButton(0),
mFocusWidget(0)
{ }
@@ -103,8 +103,8 @@ void Label::activated()
* Class: LabelFocusWidget
=============================================================================*/
-LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name)
- : TQWidget(tqparent, name)
+LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name)
+ : TQWidget(parent, name)
{
setFocusPolicy(TQ_ClickFocus);
setFixedSize(TQSize(1,1));
@@ -112,7 +112,7 @@ LabelFocusWidget::LabelFocusWidget(TQWidget* tqparent, const char* name)
void LabelFocusWidget::focusInEvent(TQFocusEvent*)
{
- Label* tqparent = (Label*)parentWidget();
- tqparent->activated();
+ Label* parent = (Label*)parentWidget();
+ parent->activated();
}
diff --git a/kalarm/lib/label.h b/kalarm/lib/label.h
index bd0e39035..ba418aee8 100644
--- a/kalarm/lib/label.h
+++ b/kalarm/lib/label.h
@@ -45,29 +45,29 @@ class Label : public TQLabel
friend class LabelFocusWidget;
public:
/** Constructs an empty label.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
* @param f Flags. See TQWidget constructor for details.
*/
- explicit Label(TQWidget* tqparent, const char* name = 0, WFlags f = 0);
+ explicit Label(TQWidget* parent, const char* name = 0, WFlags f = 0);
/** Constructs a label that displays @p text.
* @param text Text string to display.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
* @param f Flags. See TQWidget constructor for details.
*/
- Label(const TQString& text, TQWidget* tqparent, const char* name = 0, WFlags f = 0);
+ Label(const TQString& text, TQWidget* parent, 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 tqparent The tqparent object of this widget.
+ * @param parent The parent 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* tqparent, const char* name = 0, WFlags f = 0);
+ Label(TQWidget* buddy, const TQString& text, TQWidget* parent, 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.
@@ -90,7 +90,7 @@ class LabelFocusWidget : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- LabelFocusWidget(TQWidget* tqparent, const char* name = 0);
+ LabelFocusWidget(TQWidget* parent, const char* name = 0);
protected:
virtual void focusInEvent(TQFocusEvent*);
};
diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp
index 28d94fb26..0328e4db9 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* tqparent, const char* name)
- : KLineEdit(tqparent, name),
+LineEdit::LineEdit(Type type, TQWidget* parent, const char* name)
+ : KLineEdit(parent, name),
mType(type),
mNoSelect(false),
mSetCursorAtEnd(false)
@@ -48,8 +48,8 @@ LineEdit::LineEdit(Type type, TQWidget* tqparent, const char* name)
init();
}
-LineEdit::LineEdit(TQWidget* tqparent, const char* name)
- : KLineEdit(tqparent, name),
+LineEdit::LineEdit(TQWidget* parent, const char* name)
+ : KLineEdit(parent, name),
mType(Text),
mNoSelect(false),
mSetCursorAtEnd(false)
diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h
index 0da536835..660d45377 100644
--- a/kalarm/lib/lineedit.h
+++ b/kalarm/lib/lineedit.h
@@ -62,15 +62,15 @@ class LineEdit : public KLineEdit
enum Type { Text, Url, Emails };
/** Constructor.
* @param type The content type for the line edit.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit LineEdit(Type type, TQWidget* tqparent = 0, const char* name = 0);
+ explicit LineEdit(Type type, TQWidget* parent = 0, const char* name = 0);
/** Constructs a line edit whose content type is Text.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit LineEdit(TQWidget* tqparent = 0, const char* name = 0);
+ explicit LineEdit(TQWidget* parent = 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 2f7480dfd..3345c9c4b 100644
--- a/kalarm/lib/messagebox.cpp
+++ b/kalarm/lib/messagebox.cpp
@@ -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* tqparent, const TQString& text, const TQString& caption,
+int MessageBox::warningContinueCancel(TQWidget* parent, const TQString& text, const TQString& caption,
const KGuiItem& buttonContinue, const TQString& dontAskAgainName)
{
ButtonCode defaultButton = getContinueDefault(dontAskAgainName);
- return warningContinueCancel(tqparent, defaultButton, text, caption, buttonContinue, dontAskAgainName);
+ return warningContinueCancel(parent, defaultButton, text, caption, buttonContinue, dontAskAgainName);
}
/******************************************************************************
@@ -72,13 +72,13 @@ int MessageBox::warningContinueCancel(TQWidget* tqparent, const TQString& text,
* If 'dontAskAgainName' is specified, the message box will only be suppressed
* if the user chose Continue last time.
*/
-int MessageBox::warningContinueCancel(TQWidget* tqparent, ButtonCode defaultButton, const TQString& text,
+int MessageBox::warningContinueCancel(TQWidget* parent, ButtonCode defaultButton, const TQString& text,
const TQString& caption, const KGuiItem& buttonContinue,
const TQString& dontAskAgainName)
{
setContinueDefault(dontAskAgainName, defaultButton);
if (defaultButton != Cancel)
- return KMessageBox::warningContinueCancel(tqparent, text, caption, buttonContinue, dontAskAgainName);
+ return KMessageBox::warningContinueCancel(parent, 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* tqparent, ButtonCode defaultButt
saveDontShowAgain(dontAskAgainName, true, false);
}
}
- return warningYesNo(tqparent, text, caption, buttonContinue, KStdGuiItem::cancel(), dontAskAgainName);
+ return warningYesNo(parent, text, caption, buttonContinue, KStdGuiItem::cancel(), dontAskAgainName);
}
/******************************************************************************
diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h
index 21d321b13..7a84cf202 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 tqparent Parent widget
+ * @param parent 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* tqparent, ButtonCode defaultButton, const TQString& text,
+ static int warningContinueCancel(TQWidget* parent, ButtonCode defaultButton, const TQString& text,
const TQString& caption = TQString(),
const KGuiItem& buttonContinue = KStdGuiItem::cont(),
const TQString& dontAskAgainName = TQString());
/** Displays a Continue/Cancel message box.
- * @param tqparent Parent widget
+ * @param parent 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,7 +81,7 @@ 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* tqparent, const TQString& text, const TQString& caption = TQString(),
+ static int warningContinueCancel(TQWidget* parent, const TQString& text, const TQString& caption = TQString(),
const KGuiItem& buttonContinue = KStdGuiItem::cont(),
const TQString& dontAskAgainName = TQString());
/** If there is no current setting for whether a non-Yes/No message box should be
diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp
index 883ad1812..f1f824d24 100644
--- a/kalarm/lib/pushbutton.cpp
+++ b/kalarm/lib/pushbutton.cpp
@@ -21,20 +21,20 @@
#include "pushbutton.moc"
-PushButton::PushButton(TQWidget* tqparent, const char* name)
- : TQPushButton(tqparent, name),
+PushButton::PushButton(TQWidget* parent, const char* name)
+ : TQPushButton(parent, name),
mFocusPolicy(focusPolicy()),
mReadOnly(false)
{ }
-PushButton::PushButton(const TQString& text, TQWidget* tqparent, const char* name)
- : TQPushButton(text, tqparent, name),
+PushButton::PushButton(const TQString& text, TQWidget* parent, const char* name)
+ : TQPushButton(text, parent, name),
mFocusPolicy(focusPolicy()),
mReadOnly(false)
{ }
-PushButton::PushButton(const TQIconSet& icon, const TQString& text, TQWidget* tqparent, const char* name)
- : TQPushButton(icon, text, tqparent, name),
+PushButton::PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, const char* name)
+ : TQPushButton(icon, text, parent, name),
mFocusPolicy(focusPolicy()),
mReadOnly(false)
{ }
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index 52c761bce..d3aee32cd 100644
--- a/kalarm/lib/pushbutton.h
+++ b/kalarm/lib/pushbutton.h
@@ -41,23 +41,23 @@ class PushButton : public TQPushButton
TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit PushButton(TQWidget* tqparent, const char* name = 0);
+ explicit PushButton(TQWidget* parent, const char* name = 0);
/** Constructor for a push button which displays a text.
* @param text The text to show on the button.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- PushButton(const TQString& text, TQWidget* tqparent, const char* name = 0);
+ PushButton(const TQString& text, TQWidget* parent, 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 tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- PushButton(const TQIconSet& icon, const TQString& text, TQWidget* tqparent, const char* name = 0);
+ PushButton(const TQIconSet& icon, const TQString& text, TQWidget* parent, 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.
*/
diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp
index 6331c06f5..18571ad7f 100644
--- a/kalarm/lib/radiobutton.cpp
+++ b/kalarm/lib/radiobutton.cpp
@@ -21,15 +21,15 @@
#include "radiobutton.moc"
-RadioButton::RadioButton(TQWidget* tqparent, const char* name)
- : TQRadioButton(tqparent, name),
+RadioButton::RadioButton(TQWidget* parent, const char* name)
+ : TQRadioButton(parent, name),
mFocusPolicy(focusPolicy()),
mFocusWidget(0),
mReadOnly(false)
{ }
-RadioButton::RadioButton(const TQString& text, TQWidget* tqparent, const char* name)
- : TQRadioButton(text, tqparent, name),
+RadioButton::RadioButton(const TQString& text, TQWidget* parent, const char* name)
+ : TQRadioButton(text, parent, name),
mFocusPolicy(focusPolicy()),
mFocusWidget(0),
mReadOnly(false)
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index 2f924b24d..107957ca7 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -45,16 +45,16 @@ class RadioButton : public TQRadioButton
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit RadioButton(TQWidget* tqparent, const char* name = 0);
+ explicit RadioButton(TQWidget* parent, const char* name = 0);
/** Constructor.
* @param text Text to display.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- RadioButton(const TQString& text, TQWidget* tqparent, const char* name = 0);
+ RadioButton(const TQString& text, TQWidget* parent, 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,
diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp
index f901f6db1..189c8941a 100644
--- a/kalarm/lib/slider.cpp
+++ b/kalarm/lib/slider.cpp
@@ -21,18 +21,18 @@
#include "slider.moc"
-Slider::Slider(TQWidget* tqparent, const char* name)
- : TQSlider(tqparent, name),
+Slider::Slider(TQWidget* parent, const char* name)
+ : TQSlider(parent, name),
mReadOnly(false)
{ }
-Slider::Slider(Qt::Orientation o, TQWidget* tqparent, const char* name)
- : TQSlider(o, tqparent, name),
+Slider::Slider(Qt::Orientation o, TQWidget* parent, const char* name)
+ : TQSlider(o, parent, name),
mReadOnly(false)
{ }
-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),
+Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* parent, const char* name)
+ : TQSlider(minval, maxval, pageStep, value, o, parent, name),
mReadOnly(false)
{ }
diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h
index f79ac0158..6b72c5ba6 100644
--- a/kalarm/lib/slider.h
+++ b/kalarm/lib/slider.h
@@ -41,27 +41,27 @@ class Slider : public TQSlider
TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit Slider(TQWidget* tqparent = 0, const char* name = 0);
+ explicit Slider(TQWidget* parent = 0, const char* name = 0);
/** Constructor.
* @param orient The orientation of the slider, either TQt::Horizonal or TQt::Vertical.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit Slider(Qt::Orientation orient, TQWidget* tqparent = 0, const char* name = 0);
+ explicit Slider(Qt::Orientation orient, TQWidget* parent = 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 TQt::Horizonal or TQt::Vertical.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
Slider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orient,
- TQWidget* tqparent = 0, const char* name = 0);
+ TQWidget* parent = 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 10f3f5917..625186ca9 100644
--- a/kalarm/lib/spinbox.cpp
+++ b/kalarm/lib/spinbox.cpp
@@ -24,16 +24,16 @@
#include "spinbox.moc"
-SpinBox::SpinBox(TQWidget* tqparent, const char* name)
- : TQSpinBox(0, 99999, 1, tqparent, name),
+SpinBox::SpinBox(TQWidget* parent, const char* name)
+ : TQSpinBox(0, 99999, 1, parent, name),
mMinValue(TQSpinBox::minValue()),
mMaxValue(TQSpinBox::maxValue())
{
init();
}
-SpinBox::SpinBox(int minValue, int maxValue, int step, TQWidget* tqparent, const char* name)
- : TQSpinBox(minValue, maxValue, step, tqparent, name),
+SpinBox::SpinBox(int minValue, int maxValue, int step, TQWidget* parent, const char* name)
+ : TQSpinBox(minValue, maxValue, step, parent, name),
mMinValue(minValue),
mMaxValue(maxValue)
{
diff --git a/kalarm/lib/spinbox.h b/kalarm/lib/spinbox.h
index 4b269d6a5..081087db0 100644
--- a/kalarm/lib/spinbox.h
+++ b/kalarm/lib/spinbox.h
@@ -45,18 +45,18 @@ class SpinBox : public TQSpinBox
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit SpinBox(TQWidget* tqparent = 0, const char* name = 0);
+ explicit SpinBox(TQWidget* parent = 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 tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- SpinBox(int minValue, int maxValue, int step = 1, TQWidget* tqparent = 0, const char* name = 0);
+ SpinBox(int minValue, int maxValue, int step = 1, TQWidget* parent = 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 bdd887912..3ec3b68c0 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -48,8 +48,8 @@ static bool mirrorStyle(const TQStyle&);
int SpinBox2::mReverseLayout = -1;
-SpinBox2::SpinBox2(TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name),
+SpinBox2::SpinBox2(TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mReverseWithLayout(true)
{
mUpdown2Frame = new TQFrame(this);
@@ -60,8 +60,8 @@ SpinBox2::SpinBox2(TQWidget* tqparent, const char* name)
init();
}
-SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name),
+SpinBox2::SpinBox2(int minValue, int maxValue, int step, int step2, TQWidget* parent, const char* name)
+ : TQFrame(parent, 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 tqparent SpinBox2 to
+* If it's the first time since a style change, tell the parent 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* tqparent, const char* name)
- : TQCanvasView(new TQCanvas, tqparent, name),
+SpinMirror::SpinMirror(SpinBox* spinbox, TQFrame* spinFrame, TQWidget* parent, const char* name)
+ : TQCanvasView(new TQCanvas, parent, name),
mSpinbox(spinbox),
mSpinFrame(spinFrame),
mReadOnly(false)
diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h
index f83db252a..4391fbb9c 100644
--- a/kalarm/lib/spinbox2.h
+++ b/kalarm/lib/spinbox2.h
@@ -59,20 +59,20 @@ class SpinBox2 : public TQFrame
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit SpinBox2(TQWidget* tqparent = 0, const char* name = 0);
+ explicit SpinBox2(TQWidget* parent = 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 tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
SpinBox2(int minValue, int maxValue, int step = 1, int step2 = 1,
- TQWidget* tqparent = 0, const char* name = 0);
+ TQWidget* parent = 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.
*/
@@ -282,10 +282,10 @@ class SpinBox2 : public TQFrame
class MainSpinBox : public SpinBox
{
public:
- 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) { }
+ 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) { }
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); }
diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h
index 1c5a71ee6..c1c116b04 100644
--- a/kalarm/lib/spinbox2private.h
+++ b/kalarm/lib/spinbox2private.h
@@ -36,10 +36,10 @@ class ExtraSpinBox : public SpinBox
Q_OBJECT
TQ_OBJECT
public:
- 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) { }
+ 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) { }
signals:
void styleUpdated();
protected:
@@ -63,7 +63,7 @@ class SpinMirror : public TQCanvasView
Q_OBJECT
TQ_OBJECT
public:
- explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* tqparent = 0, const char* name = 0);
+ explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* parent = 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/timeedit.cpp b/kalarm/lib/timeedit.cpp
index 923bef8b3..170914922 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -28,8 +28,8 @@
#include "timeedit.moc"
-TimeEdit::TimeEdit(TQWidget* tqparent, const char* name)
- : TQHBox(tqparent, name),
+TimeEdit::TimeEdit(TQWidget* parent, const char* name)
+ : TQHBox(parent, name),
mAmPm(0),
mAmIndex(-1),
mPmIndex(-1),
diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h
index 7be73c1f9..658fe7805 100644
--- a/kalarm/lib/timeedit.h
+++ b/kalarm/lib/timeedit.h
@@ -53,10 +53,10 @@ class TimeEdit : public TQHBox
TQ_OBJECT
public:
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit TimeEdit(TQWidget* tqparent = 0, const char* name = 0);
+ explicit TimeEdit(TQWidget* parent = 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,
diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp
index 9b41e40d4..291ba0872 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* tqparent, const char* name)
- : TQHBox(tqparent, name),
+TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name)
+ : TQHBox(parent, name),
mMaxDays(9999),
mNoHourMinute(!allowHourMinute),
mReadOnly(false)
diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h
index 86b663798..9c4152b76 100644
--- a/kalarm/lib/timeperiod.h
+++ b/kalarm/lib/timeperiod.h
@@ -65,10 +65,10 @@ class TimePeriod : public TQHBox
* 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 tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- TimePeriod(bool allowMinute, TQWidget* tqparent, const char* name = 0);
+ TimePeriod(bool allowMinute, TQWidget* parent, 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,
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index ccf0c4492..f756112e8 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -30,8 +30,8 @@
class TimeSpinBox::TimeValidator : public TQValidator
{
public:
- TimeValidator(int minMin, int maxMin, TQWidget* tqparent, const char* name = 0)
- : TQValidator(TQT_TQOBJECT(tqparent), name),
+ TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0)
+ : TQValidator(TQT_TQOBJECT(parent), 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 TQValidator
/******************************************************************************
* Construct a wrapping 00:00 - 23:59, or 12:00 - 11:59 time spin box.
*/
-TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* tqparent, const char* name)
- : SpinBox2(0, 1439, 1, 60, tqparent, name),
+TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name)
+ : SpinBox2(0, 1439, 1, 60, parent, name),
mMinimumValue(0),
m12Hour(!use24hour),
mPm(false),
@@ -76,8 +76,8 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* tqparent, const char* name)
/******************************************************************************
* Construct a non-wrapping time spin box.
*/
-TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* tqparent, const char* name)
- : SpinBox2(minMinute, maxMinute, 1, 60, tqparent, name),
+TimeSpinBox::TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent, const char* name)
+ : SpinBox2(minMinute, maxMinute, 1, 60, parent, name),
mMinimumValue(minMinute),
m12Hour(false),
mInvalid(false),
diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h
index 4bacd4947..0be232453 100644
--- a/kalarm/lib/timespinbox.h
+++ b/kalarm/lib/timespinbox.h
@@ -50,17 +50,17 @@ class TimeSpinBox : public SpinBox2
/** 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 tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit TimeSpinBox(bool use24hour, TQWidget* tqparent = 0, const char* name = 0);
+ explicit TimeSpinBox(bool use24hour, TQWidget* parent = 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 tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- TimeSpinBox(int minMinute, int maxMinute, TQWidget* tqparent = 0, const char* name = 0);
+ TimeSpinBox(int minMinute, int maxMinute, TQWidget* parent = 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 aa334c670..3bef1a6f7 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 tqparent of the system tray icon, or if
+* Get the main main window, i.e. the parent 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 tqparent of the system tray icon.
+* Check whether this main window is the parent of the system tray icon.
*/
bool MainWindow::isTrayParent() const
{
@@ -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 tqparent window of the system tray icon, so just hide
+ // It's the parent window of the system tray icon, so just hide
// it to prevent the system tray icon closing.
hide();
theApp()->quitIf();
diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h
index 45bb7fb66..a6ba5ed33 100644
--- a/kalarm/mainwindowbase.h
+++ b/kalarm/mainwindowbase.h
@@ -37,8 +37,8 @@ class MainWindowBase : public KMainWindow
TQ_OBJECT
public:
- explicit MainWindowBase(TQWidget* tqparent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose)
- : KMainWindow(tqparent, name, f), disableQuit(false) { }
+ explicit MainWindowBase(TQWidget* parent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose)
+ : KMainWindow(parent, name, f), disableQuit(false) { }
protected:
virtual void closeEvent(TQCloseEvent*);
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 6f0878c00..755a1e223 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -93,8 +93,8 @@ static bool wantModal();
class MessageText : public TQTextEdit
{
public:
- MessageText(const TQString& text, const TQString& context = TQString(), TQWidget* tqparent = 0, const char* name = 0)
- : TQTextEdit(text, context, tqparent, name)
+ MessageText(const TQString& text, const TQString& context = TQString(), TQWidget* parent = 0, const char* name = 0)
+ : TQTextEdit(text, context, parent, name)
{
setReadOnly(true);
setWordWrap(TQTextEdit::NoWrap);
diff --git a/kalarm/pickfileradio.cpp b/kalarm/pickfileradio.cpp
index dfe0f41a9..15b56d942 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* tqparent, const char* name)
- : RadioButton(text, tqparent, name),
- mGroup(tqparent),
+PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name)
+ : RadioButton(text, parent, name),
+ mGroup(parent),
mEdit(edit),
mButton(button),
mLastId(-1), // set to an invalid value
mRevertId(false)
{
- Q_ASSERT(tqparent);
+ Q_ASSERT(parent);
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* tqparent, const char* name)
- : RadioButton(text, tqparent, name),
- mGroup(tqparent),
+PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name)
+ : RadioButton(text, parent, name),
+ mGroup(parent),
mEdit(0),
mButton(0),
mLastId(-1), // set to an invalid value
mRevertId(false)
{
- Q_ASSERT(tqparent);
+ Q_ASSERT(parent);
}
void PickFileRadio::init(TQPushButton* button, LineEdit* edit)
diff --git a/kalarm/pickfileradio.h b/kalarm/pickfileradio.h
index a8d12383e..72b431102 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 tqparent button group.
+ * is reverted to the previously selected button in the parent 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
@@ -56,17 +56,17 @@ class PickFileRadio : public RadioButton
* @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 tqparent Button group which is to be the tqparent object for the radio button.
+ * @param parent Button group which is to be the parent object for the radio button.
* @param name The name of this widget.
*/
- PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* tqparent, const char* name = 0);
+ PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name = 0);
/** Constructor.
* The init() method must be called before the widget can be used.
* @param text Radio button's text.
- * @param tqparent Button group which is to be the tqparent object for the radio button.
+ * @param parent Button group which is to be the parent object for the radio button.
* @param name The name of this widget.
*/
- PickFileRadio(const TQString& text, TQButtonGroup* tqparent, const char* name = 0);
+ PickFileRadio(const TQString& text, TQButtonGroup* parent, 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.
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 264824b3c..2a10c1a33 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* tqparent, const char* name)
- : TQFrame(tqparent, name),
+RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mRule(0),
mRuleButtonType(INVALID_RECUR),
mDailyShown(false),
@@ -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* tqparent, const char* name)
- : NoRule(tqparent, name)
+Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly, TQWidget* parent, const char* name)
+ : NoRule(parent, 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* tqparent, const char* name)
+SubDailyRule::SubDailyRule(bool readOnly, TQWidget* parent, const char* name)
: Rule(i18n("hours:minutes"),
i18n("Enter the number of hours and minutes between repetitions of the alarm"),
- true, readOnly, tqparent, name)
+ true, readOnly, parent, name)
{ }
@@ -1108,8 +1108,8 @@ SubDailyRule::SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name)
=============================================================================*/
DayWeekRule::DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis,
- bool readOnly, TQWidget* tqparent, const char* name)
- : Rule(freqText, freqWhatsThis, false, readOnly, tqparent, name),
+ bool readOnly, TQWidget* parent, const char* name)
+ : Rule(freqText, freqWhatsThis, false, readOnly, parent, name),
mSavedDays(7)
{
TQGridLayout* grid = new TQGridLayout(tqlayout(), 1, 4, KDialog::spacingHint());
@@ -1221,11 +1221,11 @@ bool DayWeekRule::stateChanged() const
= Daily rule widget.
=============================================================================*/
-DailyRule::DailyRule(bool readOnly, TQWidget* tqparent, const char* name)
+DailyRule::DailyRule(bool readOnly, TQWidget* parent, 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, tqparent, name)
+ readOnly, parent, name)
{ }
@@ -1234,11 +1234,11 @@ DailyRule::DailyRule(bool readOnly, TQWidget* tqparent, const char* name)
= Weekly rule widget.
=============================================================================*/
-WeeklyRule::WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name)
+WeeklyRule::WeeklyRule(bool readOnly, TQWidget* parent, 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, tqparent, name)
+ readOnly, parent, name)
{ }
@@ -1248,8 +1248,8 @@ WeeklyRule::WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name)
=============================================================================*/
MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhatsThis, bool allowEveryWeek,
- bool readOnly, TQWidget* tqparent, const char* name)
- : Rule(freqText, freqWhatsThis, false, readOnly, tqparent, name),
+ bool readOnly, TQWidget* parent, const char* name)
+ : Rule(freqText, freqWhatsThis, false, readOnly, parent, name),
mEveryWeek(allowEveryWeek)
{
mButtonGroup = new ButtonGroup(this);
@@ -1438,10 +1438,10 @@ bool MonthYearRule::stateChanged() const
= Monthly rule widget.
=============================================================================*/
-MonthlyRule::MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name)
+MonthlyRule::MonthlyRule(bool readOnly, TQWidget* parent, const char* name)
: MonthYearRule(i18n("month(s)"),
i18n("Enter the number of months between repetitions of the alarm"),
- false, readOnly, tqparent, name)
+ false, readOnly, parent, name)
{ }
@@ -1450,10 +1450,10 @@ MonthlyRule::MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name)
= Yearly rule widget.
=============================================================================*/
-YearlyRule::YearlyRule(bool readOnly, TQWidget* tqparent, const char* name)
+YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name)
: MonthYearRule(i18n("year(s)"),
i18n("Enter the number of years between repetitions of the alarm"),
- true, readOnly, tqparent, name)
+ true, readOnly, parent, name)
{
// Set up the month selection widgets
TQBoxLayout* htqlayout = new TQHBoxLayout(tqlayout(), KDialog::spacingHint());
diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h
index 893b4456d..5b3aae479 100644
--- a/kalarm/recurrenceedit.h
+++ b/kalarm/recurrenceedit.h
@@ -61,7 +61,7 @@ class RecurrenceEdit : public TQFrame
// 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* tqparent, const char* name = 0);
+ RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name = 0);
virtual ~RecurrenceEdit() { }
/** Set widgets to default values */
diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h
index 659921d5b..68dd429b9 100644
--- a/kalarm/recurrenceeditprivate.h
+++ b/kalarm/recurrenceeditprivate.h
@@ -39,7 +39,7 @@ class TQString;
class NoRule : public TQFrame
{
public:
- NoRule(TQWidget* tqparent, const char* name = 0) : TQFrame(tqparent, name)
+ NoRule(TQWidget* parent, const char* name = 0) : TQFrame(parent, name)
{ setFrameStyle(TQFrame::NoFrame); }
virtual int frequency() const { return 0; }
};
@@ -50,7 +50,7 @@ class Rule : public NoRule
TQ_OBJECT
public:
Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly,
- TQWidget* tqparent, const char* name = 0);
+ TQWidget* parent, const char* name = 0);
int frequency() const;
void setFrequency(int);
virtual void setFrequencyFocus() { mSpinBox->setFocus(); }
@@ -75,7 +75,7 @@ class SubDailyRule : public Rule
Q_OBJECT
TQ_OBJECT
public:
- SubDailyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ SubDailyRule(bool readOnly, TQWidget* parent, const char* name = 0);
};
// Daily/weekly rule choices base class
@@ -85,7 +85,7 @@ class DayWeekRule : public Rule
TQ_OBJECT
public:
DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis,
- bool readOnly, TQWidget* tqparent, const char* name = 0);
+ bool readOnly, TQWidget* parent, const char* name = 0);
TQBitArray days() const;
void setDays(bool);
void setDays(const TQBitArray& days);
@@ -103,14 +103,14 @@ class DayWeekRule : public Rule
class DailyRule : public DayWeekRule
{
public:
- DailyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ DailyRule(bool readOnly, TQWidget* parent, const char* name = 0);
};
// Weekly rule choices
class WeeklyRule : public DayWeekRule
{
public:
- WeeklyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ WeeklyRule(bool readOnly, TQWidget* parent, const char* name = 0);
};
// Monthly/yearly rule choices base class
@@ -122,7 +122,7 @@ class MonthYearRule : public Rule
enum DayPosType { DATE, POS };
MonthYearRule(const TQString& freqText, const TQString& freqWhatsThis, bool allowEveryWeek,
- bool readOnly, TQWidget* tqparent, const char* name = 0);
+ bool readOnly, TQWidget* parent, const char* name = 0);
DayPosType type() const;
int date() const; // if date in month is selected
int week() const; // if position is selected
@@ -165,7 +165,7 @@ class MonthYearRule : public Rule
class MonthlyRule : public MonthYearRule
{
public:
- MonthlyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ MonthlyRule(bool readOnly, TQWidget* parent, const char* name = 0);
};
// Yearly rule choices
@@ -174,7 +174,7 @@ class YearlyRule : public MonthYearRule
Q_OBJECT
TQ_OBJECT
public:
- YearlyRule(bool readOnly, TQWidget* tqparent, const char* name = 0);
+ YearlyRule(bool readOnly, TQWidget* parent, 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 ee197e73a..e10e04e22 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* tqparent, const char* name)
- : TQFrame(tqparent, name),
+ bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mReadOnly(false),
mOnceOnlyEnabled(showOnceOnly)
{
diff --git a/kalarm/reminder.h b/kalarm/reminder.h
index f9e2b57fc..7e58e8b71 100644
--- a/kalarm/reminder.h
+++ b/kalarm/reminder.h
@@ -33,7 +33,7 @@ class Reminder : public TQFrame
TQ_OBJECT
public:
Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis,
- bool allowHourMinute, bool showOnceOnly, TQWidget* tqparent, const char* name = 0);
+ bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name = 0);
bool isReminder() const;
bool isOnceOnly() const;
int minutes() const;
diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp
index 5dac94dcf..403250ba5 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* tqparent, const char* name)
- : TQPushButton(caption, tqparent, name),
+RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name)
+ : TQPushButton(caption, parent, 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* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, caption, Ok|Cancel),
+RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, caption, Ok|Cancel),
mMaxDuration(-1),
mDateOnly(false),
mReadOnly(readOnly)
diff --git a/kalarm/repetition.h b/kalarm/repetition.h
index c2b0ebd6c..a98493c55 100644
--- a/kalarm/repetition.h
+++ b/kalarm/repetition.h
@@ -37,7 +37,7 @@ class RepetitionButton : public TQPushButton
Q_OBJECT
TQ_OBJECT
public:
- RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* tqparent, const char* name = 0);
+ RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, 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
@@ -73,7 +73,7 @@ class RepetitionDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* tqparent = 0, const char* name = 0);
+ RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent = 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 feb53bd68..c7a6adcfb 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* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false),
+ const TQString& caption, TQWidget* parent, const char* name)
+ : KDialogBase(parent, name, true, caption, Ok|Cancel, Ok, false),
mReadOnly(false),
mArtsDispatcher(0),
mPlayObject(0),
diff --git a/kalarm/sounddlg.h b/kalarm/sounddlg.h
index bcc8dd92d..53dd2f96b 100644
--- a/kalarm/sounddlg.h
+++ b/kalarm/sounddlg.h
@@ -42,7 +42,7 @@ class SoundDlg : public KDialogBase
TQ_OBJECT
public:
SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat,
- const TQString& caption, TQWidget* tqparent, const char* name = 0);
+ const TQString& caption, TQWidget* parent, const char* name = 0);
~SoundDlg();
void setReadOnly(bool);
bool isReadOnly() const { return mReadOnly; }
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index c6915601b..ed55b8112 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* tqparent, const char* name)
- : TQFrame(tqparent, name)
+SoundPicker::SoundPicker(TQWidget* parent, const char* name)
+ : TQFrame(parent, name)
{
setFrameStyle(TQFrame::NoFrame);
TQHBoxLayout* soundLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
diff --git a/kalarm/soundpicker.h b/kalarm/soundpicker.h
index eaf0ec16b..5f89d5354 100644
--- a/kalarm/soundpicker.h
+++ b/kalarm/soundpicker.h
@@ -43,10 +43,10 @@ class SoundPicker : public TQFrame
*/
enum Type { NONE = 0, BEEP, PLAY_FILE, SPEAK };
/** Constructor.
- * @param tqparent The tqparent object of this widget.
+ * @param parent The parent object of this widget.
* @param name The name of this widget.
*/
- explicit SoundPicker(TQWidget* tqparent, const char* name = 0);
+ explicit SoundPicker(TQWidget* parent, 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
diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp
index 919524aff..02a0543f0 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* tqparent, const char* name)
- : TQPushButton(caption, tqparent, name),
+SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* parent, const char* name)
+ : TQPushButton(caption, parent, 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* tqparent, const char* name)
- : KDialogBase(tqparent, name, true, caption, Ok|Cancel, Ok, false)
+ const TQString& caption, TQWidget* parent, const char* name)
+ : KDialogBase(parent, 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* tqparent, const char* name)
- : TQWidget(tqparent, name),
+SpecialActions::SpecialActions(TQWidget* parent, const char* name)
+ : TQWidget(parent, name),
mReadOnly(false)
{
TQBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
diff --git a/kalarm/specialactions.h b/kalarm/specialactions.h
index 58f5c7d62..43d8cdf9d 100644
--- a/kalarm/specialactions.h
+++ b/kalarm/specialactions.h
@@ -33,7 +33,7 @@ class SpecialActionsButton : public TQPushButton
Q_OBJECT
TQ_OBJECT
public:
- SpecialActionsButton(const TQString& caption, TQWidget* tqparent = 0, const char* name = 0);
+ SpecialActionsButton(const TQString& caption, TQWidget* parent = 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; }
@@ -59,7 +59,7 @@ class SpecialActions : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- SpecialActions(TQWidget* tqparent = 0, const char* name = 0);
+ SpecialActions(TQWidget* parent = 0, const char* name = 0);
void setActions(const TQString& pre, const TQString& post);
TQString preAction() const;
TQString postAction() const;
@@ -80,7 +80,7 @@ class SpecialActionsDlg : public KDialogBase
TQ_OBJECT
public:
SpecialActionsDlg(const TQString& preAction, const TQString& postAction,
- const TQString& caption, TQWidget* tqparent = 0, const char* name = 0);
+ const TQString& caption, TQWidget* parent = 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/templatedlg.cpp b/kalarm/templatedlg.cpp
index 64a247c7d..fa176f8b9 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* tqparent, const char* name)
- : KDialogBase(KDialogBase::Plain, i18n("Alarm Templates"), Close, Ok, tqparent, name, false, true)
+TemplateDlg::TemplateDlg(TQWidget* parent, const char* name)
+ : KDialogBase(KDialogBase::Plain, i18n("Alarm Templates"), Close, Ok, parent, 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* tqparent, const char* name)
+TemplateDlg* TemplateDlg::create(TQWidget* parent, const char* name)
{
if (mInstance)
return 0;
- mInstance = new TemplateDlg(tqparent, name);
+ mInstance = new TemplateDlg(parent, 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* tqparent, TemplateListView* view)
+void TemplateDlg::createTemplate(const KAEvent* event, TQWidget* parent, TemplateListView* view)
{
- EditAlarmDlg editDlg(true, i18n("New Alarm Template"), tqparent, 0, event);
+ EditAlarmDlg editDlg(true, i18n("New Alarm Template"), parent, 0, event);
if (editDlg.exec() == TQDialog::Accepted)
{
KAEvent event;
diff --git a/kalarm/templatedlg.h b/kalarm/templatedlg.h
index 18ff7224c..7ea6fbef9 100644
--- a/kalarm/templatedlg.h
+++ b/kalarm/templatedlg.h
@@ -32,9 +32,9 @@ class TemplateDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- static TemplateDlg* create(TQWidget* tqparent = 0, const char* name = 0);
+ static TemplateDlg* create(TQWidget* parent = 0, const char* name = 0);
~TemplateDlg();
- static void createTemplate(const KAEvent* = 0, TQWidget* tqparent = 0, TemplateListView* = 0);
+ static void createTemplate(const KAEvent* = 0, TQWidget* parent = 0, TemplateListView* = 0);
signals:
void emptyToggled(bool notEmpty);
@@ -50,7 +50,7 @@ class TemplateDlg : public KDialogBase
void slotSelectionChanged();
private:
- TemplateDlg(TQWidget* tqparent, const char* name);
+ TemplateDlg(TQWidget* parent, const char* name);
static TemplateDlg* mInstance; // the current instance, to prevent multiple dialogues
diff --git a/kalarm/templatelistview.cpp b/kalarm/templatelistview.cpp
index 435789ce4..ac2852a7f 100644
--- a/kalarm/templatelistview.cpp
+++ b/kalarm/templatelistview.cpp
@@ -35,8 +35,8 @@
TQValueList<EventListViewBase*> TemplateListView::mInstanceList;
-TemplateListView::TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* tqparent, const char* name)
- : EventListViewBase(tqparent, name),
+TemplateListView::TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent, const char* name)
+ : EventListViewBase(parent, name),
mWhatsThisText(whatsThisText),
mIconColumn(0),
mNameColumn(1),
@@ -92,8 +92,8 @@ TQString TemplateListView::whatsThisText(int column) const
= Contains the details of one alarm for display in the TemplateListView.
=============================================================================*/
-TemplateListViewItem::TemplateListViewItem(TemplateListView* tqparent, const KAEvent& event)
- : EventListViewItemBase(tqparent, event)
+TemplateListViewItem::TemplateListViewItem(TemplateListView* parent, const KAEvent& event)
+ : EventListViewItemBase(parent, event)
{
setLastColumnText(); // set the template name column text
diff --git a/kalarm/templatelistview.h b/kalarm/templatelistview.h
index 512b1ad91..0ac98dea8 100644
--- a/kalarm/templatelistview.h
+++ b/kalarm/templatelistview.h
@@ -34,7 +34,7 @@ class TemplateListView;
class TemplateListViewItem : public EventListViewItemBase
{
public:
- TemplateListViewItem(TemplateListView* tqparent, const KAEvent&);
+ TemplateListViewItem(TemplateListView* parent, const KAEvent&);
TemplateListView* templateListView() const { return (TemplateListView*)listView(); }
// Overridden base class methods
TemplateListViewItem* nextSibling() const { return (TemplateListViewItem*)TQListViewItem::nextSibling(); }
@@ -51,7 +51,7 @@ class TemplateListView : public EventListViewBase
Q_OBJECT
TQ_OBJECT
public:
- explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* tqparent = 0, const char* name = 0);
+ explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent = 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 e32293690..3859a29a5 100644
--- a/kalarm/templatemenuaction.h
+++ b/kalarm/templatemenuaction.h
@@ -31,7 +31,7 @@ class TemplateMenuAction : public KActionMenu
TQ_OBJECT
public:
TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver,
- const char* slot, KActionCollection* tqparent, const char* name = 0);
+ const char* slot, KActionCollection* parent, const char* name = 0);
signals:
void selected(const KAEvent&);
diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp
index fd0a5ebf8..3df2d8dd7 100644
--- a/kalarm/templatepickdlg.cpp
+++ b/kalarm/templatepickdlg.cpp
@@ -34,8 +34,8 @@
static const char TMPL_PICK_DIALOG_NAME[] = "TemplatePickDialog";
-TemplatePickDlg::TemplatePickDlg(TQWidget* tqparent, const char* name)
- : KDialogBase(KDialogBase::Plain, i18n("Choose Alarm Template"), Ok|Cancel, Ok, tqparent, name)
+TemplatePickDlg::TemplatePickDlg(TQWidget* parent, const char* name)
+ : KDialogBase(KDialogBase::Plain, i18n("Choose Alarm Template"), Ok|Cancel, Ok, parent, name)
{
TQWidget* topWidget = plainPage();
TQBoxLayout* topLayout = new TQVBoxLayout(topWidget);
diff --git a/kalarm/templatepickdlg.h b/kalarm/templatepickdlg.h
index 7c99f6f35..4cbfc3d1a 100644
--- a/kalarm/templatepickdlg.h
+++ b/kalarm/templatepickdlg.h
@@ -31,7 +31,7 @@ class TemplatePickDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- TemplatePickDlg(TQWidget* tqparent = 0, const char* name = 0);
+ TemplatePickDlg(TQWidget* parent = 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 0c88d93c5..31e69d749 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* tqparent, const char* name)
- : TQFrame(tqparent, name),
+ const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name)
+ : TQFrame(parent, name),
mLabel(0),
mReadOnly(false)
{
diff --git a/kalarm/timeselector.h b/kalarm/timeselector.h
index 1508194c7..1e8304f95 100644
--- a/kalarm/timeselector.h
+++ b/kalarm/timeselector.h
@@ -34,7 +34,7 @@ class TimeSelector : public TQFrame
TQ_OBJECT
public:
TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis,
- const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* tqparent, const char* name = 0);
+ const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, 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 21efed812..906ff2cc5 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -53,7 +53,7 @@
class TrayTooltip : public TQToolTip
{
public:
- TrayTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { }
+ TrayTooltip(TQWidget* parent) : TQToolTip(parent) { }
virtual ~TrayTooltip() {}
protected:
virtual void maybeTip(const TQPoint&);
@@ -71,9 +71,9 @@ struct TipItem
= The KDE system tray window.
=============================================================================*/
-TrayWindow::TrayWindow(MainWindow* tqparent, const char* name)
- : KSystemTray((theApp()->wantRunInSystemTray() ? tqparent : 0), name),
- mAssocMainWindow(tqparent)
+TrayWindow::TrayWindow(MainWindow* parent, const char* name)
+ : KSystemTray((theApp()->wantRunInSystemTray() ? parent : 0), name),
+ mAssocMainWindow(parent)
{
kdDebug(5950) << "TrayWindow::TrayWindow()\n";
// Set up GUI icons
@@ -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 tqparent. So for a definitive status, call this method
+* becomes the widget's parent. 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 tqparent window
+ Window xParent; // receives parent window
Window root;
Window* tqchildren = 0;
unsigned int ntqchildren;
- // Find the X tqparent window of the widget. This is not the same as the TQt tqparent widget.
+ // Find the X parent window of the widget. This is not the same as the TQt parent widget.
if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &tqchildren, &ntqchildren))
- return true; // error determining its tqparent X window
+ return true; // error determining its parent 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.
+ // 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.
return xParent != root;
#else
return true;
@@ -348,7 +348,7 @@ bool TrayWindow::inSystemTray() const
*/
void TrayTooltip::maybeTip(const TQPoint&)
{
- TrayWindow* tqparent = (TrayWindow*)parentWidget();
+ TrayWindow* parent = (TrayWindow*)parentWidget();
TQString text;
if (Daemon::monitoringAlarms())
text = kapp->aboutData()->programName();
@@ -356,6 +356,6 @@ void TrayTooltip::maybeTip(const TQPoint&)
text = i18n("%1 - disabled").tqarg(kapp->aboutData()->programName());
kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl;
if (Preferences::tooltipAlarmCount())
- tqparent->tooltipAlarmText(text);
- tip(tqparent->rect(), text);
+ parent->tooltipAlarmText(text);
+ tip(parent->rect(), text);
}
diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h
index 371082cc4..e1d9ff078 100644
--- a/kalarm/traywindow.h
+++ b/kalarm/traywindow.h
@@ -34,7 +34,7 @@ class TrayWindow : public KSystemTray
Q_OBJECT
TQ_OBJECT
public:
- TrayWindow(MainWindow* tqparent, const char* name = 0);
+ TrayWindow(MainWindow* parent, const char* name = 0);
~TrayWindow();
void removeWindow(MainWindow*);
MainWindow* assocMainWindow() const { return mAssocMainWindow; }
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index 4d951c17f..63168f45e 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -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* tqparent, const TQString& action)
+bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, 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* tqparent, const TQ
default:
return true;
}
- KAlarm::displayKOrgUpdateError(tqparent, errcode, UndoItem::mRestoreWarningCount);
+ KAlarm::displayKOrgUpdateError(parent, 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* tqparent, const TQ
case UndoItem::ERR_PROG: err = i18n("Program error"); break;
default: err = i18n("Unknown error"); break;
}
- KMessageBox::sorry(tqparent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err));
+ KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err));
return false;
}
diff --git a/kalarm/undo.h b/kalarm/undo.h
index 2bc2ca1e5..6ad5dd513 100644
--- a/kalarm/undo.h
+++ b/kalarm/undo.h
@@ -44,14 +44,14 @@ class Undo : public TQObject
static void saveDeletes(const TQValueList<KAEvent>&);
static void saveReactivate(const KAEvent&);
static void saveReactivates(const TQValueList<KAEvent>&);
- 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 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 void clear();
static bool haveUndo() { return !mUndoList.isEmpty(); }
static bool haveRedo() { return !mRedoList.isEmpty(); }
@@ -76,9 +76,9 @@ class Undo : public TQObject
private:
typedef TQValueList<UndoItem*>::Iterator Iterator;
- Undo(TQObject* tqparent) : TQObject(tqparent) { }
+ Undo(TQObject* parent) : TQObject(parent) { }
static void removeRedos(const TQString& eventID);
- static bool undo(Iterator, Type, TQWidget* tqparent, const TQString& action);
+ static bool undo(Iterator, Type, TQWidget* parent, const TQString& action);
static UndoItem* getItem(int id, Type);
static Iterator findItem(int id, Type);
void emitChanged(const TQString& undo, const TQString& redo)