summaryrefslogtreecommitdiffstats
path: root/kplato
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
commit04766b207afba7961d4d802313e426f5a2fbef63 (patch)
treec888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /kplato
parentb6edfe41c9395f2e20784cbf0e630af6426950a3 (diff)
downloadkoffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz
koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kplato')
-rw-r--r--kplato/intervalitem.h4
-rw-r--r--kplato/kptaccount.cc10
-rw-r--r--kplato/kptaccount.h4
-rw-r--r--kplato/kptaccountsdialog.h2
-rw-r--r--kplato/kptaccountspanel.cc38
-rw-r--r--kplato/kptaccountspanel.h2
-rw-r--r--kplato/kptaccountsview.cc38
-rw-r--r--kplato/kptaccountsview.h12
-rw-r--r--kplato/kptaccountsviewconfigdialog.cc4
-rw-r--r--kplato/kptaccountsviewconfigdialog.h4
-rw-r--r--kplato/kptcalendar.cc14
-rw-r--r--kplato/kptcalendar.h8
-rw-r--r--kplato/kptcalendaredit.cc4
-rw-r--r--kplato/kptcalendaredit.h2
-rw-r--r--kplato/kptcalendareditbase.cc6
-rw-r--r--kplato/kptcalendareditbase.h2
-rw-r--r--kplato/kptcalendarlistdialog.cc14
-rw-r--r--kplato/kptcalendarlistdialog.h4
-rw-r--r--kplato/kptcalendarlistdialogbase.cc4
-rw-r--r--kplato/kptcalendarlistdialogbase.h2
-rw-r--r--kplato/kptcalendarpanel.cc8
-rw-r--r--kplato/kptcalendarpanel.h4
-rw-r--r--kplato/kptcanvasitem.cc56
-rw-r--r--kplato/kptcanvasitem.h14
-rw-r--r--kplato/kptcommand.cc94
-rw-r--r--kplato/kptcommand.h10
-rw-r--r--kplato/kptconfigbehaviorpanel.h2
-rw-r--r--kplato/kptconfigdialog.cc4
-rw-r--r--kplato/kptconfigdialog.h2
-rw-r--r--kplato/kptdatetable.cc24
-rw-r--r--kplato/kptdatetable.h12
-rw-r--r--kplato/kptdoublelistviewbase.cc36
-rw-r--r--kplato/kptdoublelistviewbase.h18
-rw-r--r--kplato/kptfactory.cc8
-rw-r--r--kplato/kptfactory.h4
-rw-r--r--kplato/kptganttview.cc16
-rw-r--r--kplato/kptganttview.h2
-rw-r--r--kplato/kptintervaledit.cc8
-rw-r--r--kplato/kptintervaledit.h4
-rw-r--r--kplato/kptmainprojectdialog.cc4
-rw-r--r--kplato/kptmainprojectdialog.h2
-rw-r--r--kplato/kptmainprojectpanel.cc8
-rw-r--r--kplato/kptmainprojectpanel.h4
-rw-r--r--kplato/kptmilestoneprogressdialog.h2
-rw-r--r--kplato/kptmilestoneprogresspanel.cc8
-rw-r--r--kplato/kptmilestoneprogresspanel.h4
-rw-r--r--kplato/kptnode.cc24
-rw-r--r--kplato/kptnode.h10
-rw-r--r--kplato/kptpart.cc16
-rw-r--r--kplato/kptpart.h4
-rw-r--r--kplato/kptpertcanvas.cc8
-rw-r--r--kplato/kptpertcanvas.h2
-rw-r--r--kplato/kptpertview.cc4
-rw-r--r--kplato/kptpertview.h2
-rw-r--r--kplato/kptproject.cc64
-rw-r--r--kplato/kptproject.h10
-rw-r--r--kplato/kptprojectdialog.cc6
-rw-r--r--kplato/kptprojectdialog.h4
-rw-r--r--kplato/kptrelation.cc24
-rw-r--r--kplato/kptrelation.h16
-rw-r--r--kplato/kptrelationdialog.cc2
-rw-r--r--kplato/kptreportview.cc8
-rw-r--r--kplato/kptreportview.h2
-rw-r--r--kplato/kptrequestresourcespanel.cc8
-rw-r--r--kplato/kptrequestresourcespanel.h4
-rw-r--r--kplato/kptresource.cc8
-rw-r--r--kplato/kptresource.h10
-rw-r--r--kplato/kptresourceappointmentsview.cc16
-rw-r--r--kplato/kptresourceappointmentsview.h10
-rw-r--r--kplato/kptresourcedialog.cc8
-rw-r--r--kplato/kptresourcedialog.h4
-rw-r--r--kplato/kptresourcesdialog.cc4
-rw-r--r--kplato/kptresourcesdialog.h2
-rw-r--r--kplato/kptresourcespanel.cc2
-rw-r--r--kplato/kptresourcespanel.h2
-rw-r--r--kplato/kptresourceview.cc28
-rw-r--r--kplato/kptresourceview.h4
-rw-r--r--kplato/kptschedule.cc36
-rw-r--r--kplato/kptschedule.h10
-rw-r--r--kplato/kptstandardworktimedialog.cc12
-rw-r--r--kplato/kptstandardworktimedialog.h4
-rw-r--r--kplato/kptsummarytaskdialog.h4
-rw-r--r--kplato/kptsummarytaskgeneralpanel.h2
-rw-r--r--kplato/kpttask.cc44
-rw-r--r--kplato/kpttask.h6
-rw-r--r--kplato/kpttaskappointmentsview.cc12
-rw-r--r--kplato/kpttaskappointmentsview.h8
-rw-r--r--kplato/kpttaskcostpanel.h4
-rw-r--r--kplato/kpttaskdefaultpanel.cc8
-rw-r--r--kplato/kpttaskdefaultpanel.h6
-rw-r--r--kplato/kpttaskdialog.h4
-rw-r--r--kplato/kpttaskgeneralpanel.cc4
-rw-r--r--kplato/kpttaskgeneralpanel.h6
-rw-r--r--kplato/kpttaskprogressdialog.h2
-rw-r--r--kplato/kpttaskprogresspanel.cc8
-rw-r--r--kplato/kpttaskprogresspanel.h4
-rw-r--r--kplato/kptview.cc8
-rw-r--r--kplato/kptview.h2
-rw-r--r--kplato/kptwbsdefinitiondialog.h2
-rw-r--r--kplato/kptwbsdefinitionpanel.h2
-rw-r--r--kplato/tests/CalendarTester.cpp2
101 files changed, 526 insertions, 526 deletions
diff --git a/kplato/intervalitem.h b/kplato/intervalitem.h
index 2ee6b4c6..4e0cb704 100644
--- a/kplato/intervalitem.h
+++ b/kplato/intervalitem.h
@@ -30,8 +30,8 @@ namespace KPlato
class IntervalItem : public TQListViewItem
{
public:
- IntervalItem(TQListView * tqparent, TQTime start, TQTime end)
- : TQListViewItem(tqparent, TQString("%1 - %2").tqarg(start.toString(), end.toString())),
+ IntervalItem(TQListView * parent, TQTime start, TQTime end)
+ : TQListViewItem(parent, TQString("%1 - %2").tqarg(start.toString(), end.toString())),
m_start(start),
m_end(end)
{}
diff --git a/kplato/kptaccount.cc b/kplato/kptaccount.cc
index 074189d3..4c457193 100644
--- a/kplato/kptaccount.cc
+++ b/kplato/kptaccount.cc
@@ -95,10 +95,10 @@ void Account::take(Account *account) {
if (account == 0) {
return;
}
- if (account->tqparent() == this) {
+ if (account->parent() == this) {
m_accountList.take(m_accountList.findRef(account));
- } else if (account->tqparent()) {
- account->tqparent()->take(account);
+ } else if (account->parent()) {
+ account->parent()->take(account);
} else {
m_list->take(account);
}
@@ -383,8 +383,8 @@ void Accounts::take(Account *account){
return;
}
removeId(account->name());
- if (account->tqparent()) {
- account->tqparent()->take(account);
+ if (account->parent()) {
+ account->parent()->take(account);
return;
}
m_accountList.take(m_accountList.findRef(account));
diff --git a/kplato/kptaccount.h b/kplato/kptaccount.h
index 9e23b8e7..61ecf72d 100644
--- a/kplato/kptaccount.h
+++ b/kplato/kptaccount.h
@@ -75,8 +75,8 @@ public:
Accounts *list() const { return m_list; }
void setList(Accounts *list) { m_list = list; }
- Account *tqparent() const { return m_parent; }
- void setParent(Account *tqparent) { m_parent = tqparent; }
+ Account *parent() const { return m_parent; }
+ void setParent(Account *parent) { m_parent = parent; }
void clear() { m_accountList.clear(); }
void append(Account *account);
void take(Account *account);
diff --git a/kplato/kptaccountsdialog.h b/kplato/kptaccountsdialog.h
index e9bb8d4e..e281f2df 100644
--- a/kplato/kptaccountsdialog.h
+++ b/kplato/kptaccountsdialog.h
@@ -37,7 +37,7 @@ class AccountsDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- AccountsDialog(Accounts &acc, TQWidget *tqparent=0, const char *name=0);
+ AccountsDialog(Accounts &acc, TQWidget *parent=0, const char *name=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptaccountspanel.cc b/kplato/kptaccountspanel.cc
index a27bd908..b5082af0 100644
--- a/kplato/kptaccountspanel.cc
+++ b/kplato/kptaccountspanel.cc
@@ -39,23 +39,23 @@ namespace KPlato
class AccountItem : public KListViewItem {
public:
- AccountItem(AccountsPanel &pan, TQListView *tqparent)
- : KListViewItem(tqparent), account(0), panel(pan)
+ AccountItem(AccountsPanel &pan, TQListView *parent)
+ : KListViewItem(parent), account(0), panel(pan)
{ init(); }
- AccountItem(AccountsPanel &pan, TQListViewItem *tqparent)
- : KListViewItem(tqparent), account(0), panel(pan)
+ AccountItem(AccountsPanel &pan, TQListViewItem *parent)
+ : KListViewItem(parent), account(0), panel(pan)
{ init(); }
- AccountItem(AccountsPanel &pan, TQListView *tqparent, TQString label1, TQString label2 = TQString())
- : KListViewItem(tqparent, label1, label2), account(0), panel(pan)
+ AccountItem(AccountsPanel &pan, TQListView *parent, TQString label1, TQString label2 = TQString())
+ : KListViewItem(parent, label1, label2), account(0), panel(pan)
{ init(); }
- AccountItem(AccountsPanel &pan, TQListViewItem *tqparent, TQString label1, TQString label2 = TQString())
- : KListViewItem(tqparent, label1, label2), account(0), panel(pan)
+ AccountItem(AccountsPanel &pan, TQListViewItem *parent, TQString label1, TQString label2 = TQString())
+ : KListViewItem(parent, label1, label2), account(0), panel(pan)
{ init(); }
- AccountItem(AccountsPanel &pan, TQListView *tqparent, TQListViewItem *after)
- : KListViewItem(tqparent, after), account(0), panel(pan)
+ AccountItem(AccountsPanel &pan, TQListView *parent, TQListViewItem *after)
+ : KListViewItem(parent, after), account(0), panel(pan)
{ init(); }
- AccountItem(AccountsPanel &pan, TQListViewItem *tqparent, TQListViewItem *after)
- : KListViewItem(tqparent, after), account(0), panel(pan)
+ AccountItem(AccountsPanel &pan, TQListViewItem *parent, TQListViewItem *after)
+ : KListViewItem(parent, after), account(0), panel(pan)
{ init(); }
Account *account;
@@ -148,8 +148,8 @@ void AccountsPanel::addItems(TQListViewItem *item, Account *acc) {
}
void AccountsPanel::addElement(const TQListViewItem *item) {
- if (item->tqparent()) {
- removeElement(item->tqparent());
+ if (item->parent()) {
+ removeElement(item->parent());
}
m_elements.replace(item->text(0), item);
//kdDebug()<<k_funcinfo<<item->text(0)<<endl;
@@ -277,8 +277,8 @@ void AccountsPanel::slotNewBtn() {
}
TQListViewItem *n;
if (item) {
- if (item->tqparent()) {
- n = new AccountItem(*this, item->tqparent(), item);
+ if (item->parent()) {
+ n = new AccountItem(*this, item->parent(), item);
} else {
n = new AccountItem(*this, accountList, item);
}
@@ -344,9 +344,9 @@ KCommand *AccountsPanel::save(Part *part, Project &project, TQListViewItem *i) {
//kdDebug()<<k_funcinfo<<"New account: "<<item->text(0)<<endl;
if (!cmd) cmd = new KMacroCommand("");
item->account = new Account(item->text(0), item->text(1));
- if (item->tqparent()) {
+ if (item->parent()) {
//kdDebug()<<k_funcinfo<<"New account: "<<item->text(0)<<endl;
- cmd->addCommand(new AddAccountCmd(part, project, item->account, item->tqparent()->text(0)));
+ cmd->addCommand(new AddAccountCmd(part, project, item->account, item->parent()->text(0)));
} else {
cmd->addCommand(new AddAccountCmd(part, project, item->account));
}
@@ -415,7 +415,7 @@ void AccountsPanel::slotRemoveItem(TQListViewItem *i) {
return;
//kdDebug()<<k_funcinfo<<item->text(0)<<endl;
removeElement(item);
- TQListViewItem *p = item->tqparent();
+ TQListViewItem *p = item->parent();
if (p) {
p->takeItem(item);
if (item->account) {
diff --git a/kplato/kptaccountspanel.h b/kplato/kptaccountspanel.h
index 6e1646f7..069515cb 100644
--- a/kplato/kptaccountspanel.h
+++ b/kplato/kptaccountspanel.h
@@ -45,7 +45,7 @@ class AccountsPanel : public AccountsPanelBase {
Q_OBJECT
TQ_OBJECT
public:
- AccountsPanel(Accounts &acc, TQWidget *tqparent=0, const char *name=0);
+ AccountsPanel(Accounts &acc, TQWidget *parent=0, const char *name=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc
index d9e0c33d..9825d9c2 100644
--- a/kplato/kptaccountsview.cc
+++ b/kplato/kptaccountsview.cc
@@ -64,10 +64,10 @@ public:
}
};
-AccountsView::AccountItem::AccountItem(Account *a, TQListView *tqparent, bool highlight)
- : DoubleListViewBase::MasterListItem(tqparent, a->name(), highlight),
+AccountsView::AccountItem::AccountItem(Account *a, TQListView *parent, bool highlight)
+ : DoubleListViewBase::MasterListItem(parent, a->name(), highlight),
account(a) {
- if (tqparent->columns() >= 3) {
+ if (parent->columns() >= 3) {
setText(2, a->description());
}
//kdDebug()<<k_funcinfo<<endl;
@@ -81,8 +81,8 @@ AccountsView::AccountItem::AccountItem(Account *a, TQListViewItem *p, bool highl
//kdDebug()<<k_funcinfo<<endl;
}
-AccountsView::AccountItem::AccountItem(TQString text, Account *a, TQListViewItem *tqparent, bool highlight)
- : DoubleListViewBase::MasterListItem(tqparent, text, highlight),
+AccountsView::AccountItem::AccountItem(TQString text, Account *a, TQListViewItem *parent, bool highlight)
+ : DoubleListViewBase::MasterListItem(parent, text, highlight),
account(a) {
//kdDebug()<<k_funcinfo<<endl;
}
@@ -93,8 +93,8 @@ void AccountsView::AccountItem::add(int col, const TQDate &date, const EffortCos
m_slaveItem->setText(col, KGlobal::locale()->formatMoney(cm.cost(), "", 0));
}
-AccountsView::AccountsView(Project &project, View *view, TQWidget *tqparent)
- : TQWidget(tqparent, "Accounts view"),
+AccountsView::AccountsView(Project &project, View *view, TQWidget *parent)
+ : TQWidget(parent, "Accounts view"),
m_mainview(view),
m_project(project),
m_accounts(project.accounts()) {
@@ -165,32 +165,32 @@ void AccountsView::initAccList(const AccountList &list) {
createPeriods();
}
-void AccountsView::initAccSubItems(Account *acc, AccountsView::AccountItem *tqparent) {
+void AccountsView::initAccSubItems(Account *acc, AccountsView::AccountItem *parent) {
if (!acc->accountList().isEmpty()) {
-/* AccountsView::AccountItem *a = new AccountsView::AccountItem(i18n("Subaccounts"), acc, tqparent);
- DoubleListViewBase::SlaveListItem *i = new DoubleListViewBase::SlaveListItem(a, tqparent->period);
+/* AccountsView::AccountItem *a = new AccountsView::AccountItem(i18n("Subaccounts"), acc, parent);
+ DoubleListViewBase::SlaveListItem *i = new DoubleListViewBase::SlaveListItem(a, parent->period);
a->period = i;*/
- initAccList(acc->accountList(), tqparent);
+ initAccList(acc->accountList(), parent);
}
-// AccountsView::AccountItem *a = new AccountsView::AccountItem(i18n("Variance"), acc, tqparent, true);
-// DoubleListViewBase::SlaveListItem *i = new DoubleListViewBase::SlaveListItem(a, tqparent->period, true);
+// AccountsView::AccountItem *a = new AccountsView::AccountItem(i18n("Variance"), acc, parent, true);
+// DoubleListViewBase::SlaveListItem *i = new DoubleListViewBase::SlaveListItem(a, parent->period, true);
// a->period = i;
//
-// a = new AccountsView::AccountItem(i18n("Actual"), acc, tqparent);
-// i = new DoubleListViewBase::SlaveListItem(a, tqparent->period);
+// a = new AccountsView::AccountItem(i18n("Actual"), acc, parent);
+// i = new DoubleListViewBase::SlaveListItem(a, parent->period);
// a->period = i;
//
-// a = new AccountsView::AccountItem(i18n("Planned"), acc, tqparent);
-// i = new DoubleListViewBase::SlaveListItem(a, tqparent->period);
+// a = new AccountsView::AccountItem(i18n("Planned"), acc, parent);
+// i = new DoubleListViewBase::SlaveListItem(a, parent->period);
// a->period = i;
}
-void AccountsView::initAccList(const AccountList &list, AccountsView::AccountItem *tqparent) {
+void AccountsView::initAccList(const AccountList &list, AccountsView::AccountItem *parent) {
AccountListIterator it = list;
for (it.toLast(); it.current(); --it) {
- AccountsView::AccountItem *a = new AccountsView::AccountItem(it.current(), tqparent);
+ AccountsView::AccountItem *a = new AccountsView::AccountItem(it.current(), parent);
a->setOpen(true);
a->setExpandable(!it.current()->isElement());
initAccSubItems(it.current(), a);
diff --git a/kplato/kptaccountsview.h b/kplato/kptaccountsview.h
index 973d7484..d3fea502 100644
--- a/kplato/kptaccountsview.h
+++ b/kplato/kptaccountsview.h
@@ -61,7 +61,7 @@ class AccountsView : public TQWidget
TQ_OBJECT
public:
- AccountsView(Project &project, View *view, TQWidget *tqparent);
+ AccountsView(Project &project, View *view, TQWidget *parent);
//~AccountsView();
@@ -90,9 +90,9 @@ protected:
private:
class AccountItem : public DoubleListViewBase::MasterListItem {
public:
- AccountItem(Account *a, TQListView *tqparent, bool highlight=false);
- AccountItem(Account *a, TQListViewItem *tqparent, bool highlight=false);
- AccountItem(TQString text, Account *a, TQListViewItem *tqparent, bool _highlight=false);
+ AccountItem(Account *a, TQListView *parent, bool highlight=false);
+ AccountItem(Account *a, TQListViewItem *parent, bool highlight=false);
+ AccountItem(TQString text, Account *a, TQListViewItem *parent, bool _highlight=false);
void add(int col, const TQDate &date, const EffortCost &ec);
@@ -102,8 +102,8 @@ private:
void init();
void initAccList(const AccountList &list);
- void initAccSubItems(Account *acc, AccountItem *tqparent);
- void initAccList(const AccountList &list, AccountItem *tqparent);
+ void initAccSubItems(Account *acc, AccountItem *parent);
+ void initAccList(const AccountList &list, AccountItem *parent);
void createPeriods();
void clearPeriods();
TQString periodText(int offset);
diff --git a/kplato/kptaccountsviewconfigdialog.cc b/kplato/kptaccountsviewconfigdialog.cc
index 595061d2..0d1a1015 100644
--- a/kplato/kptaccountsviewconfigdialog.cc
+++ b/kplato/kptaccountsviewconfigdialog.cc
@@ -67,8 +67,8 @@ bool AccountsviewConfigDialog::isCumulative() {
//----------------------------
-AccountsviewConfigPanel::AccountsviewConfigPanel(TQWidget *tqparent)
- : AccountsviewConfigurePanelBase(tqparent) {
+AccountsviewConfigPanel::AccountsviewConfigPanel(TQWidget *parent)
+ : AccountsviewConfigurePanelBase(parent) {
connect(dateEdit, TQT_SIGNAL(changed(TQDate)), TQT_SLOT(slotChanged()));
connect(periodBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
diff --git a/kplato/kptaccountsviewconfigdialog.h b/kplato/kptaccountsviewconfigdialog.h
index 946481fd..567f1821 100644
--- a/kplato/kptaccountsviewconfigdialog.h
+++ b/kplato/kptaccountsviewconfigdialog.h
@@ -37,7 +37,7 @@ class AccountsviewConfigDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- AccountsviewConfigDialog(const TQDate &date, int period, const TQStringList &periodTexts, bool cumulative, TQWidget *tqparent);
+ AccountsviewConfigDialog(const TQDate &date, int period, const TQStringList &periodTexts, bool cumulative, TQWidget *parent);
TQDate date();
int period();
@@ -52,7 +52,7 @@ class AccountsviewConfigPanel : public AccountsviewConfigurePanelBase {
Q_OBJECT
TQ_OBJECT
public:
- AccountsviewConfigPanel(TQWidget *tqparent);
+ AccountsviewConfigPanel(TQWidget *parent);
public slots:
void slotChanged();
diff --git a/kplato/kptcalendar.cc b/kplato/kptcalendar.cc
index 9412f30e..486c3dac 100644
--- a/kplato/kptcalendar.cc
+++ b/kplato/kptcalendar.cc
@@ -507,9 +507,9 @@ Calendar::Calendar()
init();
}
-Calendar::Calendar(TQString name, Calendar *tqparent)
+Calendar::Calendar(TQString name, Calendar *parent)
: m_name(name),
- m_parent(tqparent),
+ m_parent(parent),
m_project(0),
m_deleted(false),
m_days() {
@@ -531,7 +531,7 @@ Calendar::Calendar(Calendar *calendar)
const Calendar &Calendar::copy(Calendar &calendar) {
m_name = calendar.name();
- m_parent = calendar.tqparent();
+ m_parent = calendar.parent();
m_deleted = calendar.isDeleted();
m_id = calendar.id();
@@ -605,9 +605,9 @@ bool Calendar::load(TQDomElement &element) {
//kdDebug()<<k_funcinfo<<element.text()<<endl;
//bool ok;
setId(element.attribute("id"));
- m_parentId = element.attribute("tqparent");
+ m_parentId = element.attribute("parent");
m_name = element.attribute("name","");
- //TODO tqparent
+ //TODO parent
TQDomNodeList list = element.childNodes();
for (unsigned int i=0; i<list.count(); ++i) {
@@ -651,7 +651,7 @@ void Calendar::save(TQDomElement &element) const {
TQDomElement me = element.ownerDocument().createElement("calendar");
element.appendChild(me);
if (m_parent && !m_parent->isDeleted())
- me.setAttribute("tqparent", m_parent->id());
+ me.setAttribute("parent", m_parent->id());
me.setAttribute("name", m_name);
me.setAttribute("id", m_id);
m_weekdays->save(me);
@@ -1014,7 +1014,7 @@ void CalendarWeekdays::printDebug(TQCString indent) {
}
void Calendar::printDebug(TQCString indent) {
kdDebug()<<indent<<"Calendar "<<m_id<<": '"<<m_name<<"' Deleted="<<m_deleted<<endl;
- kdDebug()<<indent<<" Parent: "<<(m_parent ? m_parent->name() : "No tqparent")<<endl;
+ kdDebug()<<indent<<" Parent: "<<(m_parent ? m_parent->name() : "No parent")<<endl;
m_weekdays->printDebug(indent + " ");
kdDebug()<<indent<<" Days --------"<<endl;
TQPtrListIterator<CalendarDay> it = m_days;
diff --git a/kplato/kptcalendar.h b/kplato/kptcalendar.h
index 6e35622a..09c3980c 100644
--- a/kplato/kptcalendar.h
+++ b/kplato/kptcalendar.h
@@ -187,7 +187,7 @@ public:
/**
* Calendar defines the working and nonworking days and hours.
* A day can have the three states None (Undefined), NonWorking, or Working.
- * A calendar can have a tqparent calendar that defines the days that are
+ * A calendar can have a parent calendar that defines the days that are
* undefined in this calendar. If a day is still undefined, it defaults
* to Nonworking.
* A Working day has one or more work intervals to define the work hours.
@@ -205,15 +205,15 @@ class Calendar {
public:
Calendar();
- Calendar(TQString name, Calendar *tqparent=0);
+ Calendar(TQString name, Calendar *parent=0);
Calendar(Calendar *calendar);
~Calendar();
TQString name() const { return m_name; }
void setName(TQString name) { m_name = name; }
- Calendar *tqparent() const { return m_parent; }
- void setParent(Calendar *tqparent) { m_parent = tqparent; }
+ Calendar *parent() const { return m_parent; }
+ void setParent(Calendar *parent) { m_parent = parent; }
Project *project() const { return m_project; }
void setProject(Project *project);
diff --git a/kplato/kptcalendaredit.cc b/kplato/kptcalendaredit.cc
index 297fc64d..ab2df8bd 100644
--- a/kplato/kptcalendaredit.cc
+++ b/kplato/kptcalendaredit.cc
@@ -49,8 +49,8 @@
namespace KPlato
{
-CalendarEdit::CalendarEdit (TQWidget *tqparent, const char */*name*/)
- : CalendarEditBase(tqparent),
+CalendarEdit::CalendarEdit (TQWidget *parent, const char */*name*/)
+ : CalendarEditBase(parent),
m_calendar(0)
{
diff --git a/kplato/kptcalendaredit.h b/kplato/kptcalendaredit.h
index d2a8f853..7f602712 100644
--- a/kplato/kptcalendaredit.h
+++ b/kplato/kptcalendaredit.h
@@ -35,7 +35,7 @@ class CalendarEdit : public CalendarEditBase {
Q_OBJECT
TQ_OBJECT
public:
- CalendarEdit (TQWidget *tqparent=0, const char *name=0);
+ CalendarEdit (TQWidget *parent=0, const char *name=0);
Calendar *getCalendar() { return m_calendar; }
void setCalendar(Calendar *cal);
diff --git a/kplato/kptcalendareditbase.cc b/kplato/kptcalendareditbase.cc
index e9bbd00a..aaa6fab0 100644
--- a/kplato/kptcalendareditbase.cc
+++ b/kplato/kptcalendareditbase.cc
@@ -39,11 +39,11 @@ namespace KPlato
{
/*
- * Constructs a CalendarEditBase as a child of 'tqparent', with the
+ * Constructs a CalendarEditBase as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-CalendarEditBase::CalendarEditBase( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "CalendarEditBase" );
diff --git a/kplato/kptcalendareditbase.h b/kplato/kptcalendareditbase.h
index cdf4d621..df2f9c0c 100644
--- a/kplato/kptcalendareditbase.h
+++ b/kplato/kptcalendareditbase.h
@@ -46,7 +46,7 @@ class CalendarEditBase : public TQWidget
TQ_OBJECT
public:
- CalendarEditBase( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ CalendarEditBase( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~CalendarEditBase();
TQGroupBox* groupBox2;
diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cc
index 5fe590ec..b5a2d59c 100644
--- a/kplato/kptcalendarlistdialog.cc
+++ b/kplato/kptcalendarlistdialog.cc
@@ -87,7 +87,7 @@ public:
macro->addCommand(new CalendarModifyNameCmd(part, original, calendar->name()));
}
Calendar *c = base ? base->baseCalendar() : 0;
- if (c != original->tqparent()) {
+ if (c != original->parent()) {
if (macro == 0) macro = new KMacroCommand("");
macro->addCommand(new CalendarModifyParentCmd(part, original, c));
//kdDebug()<<k_funcinfo<<"Base modified: "<<c->name()<<endl;
@@ -163,8 +163,8 @@ private:
};
//----------------------------------------------------
-CalendarListDialog::CalendarListDialog(Project &p, TQWidget *tqparent, const char *name)
- : KDialogBase( Swallow, i18n("Calendar's Settings"), Ok|Cancel, Ok, tqparent, name, true, true),
+CalendarListDialog::CalendarListDialog(Project &p, TQWidget *parent, const char *name)
+ : KDialogBase( Swallow, i18n("Calendar's Settings"), Ok|Cancel, Ok, parent, name, true, true),
project(p)
{
//kdDebug()<<k_funcinfo<<&p<<endl;
@@ -224,8 +224,8 @@ void CalendarListDialog::slotOk() {
}
//--------------------------------------------------
-CalendarListDialogImpl::CalendarListDialogImpl (Project &p, TQWidget *tqparent)
- : CalendarListDialogBase(tqparent),
+CalendarListDialogImpl::CalendarListDialogImpl (Project &p, TQWidget *parent)
+ : CalendarListDialogBase(parent),
project(p),
m_renameItem(0) {
@@ -263,7 +263,7 @@ void CalendarListDialogImpl::setBaseCalendars() {
for (;it.current(); ++it) {
CalendarListViewItem *item = dynamic_cast<CalendarListViewItem *>(it.current());
if (item) {
- item->base = findItem(item->calendar->tqparent());
+ item->base = findItem(item->calendar->parent());
}
}
}
@@ -311,7 +311,7 @@ void CalendarListDialogImpl::slotSelectionChanged(TQListViewItem *listItem) {
i++;
if (item == cal->base) {
me = i;
- //kdDebug()<<k_funcinfo<<"item="<<item<<": cal="<<cal->calendar->name()<<" has tqparent "<<cal->base->calendar->name()<<endl;
+ //kdDebug()<<k_funcinfo<<"item="<<item<<": cal="<<cal->calendar->name()<<" has parent "<<cal->base->calendar->name()<<endl;
}
}
}
diff --git a/kplato/kptcalendarlistdialog.h b/kplato/kptcalendarlistdialog.h
index 32756371..032ed72e 100644
--- a/kplato/kptcalendarlistdialog.h
+++ b/kplato/kptcalendarlistdialog.h
@@ -41,7 +41,7 @@ class CalendarListDialogImpl : public CalendarListDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- CalendarListDialogImpl(Project &project, TQWidget *tqparent);
+ CalendarListDialogImpl(Project &project, TQWidget *parent);
void setBaseCalendars();
@@ -92,7 +92,7 @@ class CalendarListDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- CalendarListDialog(Project &project, TQWidget *tqparent=0, const char *name=0);
+ CalendarListDialog(Project &project, TQWidget *parent=0, const char *name=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptcalendarlistdialogbase.cc b/kplato/kptcalendarlistdialogbase.cc
index b7207f82..764c7e98 100644
--- a/kplato/kptcalendarlistdialogbase.cc
+++ b/kplato/kptcalendarlistdialogbase.cc
@@ -40,8 +40,8 @@
namespace KPlato
{
-CalendarListDialogBase::CalendarListDialogBase( TQWidget* tqparent, const char* name, WFlags fl )
- : CalendarListPanel( tqparent, name, fl )
+CalendarListDialogBase::CalendarListDialogBase( TQWidget* parent, const char* name, WFlags fl )
+ : CalendarListPanel( parent, name, fl )
{
if ( !name )
setName( "CalendarListDialogBase" );
diff --git a/kplato/kptcalendarlistdialogbase.h b/kplato/kptcalendarlistdialogbase.h
index 82cf9052..dd11a1c7 100644
--- a/kplato/kptcalendarlistdialogbase.h
+++ b/kplato/kptcalendarlistdialogbase.h
@@ -46,7 +46,7 @@ class CalendarListDialogBase : public CalendarListPanel
Q_OBJECT
TQ_OBJECT
public:
- CalendarListDialogBase( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ CalendarListDialogBase( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
CalendarEdit* calendar;
diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc
index 6dfba278..e6322944 100644
--- a/kplato/kptcalendarpanel.cc
+++ b/kplato/kptcalendarpanel.cc
@@ -56,14 +56,14 @@ public:
};
-CalendarPanel::CalendarPanel(TQWidget *tqparent, TQDate dt, const char *name, WFlags f)
- : TQFrame(tqparent,name, f)
+CalendarPanel::CalendarPanel(TQWidget *parent, TQDate dt, const char *name, WFlags f)
+ : TQFrame(parent,name, f)
{
init( dt );
}
-CalendarPanel::CalendarPanel( TQWidget *tqparent, const char *name )
- : TQFrame(tqparent,name)
+CalendarPanel::CalendarPanel( TQWidget *parent, const char *name )
+ : TQFrame(parent,name)
{
init( TQDate::tqcurrentDate() );
}
diff --git a/kplato/kptcalendarpanel.h b/kplato/kptcalendarpanel.h
index 18302ec1..9cf6c4f8 100644
--- a/kplato/kptcalendarpanel.h
+++ b/kplato/kptcalendarpanel.h
@@ -54,13 +54,13 @@ public:
/** The usual constructor. The given date will be displayed
* initially.
**/
- CalendarPanel(TQWidget *tqparent=0, TQDate=TQDate::tqcurrentDate(), const char *name=0, WFlags f=0);
+ CalendarPanel(TQWidget *parent=0, TQDate=TQDate::tqcurrentDate(), const char *name=0, WFlags f=0);
/**
* Standard qt widget constructor. The initial date will be the
* current date.
*/
- CalendarPanel( TQWidget *tqparent, const char *name );
+ CalendarPanel( TQWidget *parent, const char *name );
/**
* The destructor.
diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc
index fb439945..59690e3a 100644
--- a/kplato/kptcanvasitem.cc
+++ b/kplato/kptcanvasitem.cc
@@ -265,14 +265,14 @@ void PertMilestoneItem::printDebug( int /*info*/ )
//////////////////// PertRelationItem //////////////////////////
-PertRelationItem::PertRelationItem( PertCanvas *view, PertNodeItem *tqparent, PertNodeItem *child, Relation *rel)
+PertRelationItem::PertRelationItem( PertCanvas *view, PertNodeItem *parent, PertNodeItem *child, Relation *rel)
: TQCanvasPolygon(view->canvas()),
m_view(view),
m_rel(rel),
- m_parentItem(tqparent),
+ m_parentItem(parent),
m_childItem(child)
{
- //kdDebug()<<k_funcinfo<<"Parent="<<tqparent->node().name()<<" Child="<<child->node().name()<<endl;
+ //kdDebug()<<k_funcinfo<<"Parent="<<parent->node().name()<<" Child="<<child->node().name()<<endl;
draw();
tqsetVisible(true);
}
@@ -289,10 +289,10 @@ void PertRelationItem::draw()
{
//kdDebug()<<k_funcinfo<<endl;
// Some "rules":
- // a) Relation::FinishStart: child column > tqparent column
- // b) Relation::FinishFinish: child column >= tqparent column
- // c) Relation::StartStart: child column >= tqparent column
- // d) Child row can be >= tqparent row
+ // a) Relation::FinishStart: child column > parent column
+ // b) Relation::FinishFinish: child column >= parent column
+ // c) Relation::StartStart: child column >= parent column
+ // d) Child row can be >= parent row
wgap = m_view->verticalGap();
hgap = m_view->horizontalGap();
@@ -337,7 +337,7 @@ void PertRelationItem::draw()
setZ(45);
/*#ifndef NDEBUG
- kdDebug()<<" PertNodeRelation from tqparent: "<<m_rel->tqparent()->name()<<" to child: "<<m_rel->child()->name()<<endl;
+ kdDebug()<<" PertNodeRelation from parent: "<<m_rel->parent()->name()<<" to child: "<<m_rel->child()->name()<<endl;
TQPointArray pa = poly;
for (int i = 0; i < pa.size(); ++i)
kdDebug()<<" pa["<<i<<"]="<<pa[i].x()<<","<<pa[i].y()<<endl;
@@ -585,7 +585,7 @@ void PertRelationItem::setStartStartPoints()
void PertRelationItem::drawShape(TQPainter &p)
{
- //kdDebug()<<k_funcinfo<<" "<<m_rel->tqparent()->name()<<" to "<<m_rel->child()->name()<<endl;
+ //kdDebug()<<k_funcinfo<<" "<<m_rel->parent()->name()<<" to "<<m_rel->child()->name()<<endl;
// cannot use polygon's drawShape() as it doesn't use the pen
setBrush(Qt::NoBrush);
TQPointArray a = poly;
@@ -616,7 +616,7 @@ TQPointArray PertRelationItem::areaPoints () const
pa[1] = pa[0] + TQPoint(right-left+pw*2,0);
pa[2] = pa[1] + TQPoint(0,bottom-top+pw*2);
pa[3] = pa[0] + TQPoint(0,bottom-top+pw*2);
-/* kdDebug()<<k_funcinfo<<" areaPoints: "<<m_rel->tqparent()->name()<<" to "<<m_rel->child()->name()<<endl;
+/* kdDebug()<<k_funcinfo<<" areaPoints: "<<m_rel->parent()->name()<<" to "<<m_rel->child()->name()<<endl;
kdDebug()<<" "<<pa[0].x()<<","<<pa[0].y()<<" "<<pa[1].x()<<","<<pa[1].y()<<endl;
kdDebug()<<" "<<pa[2].x()<<","<<pa[2].y()<<" "<<pa[3].x()<<","<<pa[3].y()<<endl;*/
return pa;
@@ -674,22 +674,22 @@ KDGanttViewTaskLink::LinkType ItemBase::kdLinkType(int relationType) {
//////////////////// GanttViewSummaryItem //////////////////////////
-GanttViewSummaryItem::GanttViewSummaryItem(KDGanttView *tqparent, Node *node)
- : KDGanttViewSummaryItem(tqparent, node->name()),
+GanttViewSummaryItem::GanttViewSummaryItem(KDGanttView *parent, Node *node)
+ : KDGanttViewSummaryItem(parent, node->name()),
m_node(node),
- m_view(tqparent)
+ m_view(parent)
{
setExpandable(true);
setOpen(true);
}
-GanttViewSummaryItem::GanttViewSummaryItem(KDGanttViewItem *tqparent, Node *node)
- : KDGanttViewSummaryItem(tqparent, node->name()),
+GanttViewSummaryItem::GanttViewSummaryItem(KDGanttViewItem *parent, Node *node)
+ : KDGanttViewSummaryItem(parent, node->name()),
m_node(node),
m_view(0)
{
m_drawn = false;
- GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(tqparent);
+ GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(parent);
if (p)
m_view = p->ganttView();
setExpandable(true);
@@ -759,20 +759,20 @@ KDGanttViewItem *GanttViewSummaryItem::find(KDGanttViewItem *item, Node *node)
//////////////////// GanttViewTaskItem //////////////////////////
-GanttViewTaskItem::GanttViewTaskItem(KDGanttView *tqparent, KPlato::Task *task)
- : KDGanttViewTaskItem(tqparent, task->name()),
+GanttViewTaskItem::GanttViewTaskItem(KDGanttView *parent, KPlato::Task *task)
+ : KDGanttViewTaskItem(parent, task->name()),
m_task(task),
- m_view(tqparent)
+ m_view(parent)
{
}
-GanttViewTaskItem::GanttViewTaskItem(KDGanttViewItem *tqparent, KPlato::Task *task)
- : KDGanttViewTaskItem(tqparent, task->name()),
+GanttViewTaskItem::GanttViewTaskItem(KDGanttViewItem *parent, KPlato::Task *task)
+ : KDGanttViewTaskItem(parent, task->name()),
m_task(task),
m_view()
{
m_drawn = false;
- GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(tqparent);
+ GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(parent);
if (p)
m_view = p->ganttView();
}
@@ -840,20 +840,20 @@ KDGanttViewItem *GanttViewTaskItem::find(KDGanttViewItem *item, Node *node)
//////////////////// GanttViewEventItem //////////////////////////
-GanttViewEventItem::GanttViewEventItem(KDGanttView *tqparent, KPlato::Task *task)
- : KDGanttViewEventItem(tqparent, task->name()),
+GanttViewEventItem::GanttViewEventItem(KDGanttView *parent, KPlato::Task *task)
+ : KDGanttViewEventItem(parent, task->name()),
m_task(task),
- m_view(tqparent)
+ m_view(parent)
{
}
-GanttViewEventItem::GanttViewEventItem(KDGanttViewItem *tqparent, KPlato::Task *task)
- : KDGanttViewEventItem(tqparent, task->name()),
+GanttViewEventItem::GanttViewEventItem(KDGanttViewItem *parent, KPlato::Task *task)
+ : KDGanttViewEventItem(parent, task->name()),
m_task(task),
m_view()
{
m_drawn = false;
- GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(tqparent);
+ GanttViewSummaryItem *p = dynamic_cast<GanttViewSummaryItem*>(parent);
if (p)
m_view = p->ganttView();
}
diff --git a/kplato/kptcanvasitem.h b/kplato/kptcanvasitem.h
index 98d35158..705a9a17 100644
--- a/kplato/kptcanvasitem.h
+++ b/kplato/kptcanvasitem.h
@@ -165,7 +165,7 @@ public:
class PertRelationItem : public TQCanvasPolygon
{
public:
- PertRelationItem(PertCanvas *view, PertNodeItem *tqparent, PertNodeItem *child, Relation *rel);
+ PertRelationItem(PertCanvas *view, PertNodeItem *parent, PertNodeItem *child, Relation *rel);
virtual ~PertRelationItem();
virtual int rtti() const;
@@ -222,8 +222,8 @@ protected:
class GanttViewSummaryItem : public KDGanttViewSummaryItem, public ItemBase
{
public:
- GanttViewSummaryItem(KDGanttView *tqparent, Node *node);
- GanttViewSummaryItem(KDGanttViewItem *tqparent, Node *node);
+ GanttViewSummaryItem(KDGanttView *parent, Node *node);
+ GanttViewSummaryItem(KDGanttViewItem *parent, Node *node);
Node *getNode() { return m_node; }
void insertRelations(GanttView *view);
@@ -244,8 +244,8 @@ protected:
class GanttViewTaskItem : public KDGanttViewTaskItem, public ItemBase
{
public:
- GanttViewTaskItem(KDGanttView *tqparent, KPlato::Task *task);
- GanttViewTaskItem(KDGanttViewItem *tqparent, KPlato::Task *task);
+ GanttViewTaskItem(KDGanttView *parent, KPlato::Task *task);
+ GanttViewTaskItem(KDGanttViewItem *parent, KPlato::Task *task);
KPlato::Task *getTask() const { return m_task; }
void insertRelations(GanttView *view);
@@ -266,8 +266,8 @@ protected:
class GanttViewEventItem : public KDGanttViewEventItem, public ItemBase
{
public:
- GanttViewEventItem(KDGanttView *tqparent, KPlato::Task *task);
- GanttViewEventItem(KDGanttViewItem *tqparent, KPlato::Task *task);
+ GanttViewEventItem(KDGanttView *parent, KPlato::Task *task);
+ GanttViewEventItem(KDGanttViewItem *parent, KPlato::Task *task);
KPlato::Task *getTask() { return m_task; }
void insertRelations(GanttView *view);
diff --git a/kplato/kptcommand.cc b/kplato/kptcommand.cc
index 364d552d..662c0dd0 100644
--- a/kplato/kptcommand.cc
+++ b/kplato/kptcommand.cc
@@ -170,7 +170,7 @@ CalendarModifyParentCmd::CalendarModifyParentCmd(Part *part, Calendar *cal, Cale
: NamedCommand(part, name),
m_cal(cal) {
- m_oldvalue = cal->tqparent();
+ m_oldvalue = cal->parent();
m_newvalue = newvalue;
//kdDebug()<<k_funcinfo<<cal->name()<<endl;
// TODO check if any resources uses this calendar
@@ -428,15 +428,15 @@ void TaskAddCmd::unexecute() {
setCommandType(1);
}
-SubtaskAddCmd::SubtaskAddCmd(Part *part, Project *project, Node *node, Node *tqparent, TQString name)
+SubtaskAddCmd::SubtaskAddCmd(Part *part, Project *project, Node *node, Node *parent, TQString name)
: NamedCommand(part, name),
m_project(project),
m_node(node),
- m_parent(tqparent),
+ m_parent(parent),
m_added(false) {
// set some reasonable defaults for normally calculated values
- node->setStartTime(tqparent->startTime());
+ node->setStartTime(parent->startTime());
node->setEndTime(node->startTime() + node->duration());
node->setEarliestStart(node->startTime());
node->setLatestFinish(node->endTime());
@@ -637,27 +637,27 @@ void NodeModifyIdCmd::unexecute() {
NodeIndentCmd::NodeIndentCmd(Part *part, Node &node, TQString name)
: NamedCommand(part, name),
m_node(node),
- m_newtqparent(0),
+ m_newparent(0),
m_newindex(-1) {
}
void NodeIndentCmd::execute() {
- m_oldtqparent = m_node.getParent();
- m_oldindex = m_oldtqparent->findChildNode(&m_node);
+ m_oldparent = m_node.getParent();
+ m_oldindex = m_oldparent->findChildNode(&m_node);
Project *p = dynamic_cast<Project *>(m_node.projectNode());
if (p && p->indentTask(&m_node)) {
- m_newtqparent = m_node.getParent();
- m_newindex = m_newtqparent->findChildNode(&m_node);
- m_node.setParent(m_newtqparent);
+ m_newparent = m_node.getParent();
+ m_newindex = m_newparent->findChildNode(&m_node);
+ m_node.setParent(m_newparent);
}
setCommandType(1);
}
void NodeIndentCmd::unexecute() {
if (m_newindex != -1) {
- m_newtqparent->delChildNode(m_newindex, false);
- m_oldtqparent->insertChildNode(m_oldindex, &m_node);
- m_node.setParent(m_oldtqparent);
+ m_newparent->delChildNode(m_newindex, false);
+ m_oldparent->insertChildNode(m_oldindex, &m_node);
+ m_node.setParent(m_oldparent);
m_newindex = -1;
}
@@ -667,26 +667,26 @@ void NodeIndentCmd::unexecute() {
NodeUnindentCmd::NodeUnindentCmd(Part *part, Node &node, TQString name)
: NamedCommand(part, name),
m_node(node),
- m_newtqparent(0),
+ m_newparent(0),
m_newindex(-1) {
}
void NodeUnindentCmd::execute() {
- m_oldtqparent = m_node.getParent();
- m_oldindex = m_oldtqparent->findChildNode(&m_node);
+ m_oldparent = m_node.getParent();
+ m_oldindex = m_oldparent->findChildNode(&m_node);
Project *p = dynamic_cast<Project *>(m_node.projectNode());
if (p && p->unindentTask(&m_node)) {
- m_newtqparent = m_node.getParent();
- m_newindex = m_newtqparent->findChildNode(&m_node);
- m_node.setParent(m_newtqparent);
+ m_newparent = m_node.getParent();
+ m_newindex = m_newparent->findChildNode(&m_node);
+ m_node.setParent(m_newparent);
}
setCommandType(1);
}
void NodeUnindentCmd::unexecute() {
if (m_newindex != -1) {
- m_newtqparent->delChildNode(m_newindex, false);
- m_oldtqparent->insertChildNode(m_oldindex, &m_node);
- m_node.setParent(m_oldtqparent);
+ m_newparent->delChildNode(m_newindex, false);
+ m_oldparent->insertChildNode(m_oldindex, &m_node);
+ m_node.setParent(m_oldparent);
m_newindex = -1;
}
@@ -741,7 +741,7 @@ AddRelationCmd::AddRelationCmd(Part *part, Relation *rel, TQString name)
m_rel(rel) {
m_taken = true;
- Node *p = rel->tqparent()->projectNode();
+ Node *p = rel->parent()->projectNode();
if (p) {
TQIntDictIterator<Schedule> it = p->schedules();
for (; it.current(); ++it) {
@@ -754,16 +754,16 @@ AddRelationCmd::~AddRelationCmd() {
delete m_rel;
}
void AddRelationCmd::execute() {
- //kdDebug()<<k_funcinfo<<m_rel->tqparent()<<" to "<<m_rel->child()<<endl;
+ //kdDebug()<<k_funcinfo<<m_rel->parent()<<" to "<<m_rel->child()<<endl;
m_taken = false;
- m_rel->tqparent()->addDependChildNode(m_rel);
+ m_rel->parent()->addDependChildNode(m_rel);
m_rel->child()->addDependParentNode(m_rel);
setSchScheduled(false);
setCommandType(1);
}
void AddRelationCmd::unexecute() {
m_taken = true;
- m_rel->tqparent()->takeDependChildNode(m_rel);
+ m_rel->parent()->takeDependChildNode(m_rel);
m_rel->child()->takeDependParentNode(m_rel);
setSchScheduled();
setCommandType(1);
@@ -774,7 +774,7 @@ DeleteRelationCmd::DeleteRelationCmd(Part *part, Relation *rel, TQString name)
m_rel(rel) {
m_taken = false;
- Node *p = rel->tqparent()->projectNode();
+ Node *p = rel->parent()->projectNode();
if (p) {
TQIntDictIterator<Schedule> it = p->schedules();
for (; it.current(); ++it) {
@@ -787,16 +787,16 @@ DeleteRelationCmd::~DeleteRelationCmd() {
delete m_rel;
}
void DeleteRelationCmd::execute() {
- //kdDebug()<<k_funcinfo<<m_rel->tqparent()<<" to "<<m_rel->child()<<endl;
+ //kdDebug()<<k_funcinfo<<m_rel->parent()<<" to "<<m_rel->child()<<endl;
m_taken = true;
- m_rel->tqparent()->takeDependChildNode(m_rel);
+ m_rel->parent()->takeDependChildNode(m_rel);
m_rel->child()->takeDependParentNode(m_rel);
setSchScheduled(false);
setCommandType(1);
}
void DeleteRelationCmd::unexecute() {
m_taken = false;
- m_rel->tqparent()->addDependChildNode(m_rel);
+ m_rel->parent()->addDependChildNode(m_rel);
m_rel->child()->addDependParentNode(m_rel);
setSchScheduled();
setCommandType(1);
@@ -808,7 +808,7 @@ ModifyRelationTypeCmd::ModifyRelationTypeCmd(Part *part, Relation *rel, Relation
m_newtype(type) {
m_oldtype = rel->type();
- Node *p = rel->tqparent()->projectNode();
+ Node *p = rel->parent()->projectNode();
if (p) {
TQIntDictIterator<Schedule> it = p->schedules();
for (; it.current(); ++it) {
@@ -833,7 +833,7 @@ ModifyRelationLagCmd::ModifyRelationLagCmd(Part *part, Relation *rel, Duration l
m_newlag(lag) {
m_oldlag = rel->lag();
- Node *p = rel->tqparent()->projectNode();
+ Node *p = rel->parent()->projectNode();
if (p) {
TQIntDictIterator<Schedule> it = p->schedules();
for (; it.current(); ++it) {
@@ -1044,7 +1044,7 @@ void AddResourceGroupRequestCmd::unexecute() {
RemoveResourceGroupRequestCmd::RemoveResourceGroupRequestCmd(Part *part, ResourceGroupRequest *request, TQString name)
: NamedCommand(part, name),
- m_task(request->tqparent()->task()),
+ m_task(request->parent()->task()),
m_request(request) {
m_mine = false;
@@ -1116,7 +1116,7 @@ RemoveResourceCmd::~RemoveResourceCmd() {
void RemoveResourceCmd::execute() {
TQPtrListIterator<ResourceRequest> it = m_requests;
for (; it.current(); ++it) {
- it.current()->tqparent()->takeResourceRequest(it.current());
+ it.current()->parent()->takeResourceRequest(it.current());
//kdDebug()<<"Remove request for"<<it.current()->resource()->name()<<endl;
}
TQPtrListIterator<Appointment> ait = m_resource->appointments();
@@ -1139,7 +1139,7 @@ void RemoveResourceCmd::unexecute() {
}
TQPtrListIterator<ResourceRequest> it = m_requests;
for (; it.current(); ++it) {
- it.current()->tqparent()->addResourceRequest(it.current());
+ it.current()->parent()->addResourceRequest(it.current());
//kdDebug()<<"Add request for "<<it.current()->resource()->name()<<endl;
}
AddResourceCmd::execute();
@@ -1375,8 +1375,8 @@ void RemoveResourceGroupCmd::execute() {
int c=0;
TQPtrListIterator<ResourceGroupRequest> it = m_group->requests();
for (; it.current(); ++it) {
- if (it.current()->tqparent()) {
- it.current()->tqparent()->takeRequest(it.current());
+ if (it.current()->parent()) {
+ it.current()->parent()->takeRequest(it.current());
}
c = 1;
}
@@ -1391,8 +1391,8 @@ void RemoveResourceGroupCmd::unexecute() {
int c=0;
TQPtrListIterator<ResourceGroupRequest> it = m_group->requests();
for (; it.current(); ++it) {
- if (it.current()->tqparent()) {
- it.current()->tqparent()->addRequest(it.current());
+ if (it.current()->parent()) {
+ it.current()->parent()->addRequest(it.current());
}
c = 1;
}
@@ -1467,20 +1467,20 @@ void ProjectModifyBaselineCmd::unexecute() {
setCommandType(2);
}
-AddAccountCmd::AddAccountCmd(Part *part, Project &project, Account *account, TQString tqparent, TQString name)
+AddAccountCmd::AddAccountCmd(Part *part, Project &project, Account *account, TQString parent, TQString name)
: NamedCommand(part, name),
m_project(project),
m_account(account),
m_parent(0),
- m_parentName(tqparent) {
+ m_parentName(parent) {
m_mine = true;
}
-AddAccountCmd::AddAccountCmd(Part *part, Project &project, Account *account, Account *tqparent, TQString name)
+AddAccountCmd::AddAccountCmd(Part *part, Project &project, Account *account, Account *parent, TQString name)
: NamedCommand(part, name),
m_project(project),
m_account(account),
- m_parent(tqparent) {
+ m_parent(parent) {
m_mine = true;
}
@@ -1528,8 +1528,8 @@ void RemoveAccountCmd::execute() {
if (m_isDefault) {
m_project.accounts().setDefaultAccount(0);
}
- if (m_account->tqparent())
- m_account->tqparent()->take(m_account);
+ if (m_account->parent())
+ m_account->parent()->take(m_account);
else
m_project.accounts().take(m_account);
@@ -1537,8 +1537,8 @@ void RemoveAccountCmd::execute() {
m_mine = true;
}
void RemoveAccountCmd::unexecute() {
- if (m_account->tqparent())
- m_account->tqparent()->append(m_account);
+ if (m_account->parent())
+ m_account->parent()->append(m_account);
else
m_project.accounts().append(m_account);
diff --git a/kplato/kptcommand.h b/kplato/kptcommand.h
index 4c94e978..1aaee441 100644
--- a/kplato/kptcommand.h
+++ b/kplato/kptcommand.h
@@ -213,7 +213,7 @@ private:
class SubtaskAddCmd : public NamedCommand
{
public:
- SubtaskAddCmd(Part *part, Project *project, Node *node, Node *tqparent, TQString name=0);
+ SubtaskAddCmd(Part *part, Project *project, Node *node, Node *parent, TQString name=0);
~SubtaskAddCmd();
void execute();
void unexecute();
@@ -351,7 +351,7 @@ public:
private:
Node &m_node;
- Node *m_oldtqparent, *m_newtqparent;
+ Node *m_oldparent, *m_newparent;
int m_oldindex, m_newindex;
};
@@ -364,7 +364,7 @@ public:
private:
Node &m_node;
- Node *m_oldtqparent, *m_newtqparent;
+ Node *m_oldparent, *m_newparent;
int m_oldindex, m_newindex;
};
@@ -789,8 +789,8 @@ private:
class AddAccountCmd : public NamedCommand
{
public:
- AddAccountCmd(Part *part, Project &project, Account *account, Account *tqparent=0, TQString name=0);
- AddAccountCmd(Part *part, Project &project, Account *account, TQString tqparent, TQString name=0);
+ AddAccountCmd(Part *part, Project &project, Account *account, Account *parent=0, TQString name=0);
+ AddAccountCmd(Part *part, Project &project, Account *account, TQString parent, TQString name=0);
~AddAccountCmd();
void execute();
void unexecute();
diff --git a/kplato/kptconfigbehaviorpanel.h b/kplato/kptconfigbehaviorpanel.h
index bf1ec649..bbdb3cf4 100644
--- a/kplato/kptconfigbehaviorpanel.h
+++ b/kplato/kptconfigbehaviorpanel.h
@@ -35,7 +35,7 @@ class ConfigBehaviorPanel : public ConfigBehaviorPanelBase {
Q_OBJECT
TQ_OBJECT
public:
- ConfigBehaviorPanel(Behavior &behavior, TQWidget *tqparent=0, const char *name=0);
+ ConfigBehaviorPanel(Behavior &behavior, TQWidget *parent=0, const char *name=0);
void setStartValues();
bool ok();
diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc
index 5f7ca9ed..729d6443 100644
--- a/kplato/kptconfigdialog.cc
+++ b/kplato/kptconfigdialog.cc
@@ -45,10 +45,10 @@ static inline TQPixmap loadIcon( const char * name ) {
}
-ConfigDialog::ConfigDialog(Config &config, Project &project, TQWidget *tqparent, const char *)
+ConfigDialog::ConfigDialog(Config &config, Project &project, TQWidget *parent, const char *)
: KDialogBase(KDialogBase::IconList, i18n("Configure KPlato"),
KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel| KDialogBase::Default,
- KDialogBase::Ok, tqparent),
+ KDialogBase::Ok, parent),
m_config(config)
{
diff --git a/kplato/kptconfigdialog.h b/kplato/kptconfigdialog.h
index c30cd47b..a172dfde 100644
--- a/kplato/kptconfigdialog.h
+++ b/kplato/kptconfigdialog.h
@@ -36,7 +36,7 @@ class ConfigDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- ConfigDialog(Config &config, Project &project, TQWidget *tqparent=0, const char *name=0);
+ ConfigDialog(Config &config, Project &project, TQWidget *parent=0, const char *name=0);
protected slots:
void slotApply();
diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc
index f552de26..afa06591 100644
--- a/kplato/kptdatetable.cc
+++ b/kplato/kptdatetable.cc
@@ -41,8 +41,8 @@
namespace KPlato
{
-DateValidator::DateValidator(TQWidget* tqparent, const char* name)
- : TQValidator(TQT_TQOBJECT(tqparent), name)
+DateValidator::DateValidator(TQWidget* parent, const char* name)
+ : TQValidator(TQT_TQOBJECT(parent), name)
{
}
@@ -73,8 +73,8 @@ DateValidator::fixup( TQString& ) const
}
-DateTable::DateTable(TQWidget *tqparent, TQDate date_, const char* name, WFlags f)
- : TQGridView(tqparent, name, f),
+DateTable::DateTable(TQWidget *parent, TQDate date_, const char* name, WFlags f)
+ : TQGridView(parent, name, f),
m_enabled(true)
{
//kdDebug()<<k_funcinfo<<endl;
@@ -713,8 +713,8 @@ void DateTable::markSelected(int state) {
}
DateInternalWeekSelector::DateInternalWeekSelector
-(int fontsize, TQWidget* tqparent, const char* name)
- : TQLineEdit(tqparent, name),
+(int fontsize, TQWidget* parent, const char* name)
+ : TQLineEdit(parent, name),
val(new TQIntValidator(TQT_TQOBJECT(this))),
result(0)
{
@@ -761,8 +761,8 @@ DateInternalWeekSelector::setWeek(int week)
}
DateInternalMonthPicker::DateInternalMonthPicker
-(int fontsize, TQWidget* tqparent, const char* name)
- : TQGridView(tqparent, name),
+(int fontsize, TQWidget* parent, const char* name)
+ : TQGridView(parent, name),
result(0) // invalid
{
TQRect rect;
@@ -925,8 +925,8 @@ DateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e)
DateInternalYearSelector::DateInternalYearSelector
-(int fontsize, TQWidget* tqparent, const char* name)
- : TQLineEdit(tqparent, name),
+(int fontsize, TQWidget* parent, const char* name)
+ : TQLineEdit(parent, name),
val(new TQIntValidator(TQT_TQOBJECT(this))),
result(0)
{
@@ -980,8 +980,8 @@ DateInternalYearSelector::setYear(int year)
setText(temp);
}
-PopupFrame::PopupFrame(TQWidget* tqparent, const char* name)
- : TQFrame(tqparent, name, WType_Popup),
+PopupFrame::PopupFrame(TQWidget* parent, const char* name)
+ : TQFrame(parent, name, WType_Popup),
result(0), // rejected
main(0)
{
diff --git a/kplato/kptdatetable.h b/kplato/kptdatetable.h
index 65e0d05f..815a86e9 100644
--- a/kplato/kptdatetable.h
+++ b/kplato/kptdatetable.h
@@ -57,7 +57,7 @@ signals:
void closeMe(int);
public:
DateInternalWeekSelector(int fontsize,
- TQWidget* tqparent=0,
+ TQWidget* parent=0,
const char* name=0);
int getWeek() const;
void setWeek(int week);
@@ -100,7 +100,7 @@ public:
/**
* The constructor.
*/
- DateInternalMonthPicker(int fontsize, TQWidget* tqparent, const char* name=0);
+ DateInternalMonthPicker(int fontsize, TQWidget* parent, const char* name=0);
/**
* The size hint.
*/
@@ -160,7 +160,7 @@ signals:
void closeMe(int);
public:
DateInternalYearSelector(int fontsize,
- TQWidget* tqparent=0,
+ TQWidget* parent=0,
const char* name=0);
int getYear() const;
void setYear(int year);
@@ -202,7 +202,7 @@ public:
/**
* The contructor. Creates a dialog without buttons.
*/
- PopupFrame(TQWidget* tqparent=0, const char* name=0);
+ PopupFrame(TQWidget* parent=0, const char* name=0);
/**
* Set the main widget. You cannot set the main widget from the constructor,
* since it must be a child of the frame itselfes.
@@ -245,7 +245,7 @@ private:
class DateValidator : public TQValidator
{
public:
- DateValidator(TQWidget* tqparent=0, const char* name=0);
+ DateValidator(TQWidget* parent=0, const char* name=0);
virtual State validate(TQString&, int&) const;
virtual void fixup ( TQString & input ) const;
State date(const TQString&, TQDate&) const;
@@ -260,7 +260,7 @@ public:
/**
* The constructor.
*/
- DateTable(TQWidget *tqparent=0, TQDate date=TQDate::tqcurrentDate(),
+ DateTable(TQWidget *parent=0, TQDate date=TQDate::tqcurrentDate(),
const char* name="DateTable", WFlags f=0);
/**
diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc
index 5eb411d8..2780d166 100644
--- a/kplato/kptdoublelistviewbase.cc
+++ b/kplato/kptdoublelistviewbase.cc
@@ -88,8 +88,8 @@ void ListView::paintToPrinter(TQPainter * p, int cx, int cy, int cw, int ch) {
p->restore();
}
-DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListItem *master, TQListView *tqparent, TQListViewItem *after, bool highlight)
- : KListViewItem(tqparent, after),
+DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListItem *master, TQListView *parent, TQListViewItem *after, bool highlight)
+ : KListViewItem(parent, after),
m_masterItem(master),
m_value(0.0),
m_highlight(highlight),
@@ -98,10 +98,10 @@ DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListI
setFormat();
setExpandable(master->isExpandable());
setOpen(master->isOpen());
- //kdDebug()<<"DoubleListViewBase::SlaveListItem "<<master->text(0)<<" tqparent="<<static_cast<DoubleListViewBase::SlaveListItem*>(tqparent)->m_masterItem->text(0)<<endl;
+ //kdDebug()<<"DoubleListViewBase::SlaveListItem "<<master->text(0)<<" parent="<<static_cast<DoubleListViewBase::SlaveListItem*>(parent)->m_masterItem->text(0)<<endl;
}
-DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListItem *master, TQListViewItem *tqparent, TQListViewItem *after, bool highlight)
- : KListViewItem(tqparent, after),
+DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListItem *master, TQListViewItem *parent, TQListViewItem *after, bool highlight)
+ : KListViewItem(parent, after),
m_masterItem(master),
m_value(0.0),
m_highlight(highlight),
@@ -110,7 +110,7 @@ DoubleListViewBase::SlaveListItem::SlaveListItem(DoubleListViewBase::MasterListI
setFormat();
setExpandable(master->isExpandable());
setOpen(master->isOpen());
- //kdDebug()<<"DoubleListViewBase::SlaveListItem "<<master->text(0)<<" tqparent="<<static_cast<DoubleListViewBase::SlaveListItem*>(tqparent)->m_masterItem->text(0)<<endl;
+ //kdDebug()<<"DoubleListViewBase::SlaveListItem "<<master->text(0)<<" parent="<<static_cast<DoubleListViewBase::SlaveListItem*>(parent)->m_masterItem->text(0)<<endl;
}
DoubleListViewBase::SlaveListItem::~SlaveListItem() {
//kdDebug()<<k_funcinfo<<endl;
@@ -161,8 +161,8 @@ void DoubleListViewBase::SlaveListItem::setFormat(int fieldwidth, char fmt, int
}
//----------------------------
-DoubleListViewBase::MasterListItem::MasterListItem(TQListView *tqparent, bool highlight)
- : KListViewItem(tqparent),
+DoubleListViewBase::MasterListItem::MasterListItem(TQListView *parent, bool highlight)
+ : KListViewItem(parent),
m_slaveItem(0),
m_value(0.0),
m_limit(0.0),
@@ -172,8 +172,8 @@ DoubleListViewBase::MasterListItem::MasterListItem(TQListView *tqparent, bool hi
//kdDebug()<<k_funcinfo<<endl;
}
-DoubleListViewBase::MasterListItem::MasterListItem(TQListView *tqparent, TQString text, bool highlight)
- : KListViewItem(tqparent, text),
+DoubleListViewBase::MasterListItem::MasterListItem(TQListView *parent, TQString text, bool highlight)
+ : KListViewItem(parent, text),
m_slaveItem(0),
m_value(0.0),
m_limit(0.0),
@@ -183,8 +183,8 @@ DoubleListViewBase::MasterListItem::MasterListItem(TQListView *tqparent, TQStrin
//kdDebug()<<k_funcinfo<<endl;
}
-DoubleListViewBase::MasterListItem::MasterListItem(TQListViewItem *tqparent, bool highlight)
- : KListViewItem(tqparent),
+DoubleListViewBase::MasterListItem::MasterListItem(TQListViewItem *parent, bool highlight)
+ : KListViewItem(parent),
m_slaveItem(0),
m_value(0.0),
m_limit(0.0),
@@ -194,8 +194,8 @@ DoubleListViewBase::MasterListItem::MasterListItem(TQListViewItem *tqparent, boo
//kdDebug()<<k_funcinfo<<endl;
}
-DoubleListViewBase::MasterListItem::MasterListItem(TQListViewItem *tqparent, TQString text, bool highlight)
- : KListViewItem(tqparent, text),
+DoubleListViewBase::MasterListItem::MasterListItem(TQListViewItem *parent, TQString text, bool highlight)
+ : KListViewItem(parent, text),
m_slaveItem(0),
m_value(0.0),
m_limit(0.0),
@@ -215,10 +215,10 @@ void DoubleListViewBase::MasterListItem::createSlaveItems(TQListView *lv, TQList
if (m_slaveItem) {
kdError()<<k_funcinfo<<"Slave item allready exists"<<endl;
} else {
- if (tqparent() == 0) {
+ if (parent() == 0) {
m_slaveItem = new DoubleListViewBase::SlaveListItem(this, lv, after);
} else {
- m_slaveItem = new DoubleListViewBase::SlaveListItem(this, static_cast<DoubleListViewBase::MasterListItem*>(tqparent())->m_slaveItem, after);
+ m_slaveItem = new DoubleListViewBase::SlaveListItem(this, static_cast<DoubleListViewBase::MasterListItem*>(parent())->m_slaveItem, after);
}
}
DoubleListViewBase::SlaveListItem *prev = 0;
@@ -342,8 +342,8 @@ void DoubleListViewBase::MasterListItem::setFormat(int fieldwidth, char fmt, int
}
//-------------------------------------
-DoubleListViewBase::DoubleListViewBase(TQWidget *tqparent, bool description)
- : TQSplitter(tqparent),
+DoubleListViewBase::DoubleListViewBase(TQWidget *parent, bool description)
+ : TQSplitter(parent),
m_fieldwidth(0),
m_fmt('f'),
m_prec(0) {
diff --git a/kplato/kptdoublelistviewbase.h b/kplato/kptdoublelistviewbase.h
index a92c4cb9..aaaaf305 100644
--- a/kplato/kptdoublelistviewbase.h
+++ b/kplato/kptdoublelistviewbase.h
@@ -41,8 +41,8 @@ class Project;
class ListView : public KListView
{
public:
- ListView(TQWidget *tqparent)
- : KListView(tqparent)
+ ListView(TQWidget *parent)
+ : KListView(parent)
{}
virtual void paintToPrinter(TQPainter * p, int cx, int cy, int cw, int ch);
@@ -62,7 +62,7 @@ class DoubleListViewBase : public TQSplitter
TQ_OBJECT
public:
- DoubleListViewBase(TQWidget *tqparent, bool description=false);
+ DoubleListViewBase(TQWidget *parent, bool description=false);
//~DoubleListViewBase();
@@ -88,8 +88,8 @@ public:
class MasterListItem;
class SlaveListItem : public KListViewItem {
public:
- SlaveListItem(MasterListItem *master, TQListView *tqparent, TQListViewItem *after, bool highlight=false);
- SlaveListItem(MasterListItem *master, TQListViewItem *tqparent, TQListViewItem *after, bool highlight=false);
+ SlaveListItem(MasterListItem *master, TQListView *parent, TQListViewItem *after, bool highlight=false);
+ SlaveListItem(MasterListItem *master, TQListViewItem *parent, TQListViewItem *after, bool highlight=false);
~SlaveListItem();
void masterItemDeleted() { m_masterItem = 0; }
@@ -119,10 +119,10 @@ public:
class MasterListItem : public KListViewItem {
public:
- MasterListItem(TQListView *tqparent, bool highlight=false);
- MasterListItem(TQListView *tqparent, TQString text, bool highlight=false);
- MasterListItem(TQListViewItem *tqparent, bool highlight=false);
- MasterListItem(TQListViewItem *tqparent, TQString text, bool highlight=false);
+ MasterListItem(TQListView *parent, bool highlight=false);
+ MasterListItem(TQListView *parent, TQString text, bool highlight=false);
+ MasterListItem(TQListViewItem *parent, bool highlight=false);
+ MasterListItem(TQListViewItem *parent, TQString text, bool highlight=false);
~MasterListItem();
/// Creates slaveitems for myself and my tqchildren
diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cc
index 0828ec03..e342da3e 100644
--- a/kplato/kptfactory.cc
+++ b/kplato/kptfactory.cc
@@ -34,8 +34,8 @@ K_EXPORT_COMPONENT_FACTORY( libkplatopart, Factory )
KInstance* Factory::s_global = 0L;
KAboutData* Factory::s_aboutData = 0L;
-Factory::Factory( TQObject* tqparent, const char* name )
- : KoFactory( tqparent, name )
+Factory::Factory( TQObject* parent, const char* name )
+ : KoFactory( parent, name )
{
global();
}
@@ -50,7 +50,7 @@ Factory::~Factory()
KParts::Part *Factory::createPartObject(TQWidget *parentWidget,
const char *widgetName,
- TQObject* tqparent, const char* name,
+ TQObject* parent, const char* name,
const char* classname,
const TQStringList &)
{
@@ -61,7 +61,7 @@ KParts::Part *Factory::createPartObject(TQWidget *parentWidget,
// parentWidget and widgetName are used by KoDocument for the
// "readonly+singleView" case.
- Part *part = new Part(parentWidget, widgetName, tqparent, name,
+ Part *part = new Part(parentWidget, widgetName, parent, name,
!bWantKoDocument);
if (!bWantKoDocument)
diff --git a/kplato/kptfactory.h b/kplato/kptfactory.h
index 8a8022af..a10a7da6 100644
--- a/kplato/kptfactory.h
+++ b/kplato/kptfactory.h
@@ -32,10 +32,10 @@ class Factory : public KoFactory
Q_OBJECT
TQ_OBJECT
public:
- Factory( TQObject* tqparent = 0, const char* name = 0 );
+ Factory( TQObject* parent = 0, const char* name = 0 );
~Factory();
- virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+ virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
static KInstance* global();
diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc
index 37695320..925598f9 100644
--- a/kplato/kptganttview.cc
+++ b/kplato/kptganttview.cc
@@ -70,16 +70,16 @@ namespace KPlato
class MyKDGanttView : public KDGanttView {
public:
- MyKDGanttView(TQWidget *tqparent, const char *name)
- : KDGanttView(tqparent, name) {
+ MyKDGanttView(TQWidget *parent, const char *name)
+ : KDGanttView(parent, name) {
}
virtual TQSize tqsizeHint() const {
return tqminimumSizeHint(); //HACK: koshell splitter tqminimumSize problem
}
};
-GanttView::GanttView(TQWidget *tqparent, bool readWrite, const char* name)
- : TQSplitter(tqparent, name),
+GanttView::GanttView(TQWidget *parent, bool readWrite, const char* name)
+ : TQSplitter(parent, name),
m_readWrite(readWrite),
m_currentItem(0),
m_taskView(0),
@@ -344,8 +344,8 @@ void GanttView::removeNotDrawn(KDGanttViewItem *_item)
void GanttView::deleteItem(KDGanttViewItem *item)
{
//kdDebug()<<k_funcinfo<<item->listViewText()<<endl;
- if (item->tqparent())
- item->tqparent()->takeItem(item);
+ if (item->parent())
+ item->parent()->takeItem(item);
else
item->listView()->takeItem(item);
delete item;
@@ -375,7 +375,7 @@ KDGanttViewItem *GanttView::correctType(KDGanttViewItem *item, Node *node)
return item;
break;
}
- KDGanttViewItem *newItem = addNode(item->tqparent(), node, item);
+ KDGanttViewItem *newItem = addNode(item->parent(), node, item);
newItem->setOpen(item->isOpen());
deleteItem(item);
return newItem;
@@ -392,7 +392,7 @@ void GanttView::correctPosition(KDGanttViewItem *item, Node *node)
KDGanttViewItem *GanttView::correctParent(KDGanttViewItem *item, Node *node)
{
KDGanttViewItem *p = findItem(node->getParent());
- if (p == item->tqparent()) {
+ if (p == item->parent()) {
return item;
}
KDGanttViewItem *newItem = addNode(p, node);
diff --git a/kplato/kptganttview.h b/kplato/kptganttview.h
index 42f1ac1d..353dbff8 100644
--- a/kplato/kptganttview.h
+++ b/kplato/kptganttview.h
@@ -59,7 +59,7 @@ class GanttView : public TQSplitter
public:
- GanttView(TQWidget *tqparent, bool readWrite=true, const char* name = 0 );
+ GanttView(TQWidget *parent, bool readWrite=true, const char* name = 0 );
//~GanttView();
diff --git a/kplato/kptintervaledit.cc b/kplato/kptintervaledit.cc
index 7985d7db..a76a1546 100644
--- a/kplato/kptintervaledit.cc
+++ b/kplato/kptintervaledit.cc
@@ -37,16 +37,16 @@
namespace KPlato
{
-IntervalEdit::IntervalEdit(TQWidget *tqparent, const char *name)
- : IntervalEditImpl(tqparent)
+IntervalEdit::IntervalEdit(TQWidget *parent, const char *name)
+ : IntervalEditImpl(parent)
{
//kdDebug()<<k_funcinfo<<endl;
}
//--------------------------------------------
-IntervalEditImpl::IntervalEditImpl(TQWidget *tqparent)
- : IntervalEditBase(tqparent) {
+IntervalEditImpl::IntervalEditImpl(TQWidget *parent)
+ : IntervalEditBase(parent) {
intervalList->header()->setStretchEnabled(true);
intervalList->setSortColumn(0);
diff --git a/kplato/kptintervaledit.h b/kplato/kptintervaledit.h
index 0d889241..0550b9f5 100644
--- a/kplato/kptintervaledit.h
+++ b/kplato/kptintervaledit.h
@@ -36,7 +36,7 @@ class IntervalEditImpl : public IntervalEditBase {
Q_OBJECT
TQ_OBJECT
public:
- IntervalEditImpl(TQWidget *tqparent);
+ IntervalEditImpl(TQWidget *parent);
TQPtrList<TQPair<TQTime, TQTime> > intervals() const;
void setIntervals(const TQPtrList<TQPair<TQTime, TQTime> > &intervals) const;
@@ -54,7 +54,7 @@ class IntervalEdit : public IntervalEditImpl {
Q_OBJECT
TQ_OBJECT
public:
- IntervalEdit(TQWidget *tqparent=0, const char *name=0);
+ IntervalEdit(TQWidget *parent=0, const char *name=0);
};
diff --git a/kplato/kptmainprojectdialog.cc b/kplato/kptmainprojectdialog.cc
index 71e2ba4e..a9f40ae0 100644
--- a/kplato/kptmainprojectdialog.cc
+++ b/kplato/kptmainprojectdialog.cc
@@ -31,8 +31,8 @@
namespace KPlato
{
-MainProjectDialog::MainProjectDialog(Project &p, TQWidget *tqparent, const char *name)
- : KDialogBase( Swallow, i18n("Project Settings"), Ok|Cancel, Ok, tqparent, name, true, true),
+MainProjectDialog::MainProjectDialog(Project &p, TQWidget *parent, const char *name)
+ : KDialogBase( Swallow, i18n("Project Settings"), Ok|Cancel, Ok, parent, name, true, true),
project(p)
{
panel = new MainProjectPanel(project, this);
diff --git a/kplato/kptmainprojectdialog.h b/kplato/kptmainprojectdialog.h
index 4930e9ae..dadd29b4 100644
--- a/kplato/kptmainprojectdialog.h
+++ b/kplato/kptmainprojectdialog.h
@@ -36,7 +36,7 @@ class MainProjectDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- MainProjectDialog(Project &project, TQWidget *tqparent=0, const char *name=0);
+ MainProjectDialog(Project &project, TQWidget *parent=0, const char *name=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptmainprojectpanel.cc b/kplato/kptmainprojectpanel.cc
index 402bdc4a..222ca0a9 100644
--- a/kplato/kptmainprojectpanel.cc
+++ b/kplato/kptmainprojectpanel.cc
@@ -45,8 +45,8 @@
namespace KPlato
{
-MainProjectPanel::MainProjectPanel(Project &p, TQWidget *tqparent, const char *name)
- : MainProjectPanelImpl(tqparent, name),
+MainProjectPanel::MainProjectPanel(Project &p, TQWidget *parent, const char *name)
+ : MainProjectPanelImpl(parent, name),
project(p)
{
namefield->setText(project.name());
@@ -142,8 +142,8 @@ KCommand *MainProjectPanel::buildCommand(Part *part) {
}
//-------------------------------------------------------------------
-MainProjectPanelImpl::MainProjectPanelImpl(TQWidget *tqparent, const char *name)
- : MainProjectPanelBase(tqparent, name) {
+MainProjectPanelImpl::MainProjectPanelImpl(TQWidget *parent, const char *name)
+ : MainProjectPanelBase(parent, name) {
// signals and slots connections
connect( bStartDate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotStartDateClicked() ) );
diff --git a/kplato/kptmainprojectpanel.h b/kplato/kptmainprojectpanel.h
index 50043a3f..7a32b578 100644
--- a/kplato/kptmainprojectpanel.h
+++ b/kplato/kptmainprojectpanel.h
@@ -38,7 +38,7 @@ class MainProjectPanelImpl : public MainProjectPanelBase {
Q_OBJECT
TQ_OBJECT
public:
- MainProjectPanelImpl(TQWidget *tqparent=0, const char *name=0);
+ MainProjectPanelImpl(TQWidget *parent=0, const char *name=0);
virtual TQDateTime startDateTime();
virtual TQDateTime endDateTime();
@@ -61,7 +61,7 @@ class MainProjectPanel : public MainProjectPanelImpl {
Q_OBJECT
TQ_OBJECT
public:
- MainProjectPanel(Project &project, TQWidget *tqparent=0, const char *name=0);
+ MainProjectPanel(Project &project, TQWidget *parent=0, const char *name=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptmilestoneprogressdialog.h b/kplato/kptmilestoneprogressdialog.h
index 9cff7dba..28f13969 100644
--- a/kplato/kptmilestoneprogressdialog.h
+++ b/kplato/kptmilestoneprogressdialog.h
@@ -35,7 +35,7 @@ class MilestoneProgressDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- MilestoneProgressDialog(Task &task, TQWidget *tqparent=0);
+ MilestoneProgressDialog(Task &task, TQWidget *parent=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptmilestoneprogresspanel.cc b/kplato/kptmilestoneprogresspanel.cc
index 14e83b06..b5c1af0a 100644
--- a/kplato/kptmilestoneprogresspanel.cc
+++ b/kplato/kptmilestoneprogresspanel.cc
@@ -34,8 +34,8 @@
namespace KPlato
{
-MilestoneProgressPanel::MilestoneProgressPanel(Task &task, TQWidget *tqparent, const char *name)
- : MilestoneProgressPanelImpl(tqparent, name),
+MilestoneProgressPanel::MilestoneProgressPanel(Task &task, TQWidget *parent, const char *name)
+ : MilestoneProgressPanelImpl(parent, name),
m_task(task)
{
kdDebug()<<k_funcinfo<<endl;
@@ -68,8 +68,8 @@ KCommand *MilestoneProgressPanel::buildCommand(Part *part) {
//-------------------------------------
-MilestoneProgressPanelImpl::MilestoneProgressPanelImpl(TQWidget *tqparent, const char *name, WFlags f)
- : MilestoneProgressPanelBase(tqparent, name, f) {
+MilestoneProgressPanelImpl::MilestoneProgressPanelImpl(TQWidget *parent, const char *name, WFlags f)
+ : MilestoneProgressPanelBase(parent, name, f) {
connect(finished, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFinishedChanged(bool)));
connect(finished, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
diff --git a/kplato/kptmilestoneprogresspanel.h b/kplato/kptmilestoneprogresspanel.h
index 4129e80c..24dfd060 100644
--- a/kplato/kptmilestoneprogresspanel.h
+++ b/kplato/kptmilestoneprogresspanel.h
@@ -35,7 +35,7 @@ class MilestoneProgressPanelImpl : public MilestoneProgressPanelBase {
Q_OBJECT
TQ_OBJECT
public:
- MilestoneProgressPanelImpl(TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+ MilestoneProgressPanelImpl(TQWidget *parent=0, const char *name=0, WFlags f=0);
void enableWidgets();
@@ -51,7 +51,7 @@ class MilestoneProgressPanel : public MilestoneProgressPanelImpl {
Q_OBJECT
TQ_OBJECT
public:
- MilestoneProgressPanel(Task &task, TQWidget *tqparent=0, const char *name=0);
+ MilestoneProgressPanel(Task &task, TQWidget *parent=0, const char *name=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc
index aaa770f0..1da218e6 100644
--- a/kplato/kptnode.cc
+++ b/kplato/kptnode.cc
@@ -34,19 +34,19 @@
namespace KPlato
{
-Node::Node(Node *tqparent) : m_nodes(), m_dependChildNodes(), m_dependParentNodes() {
+Node::Node(Node *parent) : m_nodes(), m_dependChildNodes(), m_dependParentNodes() {
//kdDebug()<<k_funcinfo<<"("<<this<<")"<<endl;
- m_parent = tqparent;
+ m_parent = parent;
init();
m_id = TQString(); // Not mapped
}
-Node::Node(Node &node, Node *tqparent)
+Node::Node(Node &node, Node *parent)
: m_nodes(),
m_dependChildNodes(),
m_dependParentNodes() {
//kdDebug()<<k_funcinfo<<"("<<this<<")"<<endl;
- m_parent = tqparent;
+ m_parent = parent;
init();
m_name = node.name();
m_leader = node.leader();
@@ -113,7 +113,7 @@ Node *Node::projectNode() {
if (m_parent)
return m_parent->projectNode();
- kdError()<<k_funcinfo<<"Ooops, no tqparent and no project found"<<endl;
+ kdError()<<k_funcinfo<<"Ooops, no parent and no project found"<<endl;
return 0;
}
@@ -313,7 +313,7 @@ bool Node::isParentOf(Node *node) {
Relation *Node::findParentRelation(Node *node) {
for (int i=0; i<numDependParentNodes(); i++) {
Relation *rel = getDependParentNode(i);
- if (rel->tqparent() == node)
+ if (rel->parent() == node)
return rel;
}
return (Relation *)0;
@@ -339,9 +339,9 @@ bool Node::isDependChildOf(Node *node) {
//kdDebug()<<k_funcinfo<<" '"<<m_name<<"' checking against '"<<node->name()<<"'"<<endl;
for (int i=0; i<numDependParentNodes(); i++) {
Relation *rel = getDependParentNode(i);
- if (rel->tqparent() == node)
+ if (rel->parent() == node)
return true;
- if (rel->tqparent()->isDependChildOf(node))
+ if (rel->parent()->isDependChildOf(node))
return true;
}
return false;
@@ -652,7 +652,7 @@ bool Node::addAppointment(Appointment *appointment, Schedule &main) {
void Node::addAppointment(ResourceSchedule *resource, DateTime &start, DateTime &end, double load) {
Schedule *node = findSchedule(resource->id());
if (node == 0) {
- node = createSchedule(resource->tqparent());
+ node = createSchedule(resource->parent());
}
node->addAppointment(resource, start, end, load);
}
@@ -678,9 +678,9 @@ Schedule *Node::createSchedule(TQString name, Schedule::Type type, long id) {
return sch;
}
-Schedule *Node::createSchedule(Schedule *tqparent) {
+Schedule *Node::createSchedule(Schedule *parent) {
//kdDebug()<<k_funcinfo<<name<<" type="<<type<<" id="<<(int)id<<endl;
- NodeSchedule *sch = new NodeSchedule(tqparent, this);
+ NodeSchedule *sch = new NodeSchedule(parent, this);
addSchedule(sch);
return sch;
}
@@ -743,7 +743,7 @@ bool Node::calcCriticalPath(bool fromEnd) {
}
TQPtrListIterator<Relation> pit(m_dependParentNodes);
for (; pit.current(); ++pit) {
- if (pit.current()->tqparent()->calcCriticalPath(fromEnd)) {
+ if (pit.current()->parent()->calcCriticalPath(fromEnd)) {
m_currentSchedule->inCriticalPath = true;
}
}
diff --git a/kplato/kptnode.h b/kplato/kptnode.h
index d6a6bbef..95d7c24b 100644
--- a/kplato/kptnode.h
+++ b/kplato/kptnode.h
@@ -59,8 +59,8 @@ class Node {
public:
enum ConstraintType { ASAP, ALAP, MustStartOn, MustFinishOn, StartNotEarlier, FinishNotLater, FixedInterval };
- Node(Node *tqparent = 0);
- Node(Node &node, Node *tqparent = 0);
+ Node(Node *parent = 0);
+ Node(Node &node, Node *parent = 0);
// Declare the class abstract
@@ -374,7 +374,7 @@ public:
virtual bool legalToLink(Node *, Node *) { return false; }
/// Check if this node has any dependent child nodes
virtual bool isEndNode() const;
- /// Check if this node has any dependent tqparent nodes
+ /// Check if this node has any dependent parent nodes
virtual bool isStartNode() const;
virtual void clearProxyRelations() {}
virtual void addParentProxyRelations(TQPtrList<Relation> &) {}
@@ -477,11 +477,11 @@ public:
/// Create a new schedule.
Schedule *createSchedule(TQString name, Schedule::Type type, long id);
/// Create a new schedule.
- Schedule *createSchedule(Schedule *tqparent);
+ Schedule *createSchedule(Schedule *parent);
/// Set deleted = onoff for schedule with id
void setScheduleDeleted(long id, bool onoff);
- /// Set tqparent schedule recursivly
+ /// Set parent schedule recursivly
virtual void setParentSchedule(Schedule *sch);
DateTime startTime()
diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc
index f3075f37..e442c048 100644
--- a/kplato/kptpart.cc
+++ b/kplato/kptpart.cc
@@ -49,8 +49,8 @@ namespace KPlato
{
Part::Part(TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, bool singleViewMode)
- : KoDocument(parentWidget, widgetName, tqparent, name, singleViewMode),
+ TQObject *parent, const char *name, bool singleViewMode)
+ : KoDocument(parentWidget, widgetName, parent, name, singleViewMode),
m_project(0), m_projectDialog(0), m_parentWidget(parentWidget), m_view(0),
m_embeddedGanttView(new GanttView(parentWidget)),
m_embeddedContext(new Context()), m_embeddedContextInitialized(false),
@@ -141,12 +141,12 @@ bool Part::initDoc(InitDocFlags flags, TQWidget* parentWidget) {
}
-KoView *Part::createViewInstance(TQWidget *tqparent, const char *name) {
- m_view = new View(this, tqparent, name);
+KoView *Part::createViewInstance(TQWidget *parent, const char *name) {
+ m_view = new View(this, parent, name);
connect(m_view,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotViewDestroyed()));
// If there is a project dialog this should be deleted so it will
- // use the m_view as tqparent. If the dialog will be needed again,
+ // use the m_view as parent. If the dialog will be needed again,
// it will be made at that point
if (m_projectDialog != 0) {
kdDebug() << "Deleting m_projectDialog because of new ViewInstance\n";
@@ -169,13 +169,13 @@ KoView *Part::createViewInstance(TQWidget *tqparent, const char *name) {
void Part::editProject() {
- TQWidget* tqparent = m_parentWidget;
+ TQWidget* parent = m_parentWidget;
if (m_view)
- tqparent = m_view;
+ parent = m_view;
if (m_projectDialog == 0)
// Make the dialog
- m_projectDialog = new ProjectDialog(*m_project, tqparent);
+ m_projectDialog = new ProjectDialog(*m_project, parent);
m_projectDialog->exec();
}
diff --git a/kplato/kptpart.h b/kplato/kptpart.h
index 25ba542e..1eab7bdd 100644
--- a/kplato/kptpart.h
+++ b/kplato/kptpart.h
@@ -50,7 +50,7 @@ class Part : public KoDocument, public KoTextZoomHandler {
public:
Part(TQWidget *parentWidget = 0, const char *widgetName = 0,
- TQObject* tqparent = 0, const char* name = 0,
+ TQObject* parent = 0, const char* name = 0,
bool singleViewMode = false);
~Part();
@@ -86,7 +86,7 @@ public:
const XMLLoaderObject &xmlLoader() const { return m_xmlLoader; }
protected:
- virtual KoView* createViewInstance(TQWidget* tqparent, const char* name);
+ virtual KoView* createViewInstance(TQWidget* parent, const char* name);
protected slots:
void slotDocumentRestored();
diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc
index e269c6ed..b1f49afb 100644
--- a/kplato/kptpertcanvas.cc
+++ b/kplato/kptpertcanvas.cc
@@ -48,8 +48,8 @@
namespace KPlato
{
-PertCanvas::PertCanvas( TQWidget *tqparent )
- : TQCanvasView( tqparent, "Pert canvas" /*WNorthWestGravity WStaticContents| WResizeNoErase | WRepaintNoErase */),
+PertCanvas::PertCanvas( TQWidget *parent )
+ : TQCanvasView( parent, "Pert canvas" /*WNorthWestGravity WStaticContents| WResizeNoErase | WRepaintNoErase */),
m_verticalGap(20),
m_horizontalGap(10),
m_itemSize(100,30)
@@ -153,7 +153,7 @@ void PertCanvas::drawRelations()
TQPtrListIterator<Relation> it(m_relations);
for (; it.current(); ++it)
{
- PertNodeItem *parentItem = m_nodes.find(it.current()->tqparent());
+ PertNodeItem *parentItem = m_nodes.find(it.current()->parent());
PertNodeItem *childItem = m_nodes.find(it.current()->child());
if (parentItem && childItem)
{
@@ -192,7 +192,7 @@ void PertCanvas::mapChildNode(PertNodeItem *parentItem, PertNodeItem *childItem,
if (type == Relation::StartStart ||
type == Relation::FinishFinish)
{
- // node goes into row below tqparent, at least same col
+ // node goes into row below parent, at least same col
if (chMapped)
{
m_rows.at(chRow)->at(chCol) = false;
diff --git a/kplato/kptpertcanvas.h b/kplato/kptpertcanvas.h
index 437bb6fa..58b31a01 100644
--- a/kplato/kptpertcanvas.h
+++ b/kplato/kptpertcanvas.h
@@ -43,7 +43,7 @@ class PertCanvas : public TQCanvasView
TQ_OBJECT
public:
- PertCanvas( TQWidget *tqparent );
+ PertCanvas( TQWidget *parent );
virtual ~PertCanvas();
void draw(Project& project);
diff --git a/kplato/kptpertview.cc b/kplato/kptpertview.cc
index 3bd37636..02830d37 100644
--- a/kplato/kptpertview.cc
+++ b/kplato/kptpertview.cc
@@ -40,8 +40,8 @@
namespace KPlato
{
-PertView::PertView( View *view, TQWidget *tqparent, TQLayout *tqlayout )
- : TQWidget( tqparent, "Pert view" ),
+PertView::PertView( View *view, TQWidget *parent, TQLayout *tqlayout )
+ : TQWidget( parent, "Pert view" ),
m_mainview( view ),
m_node( 0 )
{
diff --git a/kplato/kptpertview.h b/kplato/kptpertview.h
index ed4e3c28..b98b2cae 100644
--- a/kplato/kptpertview.h
+++ b/kplato/kptpertview.h
@@ -44,7 +44,7 @@ class PertView : public TQWidget
public:
- PertView( View *view, TQWidget *tqparent, TQLayout *tqlayout );
+ PertView( View *view, TQWidget *parent, TQLayout *tqlayout );
~PertView();
diff --git a/kplato/kptproject.cc b/kplato/kptproject.cc
index d06c5e51..9379de4a 100644
--- a/kplato/kptproject.cc
+++ b/kplato/kptproject.cc
@@ -42,8 +42,8 @@ namespace KPlato
{
-Project::Project(Node *tqparent)
- : Node(tqparent),
+Project::Project(Node *parent)
+ : Node(parent),
m_accounts(*this),
m_baselined(false) {
//kdDebug()<<k_funcinfo<<"("<<this<<")"<<endl;
@@ -55,7 +55,7 @@ Project::Project(Node *tqparent)
void Project::init() {
if (m_parent == 0) {
- // set sensible defaults for a project wo tqparent
+ // set sensible defaults for a project wo parent
m_constraintStartTime = TQDateTime(TQDate::tqcurrentDate(), TQTime());
m_constraintEndTime = TQDateTime(m_constraintStartTime.addDays(1));
}
@@ -173,7 +173,7 @@ Duration *Project::getRandomDuration() {
DateTime Project::calculateForward(int use) {
//kdDebug()<<k_funcinfo<<m_name<<endl;
if (type() == Node::Type_Project) {
- // Follow *tqparent* relations back and
+ // Follow *parent* relations back and
// calculate forwards following the child relations
DateTime finish;
DateTime time;
@@ -195,7 +195,7 @@ DateTime Project::calculateBackward(int use) {
//kdDebug()<<k_funcinfo<<m_name<<endl;
if (type() == Node::Type_Project) {
// Follow *child* relations back and
- // calculate backwards following tqparent relation
+ // calculate backwards following parent relation
DateTime start;
DateTime time;
TQPtrListIterator<Node> startnodes = m_startNodes;
@@ -441,7 +441,7 @@ bool Project::load(TQDomElement &element) {
TQPtrListIterator<Calendar> calit(m_calendars);
for (; calit.current(); ++calit) {
if (calit.current()->id() == calit.current()->parentId()) {
- kdError()<<k_funcinfo<<"Calendar want itself as tqparent"<<endl;
+ kdError()<<k_funcinfo<<"Calendar want itself as parent"<<endl;
continue;
}
calit.current()->setParent(calendar(calit.current()->parentId()));
@@ -491,7 +491,7 @@ void Project::save(TQDomElement &element) const {
git.current()->save(me);
}
- // Only save tqparent relations
+ // Only save parent relations
TQPtrListIterator<Relation> it(m_dependParentNodes);
for ( ; it.current(); ++it ) {
it.current()->save(me);
@@ -568,10 +568,10 @@ bool Project::addTask( Node* task, Node* position )
return addSubTask(task, position);
}
// find the position
- // we have to tell the tqparent that we want to delete one of its tqchildren
+ // we have to tell the parent that we want to delete one of its tqchildren
Node* parentNode = position->getParent();
if ( !parentNode ) {
- kdDebug()<<k_funcinfo<<"tqparent node not found???"<<endl;
+ kdDebug()<<k_funcinfo<<"parent node not found???"<<endl;
return false;
}
int index = parentNode->findChildNode( position );
@@ -588,7 +588,7 @@ bool Project::addSubTask( Node* task, Node* position )
// we want to add a subtask to the node "position". It will become
// position's last child.
if ( 0 == position ) {
- kdError()<<k_funcinfo<<"No tqparent, can not add subtask: "<<task->name()<<endl;
+ kdError()<<k_funcinfo<<"No parent, can not add subtask: "<<task->name()<<endl;
return false;
}
if (!registerNodeId(task)) {
@@ -599,30 +599,30 @@ bool Project::addSubTask( Node* task, Node* position )
return true;
}
-bool Project::addSubTask( Node* task, int index, Node* tqparent )
+bool Project::addSubTask( Node* task, int index, Node* parent )
{
- // we want to add a subtask to the node "tqparent" at the given index.
- if ( 0 == tqparent ) {
- kdError()<<k_funcinfo<<"No tqparent, can not add subtask: "<<task->name()<<endl;
+ // we want to add a subtask to the node "parent" at the given index.
+ if ( 0 == parent ) {
+ kdError()<<k_funcinfo<<"No parent, can not add subtask: "<<task->name()<<endl;
return false;
}
if (!registerNodeId(task)) {
kdError()<<k_funcinfo<<"Failed to register node id, can not add subtask: "<<task->name()<<endl;
return false;
}
- tqparent->insertChildNode(index, task);
+ parent->insertChildNode(index, task);
return true;
}
void Project::delTask(Node *node)
{
- Node *tqparent = node->getParent();
- if (tqparent == 0) {
- kdDebug()<<k_funcinfo<<"Node must have a tqparent!"<<endl;
+ Node *parent = node->getParent();
+ if (parent == 0) {
+ kdDebug()<<k_funcinfo<<"Node must have a parent!"<<endl;
return;
}
removeId(node->id());
- tqparent->delChildNode(node, false/*take*/);
+ parent->delChildNode(node, false/*take*/);
}
bool Project::canIndentTask(Node* node)
@@ -636,7 +636,7 @@ bool Project::canIndentTask(Node* node)
//kdDebug()<<k_funcinfo<<"The root node cannot be indented"<<endl;
return false;
}
- // we have to find the tqparent of task to manipulate its list of tqchildren
+ // we have to find the parent of task to manipulate its list of tqchildren
Node* parentNode = node->getParent();
if ( !parentNode ) {
return false;
@@ -647,11 +647,11 @@ bool Project::canIndentTask(Node* node)
}
Node *sib = node->siblingBefore();
if (!sib) {
- //kdDebug()<<k_funcinfo<<"new tqparent node not found"<<endl;
+ //kdDebug()<<k_funcinfo<<"new parent node not found"<<endl;
return false;
}
if (node->findParentRelation(sib) || node->findChildRelation(sib)) {
- //kdDebug()<<k_funcinfo<<"Cannot have relations to tqparent"<<endl;
+ //kdDebug()<<k_funcinfo<<"Cannot have relations to parent"<<endl;
return false;
}
return true;
@@ -679,8 +679,8 @@ bool Project::canUnindentTask( Node* node )
//kdDebug()<<k_funcinfo<<"The root node cannot be unindented"<<endl;
return false;
}
- // we have to find the tqparent of task to manipulate its list of tqchildren
- // and we need the tqparent's tqparent too
+ // we have to find the parent of task to manipulate its list of tqchildren
+ // and we need the parent's parent too
Node* parentNode = node->getParent();
if ( !parentNode ) {
return false;
@@ -714,10 +714,10 @@ bool Project::canMoveTaskUp( Node* node )
{
if (node == 0)
return false; // safety
- // we have to find the tqparent of task to manipulate its list of tqchildren
+ // we have to find the parent of task to manipulate its list of tqchildren
Node* parentNode = node->getParent();
if (!parentNode) {
- //kdDebug()<<k_funcinfo<<"No tqparent found"<<endl;
+ //kdDebug()<<k_funcinfo<<"No parent found"<<endl;
return false;
}
if (parentNode->findChildNode(node) == -1) {
@@ -742,7 +742,7 @@ bool Project::canMoveTaskDown( Node* node )
{
if (node == 0)
return false; // safety
- // we have to find the tqparent of task to manipulate its list of tqchildren
+ // we have to find the parent of task to manipulate its list of tqchildren
Node* parentNode = node->getParent();
if (!parentNode) {
return false;
@@ -765,14 +765,14 @@ bool Project::moveTaskDown( Node* node )
return false;
}
-Task *Project::createTask(Node* tqparent) {
- Task* node = new Task(tqparent);
+Task *Project::createTask(Node* parent) {
+ Task* node = new Task(parent);
node->setId(uniqueNodeId());
return node;
}
-Task *Project::createTask(Task &def, Node* tqparent) {
- Task* node = new Task(def, tqparent);
+Task *Project::createTask(Task &def, Node* parent) {
+ Task* node = new Task(def, parent);
node->setId(uniqueNodeId());
return node;
}
@@ -1009,7 +1009,7 @@ bool Project::legalParents(Node *par, Node *child) {
bool legal = true;
//kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl;
for (int i=0; i < par->numDependParentNodes() && legal; ++i) {
- Node *pNode = par->getDependParentNode(i)->tqparent();
+ Node *pNode = par->getDependParentNode(i)->parent();
if (child->isParentOf(pNode) || pNode->isParentOf(child)) {
//kdDebug()<<k_funcinfo<<"Found: "<<pNode->name()<<" is related to "<<child->name()<<endl;
legal = false;
diff --git a/kplato/kptproject.h b/kplato/kptproject.h
index edfa83d1..14f03384 100644
--- a/kplato/kptproject.h
+++ b/kplato/kptproject.h
@@ -51,7 +51,7 @@ class StandardWorktime;
*/
class Project : public Node {
public:
- Project(Node *tqparent = 0);
+ Project(Node *parent = 0);
~Project();
/// Returns the node type. Can be Type_Project or Type_Subproject.
@@ -100,7 +100,7 @@ public:
bool addTask( Node* task, Node* position );
bool addSubTask( Node* task, Node* position );
- bool addSubTask( Node* task, int index, Node* tqparent );
+ bool addSubTask( Node* task, int index, Node* parent );
void delTask(Node *node);
bool canIndentTask(Node* node);
bool indentTask( Node* node );
@@ -110,8 +110,8 @@ public:
bool moveTaskUp( Node* node );
bool canMoveTaskDown( Node* node );
bool moveTaskDown( Node* node );
- Task *createTask(Node* tqparent);
- Task *createTask(Task &def, Node* tqparent);
+ Task *createTask(Node* parent);
+ Task *createTask(Task &def, Node* parent);
/// Returns the resourcegroup with identity id.
ResourceGroup *group(TQString id);
@@ -227,7 +227,7 @@ public:
virtual void setCurrentSchedule(long id);
/// Create new schedule with unique id.
MainSchedule *createSchedule(TQString name, Schedule::Type type);
- /// Set tqparent schedule for my tqchildren
+ /// Set parent schedule for my tqchildren
virtual void setParentSchedule(Schedule *sch);
protected:
diff --git a/kplato/kptprojectdialog.cc b/kplato/kptprojectdialog.cc
index add74c8e..a45bddf2 100644
--- a/kplato/kptprojectdialog.cc
+++ b/kplato/kptprojectdialog.cc
@@ -44,8 +44,8 @@
namespace KPlato
{
-ProjectDialog::ProjectDialog(Project &p, TQWidget *tqparent, const char *name)
- : KDialogBase( Swallow, i18n("Project Settings"), Ok|Cancel, Ok, tqparent, name, true, true),
+ProjectDialog::ProjectDialog(Project &p, TQWidget *parent, const char *name)
+ : KDialogBase( Swallow, i18n("Project Settings"), Ok|Cancel, Ok, parent, name, true, true),
project(p)
{
dia = new ProjectDialogImpl(this);
@@ -117,7 +117,7 @@ void ProjectDialog::slotSchedulingChanged(int activated) {
dia->lSchedulingExplain->setText(label);
}
-ProjectDialogImpl::ProjectDialogImpl (TQWidget *tqparent) : ProjectDialogBase(tqparent) {
+ProjectDialogImpl::ProjectDialogImpl (TQWidget *parent) : ProjectDialogBase(parent) {
connect (namefield, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotCheckAllFieldsFilled()) );
connect (leaderfield, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotCheckAllFieldsFilled()) );
connect (schedulerType, TQT_SIGNAL(activated( int )), this, TQT_SLOT(slotSchedulingChanged( int )) );
diff --git a/kplato/kptprojectdialog.h b/kplato/kptprojectdialog.h
index 0f9cc95e..e2655b1a 100644
--- a/kplato/kptprojectdialog.h
+++ b/kplato/kptprojectdialog.h
@@ -39,7 +39,7 @@ class ProjectDialogImpl : public ProjectDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- ProjectDialogImpl (TQWidget *tqparent);
+ ProjectDialogImpl (TQWidget *parent);
private slots:
void slotCheckAllFieldsFilled();
@@ -55,7 +55,7 @@ class ProjectDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- ProjectDialog(Project &project, TQWidget *tqparent=0,
+ ProjectDialog(Project &project, TQWidget *parent=0,
const char *name=0);
diff --git a/kplato/kptrelation.cc b/kplato/kptrelation.cc
index 3814c51c..e84b72a2 100644
--- a/kplato/kptrelation.cc
+++ b/kplato/kptrelation.cc
@@ -31,29 +31,29 @@
namespace KPlato
{
-Relation::Relation(Node *tqparent, Node *child, Type type, Duration lag) {
- m_parent=tqparent;
+Relation::Relation(Node *parent, Node *child, Type type, Duration lag) {
+ m_parent=parent;
m_child=child;
m_type=type;
m_lag=lag;
}
-Relation::Relation(Node *tqparent, Node *child, Type type) {
- m_parent=tqparent;
+Relation::Relation(Node *parent, Node *child, Type type) {
+ m_parent=parent;
m_child=child;
m_type=type;
m_lag=Duration();
}
Relation::Relation(Relation *rel) {
- m_parent=rel->tqparent();
+ m_parent=rel->parent();
m_child=rel->child();
m_type=rel->type();
m_lag=rel->lag();
}
Relation::~Relation() {
- //kdDebug()<<k_funcinfo<<"tqparent: "<<(m_parent ? m_parent->name():"none")<<" child: "<<(m_child ? m_child->name():"None")<<endl;
+ //kdDebug()<<k_funcinfo<<"parent: "<<(m_parent ? m_parent->name():"none")<<" child: "<<(m_child ? m_child->name():"None")<<endl;
if (m_parent)
m_parent->takeDependChildNode(this);
if (m_child)
@@ -66,7 +66,7 @@ void Relation::setType(Type type) {
bool Relation::load(TQDomElement &element, Project &project) {
- m_parent = project.findNode(element.attribute("tqparent-id"));
+ m_parent = project.findNode(element.attribute("parent-id"));
if (m_parent == 0) {
return false;
}
@@ -75,7 +75,7 @@ bool Relation::load(TQDomElement &element, Project &project) {
return false;
}
if (m_child == m_parent) {
- kdDebug()<<k_funcinfo<<"child == tqparent"<<endl;
+ kdDebug()<<k_funcinfo<<"child == parent"<<endl;
return false;
}
if (!m_parent->legalToLink(m_child))
@@ -94,16 +94,16 @@ bool Relation::load(TQDomElement &element, Project &project) {
m_lag = Duration::fromString(element.attribute("lag"));
if (!m_parent->addDependChildNode(this)) {
- kdError()<<k_funcinfo<<"Failed to add relation: Child="<<m_child->name()<<" tqparent="<<m_parent->name()<<endl;
+ kdError()<<k_funcinfo<<"Failed to add relation: Child="<<m_child->name()<<" parent="<<m_parent->name()<<endl;
return false;
}
if (!m_child->addDependParentNode(this)) {
m_parent->delDependChildNode(this, false/*do not delete*/);
- kdError()<<k_funcinfo<<"Failed to add relation: Child="<<m_child->name()<<" tqparent="<<m_parent->name()<<endl;
+ kdError()<<k_funcinfo<<"Failed to add relation: Child="<<m_child->name()<<" parent="<<m_parent->name()<<endl;
return false;
}
- //kdDebug()<<k_funcinfo<<"Added relation: Child="<<m_child->name()<<" tqparent="<<m_parent->name()<<endl;
+ //kdDebug()<<k_funcinfo<<"Added relation: Child="<<m_child->name()<<" parent="<<m_parent->name()<<endl;
return true;
}
@@ -112,7 +112,7 @@ void Relation::save(TQDomElement &element) const {
TQDomElement me = element.ownerDocument().createElement("relation");
element.appendChild(me);
- me.setAttribute("tqparent-id", m_parent->id());
+ me.setAttribute("parent-id", m_parent->id());
me.setAttribute("child-id", m_child->id());
TQString type = "Finish-Start";
switch (m_type) {
diff --git a/kplato/kptrelation.h b/kplato/kptrelation.h
index 35c2869a..c84b7cf8 100644
--- a/kplato/kptrelation.h
+++ b/kplato/kptrelation.h
@@ -46,13 +46,13 @@ class Relation {
public:
enum Type { FinishStart, FinishFinish, StartStart };
- Relation(Node *tqparent, Node *child, Type type, Duration lag);
- Relation(Node *tqparent=0, Node *child=0, Type type=FinishStart);
+ Relation(Node *parent, Node *child, Type type, Duration lag);
+ Relation(Node *parent=0, Node *child=0, Type type=FinishStart);
Relation(Relation *rel);
/**
* When deleted the relation will remove itself from
- * the tqparent- and child nodes lists
+ * the parent- and child nodes lists
*/
virtual ~Relation();
@@ -60,16 +60,16 @@ public:
Type type() const { return m_type; }
/** returns the lag.
- * The lag of a relation is the time it takes between the tqparent starting/stopping
+ * The lag of a relation is the time it takes between the parent starting/stopping
* and the start of the child.
*/
const Duration &lag() const { return m_lag; }
void setLag(Duration lag) { m_lag = lag; }
/**
- * @return The tqparent dependent node.
+ * @return The parent dependent node.
*/
- Node *tqparent() const { return m_parent; }
+ Node *parent() const { return m_parent; }
/**
* @return The child dependent node.
*/
@@ -103,8 +103,8 @@ public:
class ProxyRelation : public Relation
{
public:
- ProxyRelation(Node *tqparent, Node *child, Relation::Type type, Duration lag)
- : Relation(tqparent, child, type, lag)
+ ProxyRelation(Node *parent, Node *child, Relation::Type type, Duration lag)
+ : Relation(parent, child, type, lag)
{}
~ProxyRelation() { m_parent = 0; m_child = 0;}
diff --git a/kplato/kptrelationdialog.cc b/kplato/kptrelationdialog.cc
index 938496b0..c79adb6f 100644
--- a/kplato/kptrelationdialog.cc
+++ b/kplato/kptrelationdialog.cc
@@ -49,7 +49,7 @@ AddRelationDialog::AddRelationDialog(Relation *rel, TQWidget *p, TQString captio
setMainWidget(m_panel);
m_panel->setActiveWindow();
- m_panel->fromName->setText(rel->tqparent()->name());
+ m_panel->fromName->setText(rel->parent()->name());
m_panel->toName->setText(rel->child()->name());
m_panel->relationType->setButton(rel->type());
diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc
index 3cecf3eb..655d1907 100644
--- a/kplato/kptreportview.cc
+++ b/kplato/kptreportview.cc
@@ -158,8 +158,8 @@ public:
class KugarReportViewer : public Kugar::MReportViewer {
public:
- KugarReportViewer(TQWidget *tqparent = 0, const char *name = 0)
- : MReportViewer(tqparent, name)
+ KugarReportViewer(TQWidget *parent = 0, const char *name = 0)
+ : MReportViewer(parent, name)
{}
int currentPage() {
@@ -170,8 +170,8 @@ public:
}
};
-ReportView::ReportView(View *view, TQWidget *tqparent)
- : TQSplitter(tqparent),
+ReportView::ReportView(View *view, TQWidget *parent)
+ : TQSplitter(parent),
m_mainview(view),
m_reportTags(0)
{
diff --git a/kplato/kptreportview.h b/kplato/kptreportview.h
index 8dd023e2..24e28c08 100644
--- a/kplato/kptreportview.h
+++ b/kplato/kptreportview.h
@@ -59,7 +59,7 @@ class ReportView : public TQSplitter
public:
- ReportView(View *view, TQWidget *tqparent);
+ ReportView(View *view, TQWidget *parent);
~ReportView();
diff --git a/kplato/kptrequestresourcespanel.cc b/kplato/kptrequestresourcespanel.cc
index 0b1f7740..d65f86e7 100644
--- a/kplato/kptrequestresourcespanel.cc
+++ b/kplato/kptrequestresourcespanel.cc
@@ -71,8 +71,8 @@ void ResourceTableItem::insert(TQTable *table, int row) {
//kdDebug()<<k_funcinfo<<"Added: '"<<m_resource->name()<<"' checked="<<m_checked<<endl;
}
-GroupLVItem::GroupLVItem(TQListView *tqparent, ResourceGroup *group, Task &task)
- : TQListViewItem(tqparent, group->name(), TQString("%1").tqarg(group->units())),
+GroupLVItem::GroupLVItem(TQListView *parent, ResourceGroup *group, Task &task)
+ : TQListViewItem(parent, group->name(), TQString("%1").tqarg(group->units())),
m_group(group),
m_units(0)
{
@@ -147,8 +147,8 @@ bool GroupLVItem::isNull() const {
return true;
}
-RequestResourcesPanel::RequestResourcesPanel(TQWidget *tqparent, Task &task, bool baseline)
- : TaskResourcesPanelBase(tqparent),
+RequestResourcesPanel::RequestResourcesPanel(TQWidget *parent, Task &task, bool baseline)
+ : TaskResourcesPanelBase(parent),
m_task(task),
m_worktime(0),
selectedGroup(0),
diff --git a/kplato/kptrequestresourcespanel.h b/kplato/kptrequestresourcespanel.h
index ada8ef10..c9259ea5 100644
--- a/kplato/kptrequestresourcespanel.h
+++ b/kplato/kptrequestresourcespanel.h
@@ -72,7 +72,7 @@ public:
class GroupLVItem : public TQListViewItem {
public:
- GroupLVItem(TQListView *tqparent, ResourceGroup *group, Task &task);
+ GroupLVItem(TQListView *parent, ResourceGroup *group, Task &task);
~GroupLVItem();
void update();
@@ -94,7 +94,7 @@ class RequestResourcesPanel : public TaskResourcesPanelBase {
Q_OBJECT
TQ_OBJECT
public:
- RequestResourcesPanel(TQWidget *tqparent, Task &task, bool baseline=false);
+ RequestResourcesPanel(TQWidget *parent, Task &task, bool baseline=false);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptresource.cc b/kplato/kptresource.cc
index 1b732e87..448074ae 100644
--- a/kplato/kptresource.cc
+++ b/kplato/kptresource.cc
@@ -231,7 +231,7 @@ Resource::~Resource() {
}
m_requests.first();
for (; m_requests.current(); m_requests.next()) {
- m_requests.current()->tqparent()->removeResourceRequest(m_requests.current()); // deletes the request
+ m_requests.current()->parent()->removeResourceRequest(m_requests.current()); // deletes the request
}
}
@@ -432,7 +432,7 @@ void Resource::addAppointment(Schedule *node, DateTime &start, DateTime &end, do
//kdDebug()<<k_funcinfo<<endl;
Schedule *s = findSchedule(node->id());
if (s == 0) {
- s = createSchedule(node->tqparent());
+ s = createSchedule(node->parent());
}
s->addAppointment(node, start, end, load);
}
@@ -466,8 +466,8 @@ ResourceSchedule *Resource::createSchedule(TQString name, int type, long id) {
return sch;
}
-ResourceSchedule *Resource::createSchedule(Schedule *tqparent) {
- ResourceSchedule *sch = new ResourceSchedule(tqparent, this);
+ResourceSchedule *Resource::createSchedule(Schedule *parent) {
+ ResourceSchedule *sch = new ResourceSchedule(parent, this);
addSchedule(sch);
return sch;
}
diff --git a/kplato/kptresource.h b/kplato/kptresource.h
index e298a022..d4930f2f 100644
--- a/kplato/kptresource.h
+++ b/kplato/kptresource.h
@@ -322,7 +322,7 @@ public:
void takeSchedule(const Schedule *schedule);
void addSchedule(Schedule *schedule);
ResourceSchedule *createSchedule(TQString name, int type, long id);
- ResourceSchedule *createSchedule(Schedule *tqparent);
+ ResourceSchedule *createSchedule(Schedule *parent);
protected:
void makeAppointment(Schedule *node, const DateTime &from, const DateTime &end);
@@ -394,8 +394,8 @@ class ResourceRequest {
~ResourceRequest();
- ResourceGroupRequest *tqparent() const { return m_parent; }
- void setParent(ResourceGroupRequest *tqparent) { m_parent = tqparent; }
+ ResourceGroupRequest *parent() const { return m_parent; }
+ void setParent(ResourceGroupRequest *parent) { m_parent = parent; }
Resource *resource() const { return m_resource; }
void setResource(Resource* resource) { m_resource = resource; }
@@ -438,8 +438,8 @@ class ResourceGroupRequest {
ResourceGroupRequest(ResourceGroup *group=0, int units=0);
~ResourceGroupRequest();
- void setParent(ResourceRequestCollection *tqparent) { m_parent = tqparent;}
- ResourceRequestCollection *tqparent() const { return m_parent; }
+ void setParent(ResourceRequestCollection *parent) { m_parent = parent;}
+ ResourceRequestCollection *parent() const { return m_parent; }
ResourceGroup *group() const { return m_group; }
TQPtrList<ResourceRequest> &resourceRequests() { return m_resourceRequests; }
diff --git a/kplato/kptresourceappointmentsview.cc b/kplato/kptresourceappointmentsview.cc
index 3768ebef..4b6d7a44 100644
--- a/kplato/kptresourceappointmentsview.cc
+++ b/kplato/kptresourceappointmentsview.cc
@@ -36,8 +36,8 @@
namespace KPlato
{
-ResourceAppointmentsView::NodeItem::NodeItem(Node *t, TQListView *tqparent, bool highlight)
- : DoubleListViewBase::MasterListItem(tqparent, t->name(), highlight),
+ResourceAppointmentsView::NodeItem::NodeItem(Node *t, TQListView *parent, bool highlight)
+ : DoubleListViewBase::MasterListItem(parent, t->name(), highlight),
node(t) {
setFormat(0, 'f', 1);
@@ -51,16 +51,16 @@ ResourceAppointmentsView::NodeItem::NodeItem(Node *t, TQListViewItem *p, bool hi
//kdDebug()<<k_funcinfo<<endl;
}
-ResourceAppointmentsView::NodeItem::NodeItem(TQString text, TQListViewItem *tqparent, bool highlight)
- : DoubleListViewBase::MasterListItem(tqparent, text, highlight),
+ResourceAppointmentsView::NodeItem::NodeItem(TQString text, TQListViewItem *parent, bool highlight)
+ : DoubleListViewBase::MasterListItem(parent, text, highlight),
node(0) {
setFormat(0, 'f', 1);
//kdDebug()<<k_funcinfo<<endl;
}
-ResourceAppointmentsView::NodeItem::NodeItem(TQString text, TQListView *tqparent, bool highlight)
- : DoubleListViewBase::MasterListItem(tqparent, text, highlight),
+ResourceAppointmentsView::NodeItem::NodeItem(TQString text, TQListView *parent, bool highlight)
+ : DoubleListViewBase::MasterListItem(parent, text, highlight),
node(0) {
setFormat(0, 'f', 1);
@@ -68,8 +68,8 @@ ResourceAppointmentsView::NodeItem::NodeItem(TQString text, TQListView *tqparent
}
//-------------------------------------------
-ResourceAppointmentsView::ResourceAppointmentsView(View *view, TQWidget *tqparent)
- : DoubleListViewBase(tqparent),
+ResourceAppointmentsView::ResourceAppointmentsView(View *view, TQWidget *parent)
+ : DoubleListViewBase(parent),
m_mainview(view),
m_resource(0),
m_availItem(0),
diff --git a/kplato/kptresourceappointmentsview.h b/kplato/kptresourceappointmentsview.h
index c3ddcbb6..e6b52546 100644
--- a/kplato/kptresourceappointmentsview.h
+++ b/kplato/kptresourceappointmentsview.h
@@ -54,7 +54,7 @@ class ResourceAppointmentsView : public DoubleListViewBase
TQ_OBJECT
public:
- ResourceAppointmentsView(View *view, TQWidget *tqparent);
+ ResourceAppointmentsView(View *view, TQWidget *parent);
//~ResourceAppointmentsView();
@@ -77,10 +77,10 @@ protected slots:
private:
class NodeItem : public DoubleListViewBase::MasterListItem {
public:
- NodeItem(Node *n, TQListView *tqparent, bool highlight=false);
- NodeItem(Node *n, TQListViewItem *tqparent, bool highlight=false);
- NodeItem(TQString text, TQListView *tqparent, bool highlight=false);
- NodeItem(TQString text, TQListViewItem *tqparent, bool highlight=false);
+ NodeItem(Node *n, TQListView *parent, bool highlight=false);
+ NodeItem(Node *n, TQListViewItem *parent, bool highlight=false);
+ NodeItem(TQString text, TQListView *parent, bool highlight=false);
+ NodeItem(TQString text, TQListViewItem *parent, bool highlight=false);
Node *node;
EffortCostMap effortMap;
diff --git a/kplato/kptresourcedialog.cc b/kplato/kptresourcedialog.cc
index b67116a1..4746f1fc 100644
--- a/kplato/kptresourcedialog.cc
+++ b/kplato/kptresourcedialog.cc
@@ -49,8 +49,8 @@
namespace KPlato
{
-ResourceDialogImpl::ResourceDialogImpl (TQWidget *tqparent)
- : ResourceDialogBase(tqparent)
+ResourceDialogImpl::ResourceDialogImpl (TQWidget *parent)
+ : ResourceDialogBase(parent)
{
connect(type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
@@ -118,8 +118,8 @@ void ResourceDialogImpl::slotChooseResource()
////////////////// ResourceDialog ////////////////////////
-ResourceDialog::ResourceDialog(Project &project, Resource *resource, TQWidget *tqparent, const char *name)
- : KDialogBase( Swallow, i18n("Resource Settings"), Ok|Cancel, Ok, tqparent, name, true, true),
+ResourceDialog::ResourceDialog(Project &project, Resource *resource, TQWidget *parent, const char *name)
+ : KDialogBase( Swallow, i18n("Resource Settings"), Ok|Cancel, Ok, parent, name, true, true),
m_original(resource),
m_resource(resource),
m_calculationNeeded(false)
diff --git a/kplato/kptresourcedialog.h b/kplato/kptresourcedialog.h
index ef4b8d12..673b27e8 100644
--- a/kplato/kptresourcedialog.h
+++ b/kplato/kptresourcedialog.h
@@ -45,7 +45,7 @@ class ResourceDialogImpl : public ResourceDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- ResourceDialogImpl (TQWidget *tqparent);
+ ResourceDialogImpl (TQWidget *parent);
public slots:
void slotChanged();
@@ -65,7 +65,7 @@ class ResourceDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- ResourceDialog(Project &project, Resource *resource, TQWidget *tqparent=0, const char *name=0);
+ ResourceDialog(Project &project, Resource *resource, TQWidget *parent=0, const char *name=0);
bool calculationNeeded() { return m_calculationNeeded; }
diff --git a/kplato/kptresourcesdialog.cc b/kplato/kptresourcesdialog.cc
index 784f8e4e..032fcd0f 100644
--- a/kplato/kptresourcesdialog.cc
+++ b/kplato/kptresourcesdialog.cc
@@ -32,8 +32,8 @@
namespace KPlato
{
-ResourcesDialog::ResourcesDialog(Project &p, TQWidget *tqparent, const char *name)
- : KDialogBase( Swallow, i18n("Resources"), Ok|Cancel, Ok, tqparent, name, true, true),
+ResourcesDialog::ResourcesDialog(Project &p, TQWidget *parent, const char *name)
+ : KDialogBase( Swallow, i18n("Resources"), Ok|Cancel, Ok, parent, name, true, true),
project(p)
{
panel = new ResourcesPanel(this, &project);
diff --git a/kplato/kptresourcesdialog.h b/kplato/kptresourcesdialog.h
index 2f7c43d7..68734427 100644
--- a/kplato/kptresourcesdialog.h
+++ b/kplato/kptresourcesdialog.h
@@ -36,7 +36,7 @@ class ResourcesDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- ResourcesDialog(Project &project, TQWidget *tqparent=0, const char *name=0);
+ ResourcesDialog(Project &project, TQWidget *parent=0, const char *name=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptresourcespanel.cc b/kplato/kptresourcespanel.cc
index 29b1d4eb..99443d88 100644
--- a/kplato/kptresourcespanel.cc
+++ b/kplato/kptresourcespanel.cc
@@ -225,7 +225,7 @@ protected:
//////////////////// ResourcesPanel //////////////////////
-ResourcesPanel::ResourcesPanel(TQWidget *tqparent, Project *p) : ResourcesPanelBase(tqparent) {
+ResourcesPanel::ResourcesPanel(TQWidget *parent, Project *p) : ResourcesPanelBase(parent) {
project = p;
m_groupItem = 0;
m_blockResourceRename = false;
diff --git a/kplato/kptresourcespanel.h b/kplato/kptresourcespanel.h
index 9324fd9b..44b2a39e 100644
--- a/kplato/kptresourcespanel.h
+++ b/kplato/kptresourcespanel.h
@@ -42,7 +42,7 @@ class ResourcesPanel : public ResourcesPanelBase {
Q_OBJECT
TQ_OBJECT
public:
- ResourcesPanel (TQWidget *tqparent, Project *project);
+ ResourcesPanel (TQWidget *parent, Project *project);
bool ok();
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc
index 13306105..d596ff44 100644
--- a/kplato/kptresourceview.cc
+++ b/kplato/kptresourceview.cc
@@ -48,8 +48,8 @@ namespace KPlato
class ResListView : public KListView {
public:
- ResListView(TQWidget * tqparent = 0, const char* name=0)
- : KListView(tqparent, name)
+ ResListView(TQWidget * parent = 0, const char* name=0)
+ : KListView(parent, name)
{}
int headerHeight() const {
@@ -280,8 +280,8 @@ protected:
class ResourceItemPrivate : public KListViewItem {
public:
- ResourceItemPrivate(Resource *r, TQListViewItem *tqparent)
- : KListViewItem(tqparent, r->name()),
+ ResourceItemPrivate(Resource *r, TQListViewItem *parent)
+ : KListViewItem(parent, r->name()),
resource(r) {}
Resource *resource;
@@ -304,14 +304,14 @@ private:
class NodeItemPrivate : public KListViewItem {
public:
- NodeItemPrivate(Task *n, TQListView *tqparent)
- : KListViewItem(tqparent, n->name()),
+ NodeItemPrivate(Task *n, TQListView *parent)
+ : KListViewItem(parent, n->name()),
node(n) {
init();
}
- NodeItemPrivate(TQString name, TQListView *tqparent)
- : KListViewItem(tqparent, name),
+ NodeItemPrivate(TQString name, TQListView *parent)
+ : KListViewItem(parent, name),
node(0) {
init();
}
@@ -353,8 +353,8 @@ private:
class AppointmentItem : public KListViewItem {
public:
- AppointmentItem(Appointment *a, TQDate &d, TQListViewItem *tqparent)
- : KListViewItem(tqparent),
+ AppointmentItem(Appointment *a, TQDate &d, TQListViewItem *parent)
+ : KListViewItem(parent),
appointment(a),
date(d) {}
@@ -366,8 +366,8 @@ TQSize ResourceView::tqsizeHint() const {
return tqminimumSizeHint(); // HACK: koshell splitter tqminimumSize problem
}
-ResourceView::ResourceView(View *view, TQWidget *tqparent)
- : TQSplitter(tqparent, "Resource view"),
+ResourceView::ResourceView(View *view, TQWidget *parent)
+ : TQSplitter(parent, "Resource view"),
m_mainview(view),
m_selectedItem(0),
m_currentNode(0)
@@ -444,13 +444,13 @@ void ResourceView::draw(Project &project)
}
-void ResourceView::drawResources(const Project &proj, TQListViewItem *tqparent, ResourceGroup *group)
+void ResourceView::drawResources(const Project &proj, TQListViewItem *parent, ResourceGroup *group)
{
//kdDebug()<<k_funcinfo<<"group: "<<group->name()<<" ("<<group<<")"<<endl;
TQPtrListIterator<Resource> it(group->resources());
for (; it.current(); ++it) {
Resource *r = it.current();
- ResourceItemPrivate *item = new ResourceItemPrivate(r, tqparent);
+ ResourceItemPrivate *item = new ResourceItemPrivate(r, parent);
// set column colors
item->setColumnState(0, 0);
item->setColumnState(4, 0);
diff --git a/kplato/kptresourceview.h b/kplato/kptresourceview.h
index 5fb3d98a..b3049ed3 100644
--- a/kplato/kptresourceview.h
+++ b/kplato/kptresourceview.h
@@ -52,7 +52,7 @@ class ResourceItemPrivate;
TQ_OBJECT
public:
- ResourceView(View *view, TQWidget *tqparent);
+ ResourceView(View *view, TQWidget *parent);
//~ResourceView();
@@ -86,7 +86,7 @@ protected slots:
void popupMenuRequested(TQListViewItem * item, const TQPoint & pos, int);
private:
- void drawResources(const Project &proj, TQListViewItem *tqparent, ResourceGroup *group);
+ void drawResources(const Project &proj, TQListViewItem *parent, ResourceGroup *group);
private:
View *m_mainview;
diff --git a/kplato/kptschedule.cc b/kplato/kptschedule.cc
index 3187a2e1..6c478042 100644
--- a/kplato/kptschedule.cc
+++ b/kplato/kptschedule.cc
@@ -41,17 +41,17 @@ Schedule::Schedule()
m_parent(0) {
}
-Schedule::Schedule(Schedule *tqparent)
+Schedule::Schedule(Schedule *parent)
: m_type(Expected),
m_id(0),
m_deleted(false),
m_appointments(),
- m_parent(tqparent) {
+ m_parent(parent) {
- if (tqparent) {
- m_name = tqparent->name();
- m_type = tqparent->type();
- m_id = tqparent->id();
+ if (parent) {
+ m_name = parent->name();
+ m_type = parent->type();
+ m_id = parent->id();
}
m_appointments.setAutoDelete(true);
//kdDebug()<<k_funcinfo<<"("<<this<<") Name: '"<<name<<"' Type="<<type<<" id="<<id<<endl;
@@ -72,8 +72,8 @@ Schedule::Schedule(TQString name, Type type, long id)
Schedule::~Schedule() {
}
-void Schedule::setParent(Schedule *tqparent) {
- m_parent = tqparent;
+void Schedule::setParent(Schedule *parent) {
+ m_parent = parent;
}
void Schedule::setDeleted(bool on) {
@@ -357,8 +357,8 @@ NodeSchedule::NodeSchedule(Node *node, TQString name, Schedule::Type type, long
init();
}
-NodeSchedule::NodeSchedule(Schedule *tqparent, Node *node)
- : Schedule(tqparent),
+NodeSchedule::NodeSchedule(Schedule *parent, Node *node)
+ : Schedule(parent),
m_node(node) {
//kdDebug()<<k_funcinfo<<"node name: "<<node->name()<<endl;
@@ -484,10 +484,10 @@ ResourceSchedule::ResourceSchedule(Resource *resource, TQString name, Schedule::
//kdDebug()<<k_funcinfo<<"resource: "<<resource->name()<<endl;
}
-ResourceSchedule::ResourceSchedule(Schedule *tqparent, Resource *resource)
- : Schedule(tqparent),
+ResourceSchedule::ResourceSchedule(Schedule *parent, Resource *resource)
+ : Schedule(parent),
m_resource(resource),
- m_parent(tqparent) {
+ m_parent(parent) {
//kdDebug()<<k_funcinfo<<"resource: "<<resource->name()<<endl;
}
@@ -615,10 +615,10 @@ void NodeSchedule::printDebug(TQString indent) {
Schedule::printDebug(indent);
indent += "! ";
if (m_parent == 0)
- kdDebug()<<indent<<"No tqparent schedule!"<<endl;
+ kdDebug()<<indent<<"No parent schedule!"<<endl;
if (!notScheduled) {
if (node()) kdDebug()<<indent<<"Node: "<<node()->name()<<endl;
- else kdDebug()<<indent<<"No tqparent node!"<<endl;
+ else kdDebug()<<indent<<"No parent node!"<<endl;
}
kdDebug()<<indent<<"Not scheduled="<<notScheduled<<endl;
kdDebug()<<indent<<"Start time: "<<startTime.toString()<<endl;
@@ -648,9 +648,9 @@ void ResourceSchedule::printDebug(TQString indent) {
Schedule::printDebug(indent);
indent += "! ";
if (m_parent == 0)
- kdDebug()<<indent<<"No tqparent schedule!"<<endl;
+ kdDebug()<<indent<<"No parent schedule!"<<endl;
if (resource()) kdDebug()<<indent<<"Resource: "<<resource()->name()<<endl;
- else kdDebug()<<indent<<"No tqparent resource!"<<endl;
+ else kdDebug()<<indent<<"No parent resource!"<<endl;
kdDebug()<<indent<<endl;
kdDebug()<<indent<<"Appointments: "<<m_appointments.count()<<endl;
}
@@ -659,7 +659,7 @@ void MainSchedule::printDebug(TQString indent) {
Schedule::printDebug(indent);
indent += "! ";
if (node()) kdDebug()<<indent<<"Node: "<<node()->name()<<endl;
- else kdDebug()<<indent<<"No tqparent node!"<<endl;
+ else kdDebug()<<indent<<"No parent node!"<<endl;
kdDebug()<<indent<<"Not scheduled="<<notScheduled<<endl;
kdDebug()<<indent<<"Start time: "<<startTime.toString()<<endl;
diff --git a/kplato/kptschedule.h b/kplato/kptschedule.h
index e1525c79..f4380506 100644
--- a/kplato/kptschedule.h
+++ b/kplato/kptschedule.h
@@ -61,7 +61,7 @@ public:
};
Schedule();
- Schedule(Schedule *tqparent);
+ Schedule(Schedule *parent);
Schedule(TQString name, Type type, long id);
~Schedule();
@@ -73,8 +73,8 @@ public:
TQString typeToString(bool translate=false) const;
long id() const { return m_id; }
void setId(long id) { m_id = id; }
- void setParent(Schedule *tqparent);
- Schedule *tqparent() const { return m_parent; }
+ void setParent(Schedule *parent);
+ Schedule *parent() const { return m_parent; }
virtual bool isDeleted() const;
virtual void setDeleted(bool on);
@@ -235,7 +235,7 @@ class NodeSchedule : public Schedule
public:
NodeSchedule();
NodeSchedule(Node *node, TQString name, Schedule::Type type, long id);
- NodeSchedule(Schedule *tqparent, Node *node);
+ NodeSchedule(Schedule *parent, Node *node);
~NodeSchedule();
virtual bool isDeleted() const
@@ -272,7 +272,7 @@ class ResourceSchedule : public Schedule
public:
ResourceSchedule();
ResourceSchedule(Resource *Resource, TQString name, Schedule::Type type, long id);
- ResourceSchedule(Schedule *tqparent, Resource *Resource);
+ ResourceSchedule(Schedule *parent, Resource *Resource);
~ResourceSchedule();
virtual bool isDeleted() const
diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cc
index 3e7fb267..fb5a9c0e 100644
--- a/kplato/kptstandardworktimedialog.cc
+++ b/kplato/kptstandardworktimedialog.cc
@@ -49,8 +49,8 @@ namespace KPlato
class WeekdayListItem : public KListViewItem
{
public:
- WeekdayListItem(Calendar *cal, int wd, KListView *tqparent, TQString name, KListViewItem *after)
- : KListViewItem(tqparent, after),
+ WeekdayListItem(Calendar *cal, int wd, KListView *parent, TQString name, KListViewItem *after)
+ : KListViewItem(parent, after),
original(cal->weekday(wd)),
calendar(cal),
weekday(wd)
@@ -92,8 +92,8 @@ public:
int weekday;
};
-StandardWorktimeDialog::StandardWorktimeDialog(Project &p, TQWidget *tqparent, const char *name)
- : KDialogBase( Swallow, i18n("Standard Worktime"), Ok|Cancel, Ok, tqparent, name, true, true),
+StandardWorktimeDialog::StandardWorktimeDialog(Project &p, TQWidget *parent, const char *name)
+ : KDialogBase( Swallow, i18n("Standard Worktime"), Ok|Cancel, Ok, parent, name, true, true),
project(p)
{
//kdDebug()<<k_funcinfo<<&p<<endl;
@@ -144,8 +144,8 @@ void StandardWorktimeDialog::slotOk() {
}
-StandardWorktimeDialogImpl::StandardWorktimeDialogImpl(StandardWorktime *std, TQWidget *tqparent)
- : StandardWorktimeDialogBase(tqparent),
+StandardWorktimeDialogImpl::StandardWorktimeDialogImpl(StandardWorktime *std, TQWidget *parent)
+ : StandardWorktimeDialogBase(parent),
m_std(std) {
if (!std) {
m_std = new StandardWorktime();
diff --git a/kplato/kptstandardworktimedialog.h b/kplato/kptstandardworktimedialog.h
index 81bc2ce7..e65f31e8 100644
--- a/kplato/kptstandardworktimedialog.h
+++ b/kplato/kptstandardworktimedialog.h
@@ -40,7 +40,7 @@ class StandardWorktimeDialogImpl : public StandardWorktimeDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- StandardWorktimeDialogImpl ( StandardWorktime *std, TQWidget *tqparent);
+ StandardWorktimeDialogImpl ( StandardWorktime *std, TQWidget *parent);
StandardWorktime *standardWorktime() { return m_std; }
double inYear() const { return m_year; }
@@ -78,7 +78,7 @@ class StandardWorktimeDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- StandardWorktimeDialog(Project &project, TQWidget *tqparent=0, const char *name=0);
+ StandardWorktimeDialog(Project &project, TQWidget *parent=0, const char *name=0);
KMacroCommand *buildCommand(Part *part);
diff --git a/kplato/kptsummarytaskdialog.h b/kplato/kptsummarytaskdialog.h
index d1607783..90b45cd9 100644
--- a/kplato/kptsummarytaskdialog.h
+++ b/kplato/kptsummarytaskdialog.h
@@ -55,9 +55,9 @@ public:
/**
* The constructor for the summary task settings dialog.
* @param task the task to edit
- * @param tqparent tqparent widget
+ * @param parent parent widget
*/
- SummaryTaskDialog(Task &task, TQWidget *tqparent=0);
+ SummaryTaskDialog(Task &task, TQWidget *parent=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptsummarytaskgeneralpanel.h b/kplato/kptsummarytaskgeneralpanel.h
index 615556c4..e5f3740a 100644
--- a/kplato/kptsummarytaskgeneralpanel.h
+++ b/kplato/kptsummarytaskgeneralpanel.h
@@ -35,7 +35,7 @@ class SummaryTaskGeneralPanel : public SummaryTaskGeneralPanelBase {
Q_OBJECT
TQ_OBJECT
public:
- SummaryTaskGeneralPanel(Task &task, TQWidget *tqparent=0, const char *name=0);
+ SummaryTaskGeneralPanel(Task &task, TQWidget *parent=0, const char *name=0);
KMacroCommand *buildCommand(Part *part);
diff --git a/kplato/kpttask.cc b/kplato/kpttask.cc
index c8ecba3a..964b8e4e 100644
--- a/kplato/kpttask.cc
+++ b/kplato/kpttask.cc
@@ -35,7 +35,7 @@
namespace KPlato
{
-Task::Task(Node *tqparent) : Node(tqparent), m_resource() {
+Task::Task(Node *parent) : Node(parent), m_resource() {
//kdDebug()<<k_funcinfo<<"("<<this<<")"<<endl;
m_resource.setAutoDelete(true);
Duration d(1, 0, 0);
@@ -52,8 +52,8 @@ Task::Task(Node *tqparent) : Node(tqparent), m_resource() {
m_childProxyRelations.setAutoDelete(true);
}
-Task::Task(Task &task, Node *tqparent)
- : Node(task, tqparent),
+Task::Task(Task &task, Node *parent)
+ : Node(task, parent),
m_resource() {
//kdDebug()<<k_funcinfo<<"("<<this<<")"<<endl;
m_resource.setAutoDelete(true);
@@ -596,15 +596,15 @@ DateTime Task::calculatePredeccessors(const TQPtrList<Relation> &list, int use)
DateTime time;
TQPtrListIterator<Relation> it = list;
for (; it.current(); ++it) {
- if (it.current()->tqparent()->type() == Type_Summarytask) {
- //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->tqparent()->name()<<endl;
+ if (it.current()->parent()->type() == Type_Summarytask) {
+ //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->parent()->name()<<endl;
continue; // skip summarytasks
}
- DateTime t = it.current()->tqparent()->calculateForward(use); // early finish
+ DateTime t = it.current()->parent()->calculateForward(use); // early finish
switch (it.current()->type()) {
case Relation::StartStart:
// I can't start earlier than my predesseccor
- t = it.current()->tqparent()->getEarliestStart() + it.current()->lag();
+ t = it.current()->parent()->getEarliestStart() + it.current()->lag();
break;
case Relation::FinishFinish:
// I can't finish earlier than my predeccessor, so
@@ -723,7 +723,7 @@ DateTime Task::calculateSuccessors(const TQPtrList<Relation> &list, int use) {
TQPtrListIterator<Relation> it = list;
for (; it.current(); ++it) {
if (it.current()->child()->type() == Type_Summarytask) {
- //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->tqparent()->name()<<endl;
+ //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->parent()->name()<<endl;
continue; // skip summarytasks
}
DateTime t = it.current()->child()->calculateBackward(use);
@@ -848,17 +848,17 @@ DateTime Task::schedulePredeccessors(const TQPtrList<Relation> &list, int use) {
DateTime time;
TQPtrListIterator<Relation> it = list;
for (; it.current(); ++it) {
- if (it.current()->tqparent()->type() == Type_Summarytask) {
- //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->tqparent()->name()<<endl;
+ if (it.current()->parent()->type() == Type_Summarytask) {
+ //kdDebug()<<k_funcinfo<<"Skip summarytask: "<<it.current()->parent()->name()<<endl;
continue; // skip summarytasks
}
// schedule the predecessors
- DateTime earliest = it.current()->tqparent()->getEarliestStart();
- DateTime t = it.current()->tqparent()->scheduleForward(earliest, use);
+ DateTime earliest = it.current()->parent()->getEarliestStart();
+ DateTime t = it.current()->parent()->scheduleForward(earliest, use);
switch (it.current()->type()) {
case Relation::StartStart:
// I can't start before my predesseccor
- t = it.current()->tqparent()->startTime() + it.current()->lag();
+ t = it.current()->parent()->startTime() + it.current()->lag();
break;
case Relation::FinishFinish:
// I can't end before my predecessor, so
@@ -1301,13 +1301,13 @@ void Task::addParentProxyRelations(TQPtrList<Relation> &list) {
nodes.current()->addParentProxyRelations(dependParentNodes());
}
} else {
- // add 'this' as child relation to the relations tqparent
+ // add 'this' as child relation to the relations parent
//kdDebug()<<k_funcinfo<<m_name<<" is not summary task"<<endl;
TQPtrListIterator<Relation> it = list;
for (; it.current(); ++it) {
- it.current()->tqparent()->addChildProxyRelation(this, it.current());
- // add a tqparent relation to myself
- addParentProxyRelation(it.current()->tqparent(), it.current());
+ it.current()->parent()->addChildProxyRelation(this, it.current());
+ // add a parent relation to myself
+ addParentProxyRelation(it.current()->parent(), it.current());
}
}
}
@@ -1323,7 +1323,7 @@ void Task::addChildProxyRelations(TQPtrList<Relation> &list) {
nodes.current()->addChildProxyRelations(dependChildNodes());
}
} else {
- // add 'this' as tqparent relation to the relations child
+ // add 'this' as parent relation to the relations child
//kdDebug()<<k_funcinfo<<m_name<<" is not summary task"<<endl;
TQPtrListIterator<Relation> it = list;
for (; it.current(); ++it) {
@@ -1337,13 +1337,13 @@ void Task::addChildProxyRelations(TQPtrList<Relation> &list) {
void Task::addParentProxyRelation(Node *node, const Relation *rel) {
if (node->type() != Type_Summarytask) {
if (type() == Type_Summarytask) {
- //kdDebug()<<"Add tqparent proxy from my tqchildren "<<m_name<<" to "<<node->name()<<endl;
+ //kdDebug()<<"Add parent proxy from my tqchildren "<<m_name<<" to "<<node->name()<<endl;
TQPtrListIterator<Node> nodes = m_nodes;
for (; nodes.current(); ++nodes) {
nodes.current()->addParentProxyRelation(node, rel);
}
} else {
- //kdDebug()<<"Add tqparent proxy from "<<node->name()<<" to (me) "<<m_name<<endl;
+ //kdDebug()<<"Add parent proxy from "<<node->name()<<" to (me) "<<m_name<<endl;
m_parentProxyRelations.append(new ProxyRelation(node, this, rel->type(), rel->lag()));
}
}
@@ -1497,13 +1497,13 @@ bool Task::calcCriticalPath(bool fromEnd) {
}
TQPtrListIterator<Relation> it(m_parentProxyRelations);
for (; it.current(); ++it) {
- if (it.current()->tqparent()->calcCriticalPath(fromEnd)) {
+ if (it.current()->parent()->calcCriticalPath(fromEnd)) {
m_currentSchedule->inCriticalPath = true;
}
}
TQPtrListIterator<Relation> pit(m_dependParentNodes);
for (; pit.current(); ++pit) {
- if (pit.current()->tqparent()->calcCriticalPath(fromEnd)) {
+ if (pit.current()->parent()->calcCriticalPath(fromEnd)) {
m_currentSchedule->inCriticalPath = true;
}
}
diff --git a/kplato/kpttask.h b/kplato/kpttask.h
index cace7dcb..2d3776db 100644
--- a/kplato/kpttask.h
+++ b/kplato/kpttask.h
@@ -39,8 +39,8 @@ class DateTime;
*/
class Task : public Node {
public:
- Task(Node *tqparent = 0);
- Task(Task &task, Node *tqparent = 0);
+ Task(Node *parent = 0);
+ Task(Task &task, Node *parent = 0);
~Task();
/// Return task type. Can be Type_Task, Type_Summarytask ot Type_Milestone.
@@ -193,7 +193,7 @@ public:
/// Check if this node has any dependent child nodes.
bool isEndNode() const;
- /// Check if this node has any dependent tqparent nodes
+ /// Check if this node has any dependent parent nodes
bool isStartNode() const;
/**
diff --git a/kplato/kpttaskappointmentsview.cc b/kplato/kpttaskappointmentsview.cc
index 81ad4242..5e96030e 100644
--- a/kplato/kpttaskappointmentsview.cc
+++ b/kplato/kpttaskappointmentsview.cc
@@ -32,8 +32,8 @@
namespace KPlato
{
-TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListView *tqparent, bool highlight)
- : DoubleListViewBase::MasterListItem(tqparent, r->name(), highlight),
+TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListView *parent, bool highlight)
+ : DoubleListViewBase::MasterListItem(parent, r->name(), highlight),
resource(r) {
setFormat(0, 'f', 1);
@@ -47,8 +47,8 @@ TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListViewItem *p,
//kdDebug()<<k_funcinfo<<endl;
}
-TaskAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *tqparent, bool highlight)
- : DoubleListViewBase::MasterListItem(tqparent, text, highlight),
+TaskAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *parent, bool highlight)
+ : DoubleListViewBase::MasterListItem(parent, text, highlight),
resource(0) {
setFormat(0, 'f', 1);
@@ -56,8 +56,8 @@ TaskAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *
}
//-------------------------------------------
-TaskAppointmentsView::TaskAppointmentsView(TQWidget *tqparent)
- : DoubleListViewBase(tqparent),
+TaskAppointmentsView::TaskAppointmentsView(TQWidget *parent)
+ : DoubleListViewBase(parent),
m_task(0) {
setNameHeader(i18n("Resource"));
diff --git a/kplato/kpttaskappointmentsview.h b/kplato/kpttaskappointmentsview.h
index d4d8e101..ce3e0cdc 100644
--- a/kplato/kpttaskappointmentsview.h
+++ b/kplato/kpttaskappointmentsview.h
@@ -53,7 +53,7 @@ class TaskAppointmentsView : public DoubleListViewBase
TQ_OBJECT
public:
- TaskAppointmentsView(TQWidget *tqparent);
+ TaskAppointmentsView(TQWidget *parent);
//~TaskAppointmentsView();
@@ -76,9 +76,9 @@ protected slots:
private:
class ResourceItem : public DoubleListViewBase::MasterListItem {
public:
- ResourceItem(Resource *r, TQListView *tqparent, bool highlight=false);
- ResourceItem(Resource *r, TQListViewItem *tqparent, bool highlight=false);
- ResourceItem(TQString text, TQListViewItem *tqparent, bool highlight=false);
+ ResourceItem(Resource *r, TQListView *parent, bool highlight=false);
+ ResourceItem(Resource *r, TQListViewItem *parent, bool highlight=false);
+ ResourceItem(TQString text, TQListViewItem *parent, bool highlight=false);
Resource *resource;
EffortCostMap effortMap;
diff --git a/kplato/kpttaskcostpanel.h b/kplato/kpttaskcostpanel.h
index 55fc121e..005145bc 100644
--- a/kplato/kpttaskcostpanel.h
+++ b/kplato/kpttaskcostpanel.h
@@ -37,7 +37,7 @@ class TaskCostPanelImpl : public TaskCostPanelBase {
Q_OBJECT
TQ_OBJECT
public:
- TaskCostPanelImpl(TQWidget *tqparent=0, const char *name=0);
+ TaskCostPanelImpl(TQWidget *parent=0, const char *name=0);
signals:
void changed();
@@ -50,7 +50,7 @@ class TaskCostPanel : public TaskCostPanelImpl {
Q_OBJECT
TQ_OBJECT
public:
- TaskCostPanel(Task &task, Accounts &accounts, TQWidget *tqparent=0, const char *name=0);
+ TaskCostPanel(Task &task, Accounts &accounts, TQWidget *parent=0, const char *name=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kpttaskdefaultpanel.cc b/kplato/kpttaskdefaultpanel.cc
index dc116897..3fd5472b 100644
--- a/kplato/kpttaskdefaultpanel.cc
+++ b/kplato/kpttaskdefaultpanel.cc
@@ -51,8 +51,8 @@
namespace KPlato
{
-TaskDefaultPanel::TaskDefaultPanel(Task &task, StandardWorktime *workTime, TQWidget *tqparent, const char *n)
- : ConfigTaskPanelImpl(tqparent, n),
+TaskDefaultPanel::TaskDefaultPanel(Task &task, StandardWorktime *workTime, TQWidget *parent, const char *n)
+ : ConfigTaskPanelImpl(parent, n),
m_task(task),
m_dayLength(24)
{
@@ -332,9 +332,9 @@ Duration ConfigTaskPanelImpl::estimationValue()
}
-void ConfigTaskPanelImpl::setEstimateFields( int tqmask )
+void ConfigTaskPanelImpl::setEstimateFields( int mask )
{
- estimate->setVisibleFields(tqmask);
+ estimate->setVisibleFields(mask);
}
diff --git a/kplato/kpttaskdefaultpanel.h b/kplato/kpttaskdefaultpanel.h
index 8ab532e5..5d1acb4b 100644
--- a/kplato/kpttaskdefaultpanel.h
+++ b/kplato/kpttaskdefaultpanel.h
@@ -37,7 +37,7 @@ class ConfigTaskPanelImpl : public ConfigTaskPanelBase
Q_OBJECT
TQ_OBJECT
public:
- ConfigTaskPanelImpl(TQWidget *tqparent, const char *name);
+ ConfigTaskPanelImpl(TQWidget *parent, const char *name);
virtual int schedulingType() const;
virtual int estimationType() const;
@@ -62,7 +62,7 @@ public slots:
virtual void setEstimate( const Duration & duration );
virtual void setEstimateType( int type );
virtual void checkAllFieldsFilled();
- virtual void setEstimateFields( int tqmask );
+ virtual void setEstimateFields( int mask );
virtual void setEstimateScales( double day );
virtual void setEstimateFieldUnit( int field, TQString unit );
virtual void startDateChanged();
@@ -90,7 +90,7 @@ class TaskDefaultPanel : public ConfigTaskPanelImpl {
Q_OBJECT
TQ_OBJECT
public:
- TaskDefaultPanel(Task &task, StandardWorktime *workTime=0, TQWidget *tqparent=0, const char *name=0);
+ TaskDefaultPanel(Task &task, StandardWorktime *workTime=0, TQWidget *parent=0, const char *name=0);
KMacroCommand *buildCommand(Part *part);
diff --git a/kplato/kpttaskdialog.h b/kplato/kpttaskdialog.h
index 169aec6b..2e6c1586 100644
--- a/kplato/kpttaskdialog.h
+++ b/kplato/kpttaskdialog.h
@@ -64,9 +64,9 @@ public:
* @param accounts all defined accounts
* @param workTime defines the number of hours pr day and week
* @param baseline if true, project is baselined
- * @param tqparent tqparent widget
+ * @param parent parent widget
*/
- TaskDialog(Task &task, Accounts &accounts, StandardWorktime *workTime=0, bool baseline=false, TQWidget *tqparent=0);
+ TaskDialog(Task &task, Accounts &accounts, StandardWorktime *workTime=0, bool baseline=false, TQWidget *parent=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kpttaskgeneralpanel.cc b/kplato/kpttaskgeneralpanel.cc
index 7664a89f..6dd1dad2 100644
--- a/kplato/kpttaskgeneralpanel.cc
+++ b/kplato/kpttaskgeneralpanel.cc
@@ -372,9 +372,9 @@ Duration TaskGeneralPanelImpl::estimationValue()
}
-void TaskGeneralPanelImpl::setEstimateFields( int tqmask )
+void TaskGeneralPanelImpl::setEstimateFields( int mask )
{
- estimate->setVisibleFields(tqmask);
+ estimate->setVisibleFields(mask);
}
diff --git a/kplato/kpttaskgeneralpanel.h b/kplato/kpttaskgeneralpanel.h
index 29634d27..f92f3258 100644
--- a/kplato/kpttaskgeneralpanel.h
+++ b/kplato/kpttaskgeneralpanel.h
@@ -39,7 +39,7 @@ class TaskGeneralPanelImpl : public TaskGeneralPanelBase
Q_OBJECT
TQ_OBJECT
public:
- TaskGeneralPanelImpl(TQWidget *tqparent, const char *name);
+ TaskGeneralPanelImpl(TQWidget *parent, const char *name);
virtual int schedulingType() const;
virtual int estimationType() const;
@@ -64,7 +64,7 @@ public slots:
virtual void setEstimate( const Duration & duration );
virtual void setEstimateType( int type );
virtual void checkAllFieldsFilled();
- virtual void setEstimateFields( int tqmask );
+ virtual void setEstimateFields( int mask );
virtual void setEstimateScales( double day );
virtual void setEstimateFieldUnit( int field, TQString unit );
virtual void startDateChanged();
@@ -93,7 +93,7 @@ class TaskGeneralPanel : public TaskGeneralPanelImpl {
Q_OBJECT
TQ_OBJECT
public:
- TaskGeneralPanel(Task &task, StandardWorktime *workTime=0, bool baseline=false, TQWidget *tqparent=0, const char *name=0);
+ TaskGeneralPanel(Task &task, StandardWorktime *workTime=0, bool baseline=false, TQWidget *parent=0, const char *name=0);
KMacroCommand *buildCommand(Part *part);
diff --git a/kplato/kpttaskprogressdialog.h b/kplato/kpttaskprogressdialog.h
index 8145062d..83c2908e 100644
--- a/kplato/kpttaskprogressdialog.h
+++ b/kplato/kpttaskprogressdialog.h
@@ -36,7 +36,7 @@ class TaskProgressDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- TaskProgressDialog(Task &task, StandardWorktime *workTime, TQWidget *tqparent=0);
+ TaskProgressDialog(Task &task, StandardWorktime *workTime, TQWidget *parent=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kpttaskprogresspanel.cc b/kplato/kpttaskprogresspanel.cc
index 52cab18e..e8cfb570 100644
--- a/kplato/kpttaskprogresspanel.cc
+++ b/kplato/kpttaskprogresspanel.cc
@@ -41,8 +41,8 @@
namespace KPlato
{
-TaskProgressPanel::TaskProgressPanel(Task &task, StandardWorktime *workTime, TQWidget *tqparent, const char *name)
- : TaskProgressPanelImpl(tqparent, name),
+TaskProgressPanel::TaskProgressPanel(Task &task, StandardWorktime *workTime, TQWidget *parent, const char *name)
+ : TaskProgressPanelImpl(parent, name),
m_task(task),
m_dayLength(24)
{
@@ -124,8 +124,8 @@ void TaskProgressPanel::setEstimateScales( int day )
//-------------------------------------
-TaskProgressPanelImpl::TaskProgressPanelImpl(TQWidget *tqparent, const char *name, WFlags f)
- : TaskProgressPanelBase(tqparent, name, f) {
+TaskProgressPanelImpl::TaskProgressPanelImpl(TQWidget *parent, const char *name, WFlags f)
+ : TaskProgressPanelBase(parent, name, f) {
connect(started, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotStartedChanged(bool)));
connect(finished, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFinishedChanged(bool)));
diff --git a/kplato/kpttaskprogresspanel.h b/kplato/kpttaskprogresspanel.h
index fe22441f..589d37df 100644
--- a/kplato/kpttaskprogresspanel.h
+++ b/kplato/kpttaskprogresspanel.h
@@ -35,7 +35,7 @@ class TaskProgressPanelImpl : public TaskProgressPanelBase {
Q_OBJECT
TQ_OBJECT
public:
- TaskProgressPanelImpl(TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+ TaskProgressPanelImpl(TQWidget *parent=0, const char *name=0, WFlags f=0);
void enableWidgets();
@@ -53,7 +53,7 @@ class TaskProgressPanel : public TaskProgressPanelImpl {
Q_OBJECT
TQ_OBJECT
public:
- TaskProgressPanel(Task &task, StandardWorktime *workTime=0, TQWidget *tqparent=0, const char *name=0);
+ TaskProgressPanel(Task &task, StandardWorktime *workTime=0, TQWidget *parent=0, const char *name=0);
KCommand *buildCommand(Part *part);
diff --git a/kplato/kptview.cc b/kplato/kptview.cc
index a5b9f6b0..16501cc4 100644
--- a/kplato/kptview.cc
+++ b/kplato/kptview.cc
@@ -99,8 +99,8 @@
namespace KPlato
{
-View::View(Part* part, TQWidget* tqparent, const char* /*name*/)
- : KoView(part, tqparent, "Main View"),
+View::View(Part* part, TQWidget* parent, const char* /*name*/)
+ : KoView(part, parent, "Main View"),
m_ganttview(0),
m_gantttqlayout(0),
m_pertview(0),
@@ -1375,7 +1375,7 @@ void View::slotPrintTestDebug() {
// kdDebug()<<"------------Test 3 Parent calendar-----------------"<<endl;
// {
// Calendar *t = new Calendar("Test 3");
-// Calendar *p = new Calendar("Test 3 tqparent");
+// Calendar *p = new Calendar("Test 3 parent");
// t->setParent(p);
// TQDate wdate(2006,1,2);
// DateTime before = DateTime(wdate.addDays(-1));
@@ -1436,7 +1436,7 @@ void View::slotPrintTestDebug() {
// {
// TQTime t1(8,0,0);
// TQTime t2(10,0,0);
-// Calendar *p = new Calendar("Test 4 tqparent");
+// Calendar *p = new Calendar("Test 4 parent");
// CalendarDay *wd1 = p->weekday(0); // monday
// if (wd1 == 0) {
// kdDebug()<<"Failed to get weekday"<<endl;
diff --git a/kplato/kptview.h b/kplato/kptview.h
index 099895e1..38d93501 100644
--- a/kplato/kptview.h
+++ b/kplato/kptview.h
@@ -60,7 +60,7 @@ class View : public KoView {
TQ_OBJECT
public:
- View(Part* part, TQWidget* tqparent=0, const char* name=0);
+ View(Part* part, TQWidget* parent=0, const char* name=0);
~View();
/**
* Support zooming.
diff --git a/kplato/kptwbsdefinitiondialog.h b/kplato/kptwbsdefinitiondialog.h
index eefb2c7d..33436f5b 100644
--- a/kplato/kptwbsdefinitiondialog.h
+++ b/kplato/kptwbsdefinitiondialog.h
@@ -35,7 +35,7 @@ class WBSDefinitionDialog : public KDialogBase {
Q_OBJECT
TQ_OBJECT
public:
- WBSDefinitionDialog(WBSDefinition &def, TQWidget *tqparent=0, const char *name=0);
+ WBSDefinitionDialog(WBSDefinition &def, TQWidget *parent=0, const char *name=0);
KMacroCommand *buildCommand(Part *part);
diff --git a/kplato/kptwbsdefinitionpanel.h b/kplato/kptwbsdefinitionpanel.h
index 13c29bcd..b3fa3c60 100644
--- a/kplato/kptwbsdefinitionpanel.h
+++ b/kplato/kptwbsdefinitionpanel.h
@@ -34,7 +34,7 @@ class WBSDefinitionPanel : public WBSDefinitionPanelBase {
Q_OBJECT
TQ_OBJECT
public:
- WBSDefinitionPanel(WBSDefinition &def, TQWidget *tqparent=0, const char *name=0);
+ WBSDefinitionPanel(WBSDefinition &def, TQWidget *parent=0, const char *name=0);
KMacroCommand *buildCommand(Part *part);
diff --git a/kplato/tests/CalendarTester.cpp b/kplato/tests/CalendarTester.cpp
index 460679ec..bf0f299f 100644
--- a/kplato/tests/CalendarTester.cpp
+++ b/kplato/tests/CalendarTester.cpp
@@ -90,7 +90,7 @@ void CalendarTester::testWeekdays() {
void CalendarTester::testCalendarWithParent() {
KPlato::Calendar t("Test 3");
- KPlato::Calendar p("Test 3 tqparent");
+ KPlato::Calendar p("Test 3 parent");
t.setParent(&p);
TQDate wdate(2006,1,2);
KPlato::DateTime before = KPlato::DateTime(wdate.addDays(-1));