diff options
Diffstat (limited to 'kplato')
72 files changed, 357 insertions, 357 deletions
diff --git a/kplato/intervalitem.h b/kplato/intervalitem.h index 4e0cb704..3dceb1c1 100644 --- a/kplato/intervalitem.h +++ b/kplato/intervalitem.h @@ -31,7 +31,7 @@ class IntervalItem : public TQListViewItem { public: IntervalItem(TQListView * parent, TQTime start, TQTime end) - : TQListViewItem(parent, TQString("%1 - %2").tqarg(start.toString(), end.toString())), + : TQListViewItem(parent, TQString("%1 - %2").arg(start.toString(), end.toString())), m_start(start), m_end(end) {} diff --git a/kplato/kptaccountspanelbase.ui b/kplato/kptaccountspanelbase.ui index e76a6129..42b35ba9 100644 --- a/kplato/kptaccountspanelbase.ui +++ b/kplato/kptaccountspanelbase.ui @@ -13,7 +13,7 @@ <height>234</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>220</height> @@ -37,7 +37,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc index 9825d9c2..5e2443db 100644 --- a/kplato/kptaccountsview.cc +++ b/kplato/kptaccountsview.cc @@ -32,9 +32,9 @@ #include <tqdatetimeedit.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqpushbutton.h> #include <tqvaluelist.h> #include <tqpopupmenu.h> @@ -99,7 +99,7 @@ AccountsView::AccountsView(Project &project, View *view, TQWidget *parent) m_project(project), m_accounts(project.accounts()) { - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); m_period = 0; m_periodTexts<<i18n("Day")<<i18n("Week")<<i18n("Month"); m_cumulative = false; @@ -110,10 +110,10 @@ AccountsView::AccountsView(Project &project, View *view, TQWidget *parent) m_label = new Label(this); m_label->setFrameShape(TQLabel::StyledPanel); m_label->setFrameShadow(TQLabel::Sunken); - m_label->tqsetAlignment(int(TQLabel::WordBreak | TQLabel::AlignVCenter)); + m_label->setAlignment(int(TQLabel::WordBreak | TQLabel::AlignVCenter)); lay2->addWidget(m_label); m_changeBtn = new TQPushButton(i18n("Configure..."), this); - m_changeBtn->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_changeBtn->sizePolicy().hasHeightForWidth())); + m_changeBtn->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_changeBtn->sizePolicy().hasHeightForWidth())); lay2->addWidget(m_changeBtn); lay1->addLayout(lay2); @@ -139,7 +139,7 @@ void AccountsView::zoom(double zoom) { } void AccountsView::init() { - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); m_period = 0; initAccList(m_accounts.accountList()); } @@ -216,8 +216,8 @@ void AccountsView::slotUpdate() { if (m_cumulative) { t += " <b>" + i18n("Cumulative") + "</b> "; } - t += i18n("Cut-off date:%1").tqarg("<b>" + locale->formatDate(m_date, true) + "</b>"); - t += " " + i18n("Periodicity:%1").tqarg("<b>" + periodText(m_period) + "</b>"); + t += i18n("Cut-off date:%1").arg("<b>" + locale->formatDate(m_date, true) + "</b>"); + t += " " + i18n("Periodicity:%1").arg("<b>" + periodText(m_period) + "</b>"); m_label->setText(t); // Add columns for selected period/periods @@ -260,7 +260,7 @@ void AccountsView::slotUpdate() { //kdDebug()<<k_funcinfo<<c<<": "<<dt<<"-"<<pend<<" : "<<end<<endl; int y; int w = cal->weekNumber(dt, &y); - TQString t = i18n("<week>-<year>", "%1-%2").tqarg(w).tqarg(y); + TQString t = i18n("<week>-<year>", "%1-%2").arg(w).arg(y); m_dlv->addSlaveColumn(t); dt = pend.addDays(1); pend = cal->addDays(pend, 7); @@ -305,7 +305,7 @@ void AccountsView::slotUpdate() { cal->setYMD(pend, dt.year(), dt.month(), dt.daysInMonth()); for (; pend <= end; ++c) { //kdDebug()<<k_funcinfo<<c<<": "<<dt<<"-"<<pend<<" : "<<end<<endl; - TQString m = cal->monthName(dt, true) + TQString(" %1").tqarg( dt.year()); + TQString m = cal->monthName(dt, true) + TQString(" %1").arg( dt.year()); m_dlv->addSlaveColumn(m); dt = pend.addDays(1); // 1. next month @@ -378,7 +378,7 @@ bool AccountsView::setContext(Context::Accountsview &context) { //m_dlv->setSizes(list); //NOTE: This doesn't always work! m_date = context.date; if (!m_date.isValid()) - m_date = TQDate::tqcurrentDate(); + m_date = TQDate::currentDate(); m_period = context.period; m_cumulative = context.cumulative; setContextClosedItems(context); diff --git a/kplato/kptcalendar.cc b/kplato/kptcalendar.cc index 486c3dac..56ba7380 100644 --- a/kplato/kptcalendar.cc +++ b/kplato/kptcalendar.cc @@ -225,11 +225,11 @@ Duration CalendarDay::effort(const TQTime &start, const TQTime &end) { for (; it.current(); ++it) { //kdDebug()<<k_funcinfo<<"Interval: "<<it.current()->first.toString()<<" - "<<it.current()->second.toString()<<endl; if (end > it.current()->first && start < it.current()->second) { - DateTime dtStart(TQDate::tqcurrentDate(), start); + DateTime dtStart(TQDate::currentDate(), start); if (start < it.current()->first) { dtStart.setTime(it.current()->first); } - DateTime dtEnd(TQDate::tqcurrentDate(), end); + DateTime dtEnd(TQDate::currentDate(), end); if (end > it.current()->second) { dtEnd.setTime(it.current()->second); } @@ -282,8 +282,8 @@ Duration CalendarDay::duration() const { Duration dur; TQPtrListIterator<TQPair<TQTime, TQTime> > it = m_workingIntervals; for (; it.current(); ++it) { - DateTime start(TQDate::tqcurrentDate(), it.current()->first); - DateTime end(TQDate::tqcurrentDate(), it.current()->second); + DateTime start(TQDate::currentDate(), it.current()->first); + DateTime end(TQDate::currentDate(), it.current()->second); dur += end - start; } return dur; diff --git a/kplato/kptcalendaredit.cc b/kplato/kptcalendaredit.cc index ab2df8bd..85dee06f 100644 --- a/kplato/kptcalendaredit.cc +++ b/kplato/kptcalendaredit.cc @@ -30,12 +30,12 @@ #include <tqradiobutton.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlineedit.h> #include <tqdatetimeedit.h> #include <tqdatetime.h> #include <tqtabwidget.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <klocale.h> diff --git a/kplato/kptcalendareditbase.cc b/kplato/kptcalendareditbase.cc index aaa6fab0..df46d3af 100644 --- a/kplato/kptcalendareditbase.cc +++ b/kplato/kptcalendareditbase.cc @@ -31,7 +31,7 @@ #include <tqheader.h> #include <tqlistview.h> #include <tqdatetimeedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -51,10 +51,10 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f groupBox2 = new TQGroupBox( this, "groupBox2" ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 6 ); - groupBox2Layout = new TQGridLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 6 ); + groupBox2Layout = new TQGridLayout( groupBox2->layout() ); + groupBox2Layout->setAlignment( TQt::AlignTop ); calendarPanel = new CalendarPanel( groupBox2, "calendarPanel" ); @@ -62,54 +62,54 @@ CalendarEditBase::CalendarEditBase( TQWidget* parent, const char* name, WFlags f day = new TQButtonGroup( groupBox2, "day" ); day->setColumnLayout(0, Qt::Vertical ); - day->tqlayout()->setSpacing( 6 ); - day->tqlayout()->setMargin( 6 ); - dayLayout = new TQVBoxLayout( day->tqlayout() ); - dayLayout->tqsetAlignment( TQt::AlignTop ); + day->layout()->setSpacing( 6 ); + day->layout()->setMargin( 6 ); + dayLayout = new TQVBoxLayout( day->layout() ); + dayLayout->setAlignment( TQt::AlignTop ); - tqlayout8 = new TQHBoxLayout( 0, 0, 6, "tqlayout8"); + layout8 = new TQHBoxLayout( 0, 0, 6, "layout8"); state = new TQComboBox( FALSE, day, "state" ); - tqlayout8->addWidget( state ); + layout8->addWidget( state ); bApply = new TQPushButton( day, "bApply" ); - tqlayout8->addWidget( bApply ); - dayLayout->addLayout( tqlayout8 ); + layout8->addWidget( bApply ); + dayLayout->addLayout( layout8 ); groupBox4 = new TQGroupBox( day, "groupBox4" ); groupBox4->setColumnLayout(0, Qt::Vertical ); - groupBox4->tqlayout()->setSpacing( 6 ); - groupBox4->tqlayout()->setMargin( 6 ); - groupBox4Layout = new TQVBoxLayout( groupBox4->tqlayout() ); - groupBox4Layout->tqsetAlignment( TQt::AlignTop ); + groupBox4->layout()->setSpacing( 6 ); + groupBox4->layout()->setMargin( 6 ); + groupBox4Layout = new TQVBoxLayout( groupBox4->layout() ); + groupBox4Layout->setAlignment( TQt::AlignTop ); intervalList = new TQListView( groupBox4, "intervalList" ); intervalList->addColumn( tr2i18n( "Work Interval" ) ); groupBox4Layout->addWidget( intervalList ); - tqlayout6 = new TQHBoxLayout( 0, 0, 6, "tqlayout6"); + layout6 = new TQHBoxLayout( 0, 0, 6, "layout6"); startTime = new TQTimeEdit( groupBox4, "startTime" ); - tqlayout6->addWidget( startTime ); + layout6->addWidget( startTime ); endTime = new TQTimeEdit( groupBox4, "endTime" ); - tqlayout6->addWidget( endTime ); - groupBox4Layout->addLayout( tqlayout6 ); + layout6->addWidget( endTime ); + groupBox4Layout->addLayout( layout6 ); - tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5"); + layout5 = new TQHBoxLayout( 0, 0, 6, "layout5"); bClear = new TQPushButton( groupBox4, "bClear" ); - tqlayout5->addWidget( bClear ); + layout5->addWidget( bClear ); bAddInterval = new TQPushButton( groupBox4, "bAddInterval" ); - tqlayout5->addWidget( bAddInterval ); - groupBox4Layout->addLayout( tqlayout5 ); + layout5->addWidget( bAddInterval ); + groupBox4Layout->addLayout( layout5 ); dayLayout->addWidget( groupBox4 ); groupBox2Layout->addWidget( day, 1, 1 ); CalendarEditBaseLayout->addWidget( groupBox2 ); languageChange(); - resize( TQSize(540, 340).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(540, 340).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kplato/kptcalendareditbase.h b/kplato/kptcalendareditbase.h index df2f9c0c..b6a22064 100644 --- a/kplato/kptcalendareditbase.h +++ b/kplato/kptcalendareditbase.h @@ -64,12 +64,12 @@ public: protected: TQHBoxLayout* CalendarEditBaseLayout; TQGridLayout* groupBox2Layout; - TQHBoxLayout* tqlayout10; + TQHBoxLayout* layout10; TQVBoxLayout* dayLayout; - TQHBoxLayout* tqlayout8; + TQHBoxLayout* layout8; TQVBoxLayout* groupBox4Layout; - TQHBoxLayout* tqlayout6; - TQHBoxLayout* tqlayout5; + TQHBoxLayout* layout6; + TQHBoxLayout* layout5; protected slots: virtual void languageChange(); diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cc index b5a2d59c..67d36fd4 100644 --- a/kplato/kptcalendarlistdialog.cc +++ b/kplato/kptcalendarlistdialog.cc @@ -27,12 +27,12 @@ #include <tqcombobox.h> #include <tqheader.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlineedit.h> #include <tqdatetimeedit.h> #include <tqdatetime.h> #include <tqtabwidget.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <klocale.h> @@ -182,8 +182,8 @@ CalendarListDialog::CalendarListDialog(Project &p, TQWidget *parent, const char if (f) { dia->calendarList->setSelected(f, true); } - //kdDebug()<<"size="<<size().width()<<"x"<<size().height()<<" hint="<<tqsizeHint().width()<<"x"<<tqsizeHint().height()<<endl; - resize(TQSize(725, 388).expandedTo(tqminimumSizeHint())); + //kdDebug()<<"size="<<size().width()<<"x"<<size().height()<<" hint="<<sizeHint().width()<<"x"<<sizeHint().height()<<endl; + resize(TQSize(725, 388).expandedTo(minimumSizeHint())); setMainWidget(dia); enableButtonOK(false); diff --git a/kplato/kptcalendarlistdialogbase.cc b/kplato/kptcalendarlistdialogbase.cc index 764c7e98..7f144704 100644 --- a/kplato/kptcalendarlistdialogbase.cc +++ b/kplato/kptcalendarlistdialogbase.cc @@ -28,7 +28,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtable.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqlabel.h> diff --git a/kplato/kptcalendarlistpanel.ui b/kplato/kptcalendarlistpanel.ui index 04f86757..29f4a4fd 100644 --- a/kplato/kptcalendarlistpanel.ui +++ b/kplato/kptcalendarlistpanel.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -67,7 +67,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -75,7 +75,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc index e6322944..59ab2f01 100644 --- a/kplato/kptcalendarpanel.cc +++ b/kplato/kptcalendarpanel.cc @@ -65,7 +65,7 @@ CalendarPanel::CalendarPanel(TQWidget *parent, TQDate dt, const char *name, WFla CalendarPanel::CalendarPanel( TQWidget *parent, const char *name ) : TQFrame(parent,name) { - init( TQDate::tqcurrentDate() ); + init( TQDate::currentDate() ); } void CalendarPanel::init( const TQDate &dt ) @@ -96,10 +96,10 @@ void CalendarPanel::init( const TQDate &dt ) setFontSize(10); line->setValidator(val); line->installEventFilter( this ); - yearForward->setPixmap(BarIcon(TQString::tqfromLatin1("2rightarrow"))); - yearBackward->setPixmap(BarIcon(TQString::tqfromLatin1("2leftarrow"))); - monthForward->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow"))); - monthBackward->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow"))); + yearForward->setPixmap(BarIcon(TQString::fromLatin1("2rightarrow"))); + yearBackward->setPixmap(BarIcon(TQString::fromLatin1("2leftarrow"))); + monthForward->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow"))); + monthBackward->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow"))); setDate(dt); // set button texts connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); @@ -164,7 +164,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*) // ----- calculate button row height: for(count=0; count<NoOfButtons; ++count) { if ( buttons[count] ) { // closeButton may be 0L - sizes[count]=buttons[count]->tqsizeHint(); + sizes[count]=buttons[count]->sizeHint(); buttonHeight=TQMAX(buttonHeight, sizes[count].height()); } else @@ -175,7 +175,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*) for(count=0; count<NoOfButtons; ++count) { if(buttons[count]==selectMonth) { TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin))); + sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin))); } } // ----- center buttons @@ -195,7 +195,7 @@ CalendarPanel::resizeEvent(TQResizeEvent*) x+=w; } // ----- place the line edit for direct input: - sizes[0]=line->tqsizeHint(); + sizes[0]=line->sizeHint(); int week_width=d->selectWeek->fontMetrics().width(i18n("Week XX"))+((d->closeButton != 0L) ? 50 : 20); line->setGeometry(0, height()-sizes[0].height(), width()-week_width, sizes[0].height()); d->selectWeek->setGeometry(width()-week_width, height()-sizes[0].height(), week_width, sizes[0].height()); @@ -209,7 +209,7 @@ CalendarPanel::dateChangedSlot(TQDate date) { //kdDebug() << "CalendarPanel::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl; line->setText(KGlobal::locale()->formatDate(date, true)); - d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date))); + d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); selectMonth->setText(KGlobal::locale()->calendar()->monthName(date.month(), false)); selectYear->setText(date.toString("yyyy")); emit(dateChanged(date)); @@ -242,7 +242,7 @@ CalendarPanel::setDate(const TQDate& date) TQString temp; // ----- table->setDate(date); - d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date))); + d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date))); selectMonth->setText(KGlobal::locale()->calendar()->monthName(date.month(), false)); temp.setNum(date.year()); selectYear->setText(temp); @@ -285,7 +285,7 @@ CalendarPanel::selectWeekClicked() PopupFrame* popup = new PopupFrame(this); DateInternalWeekSelector* picker = new DateInternalWeekSelector(fontsize, popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -322,7 +322,7 @@ CalendarPanel::selectMonthClicked() PopupFrame* popup = new PopupFrame(this); DateInternalMonthPicker* picker = new DateInternalMonthPicker(fontsize, popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); picker->setFocus(); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); @@ -352,7 +352,7 @@ CalendarPanel::selectYearClicked() PopupFrame* popup = new PopupFrame(this); DateInternalYearSelector* picker = new DateInternalYearSelector(fontsize, popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -409,9 +409,9 @@ CalendarPanel::lineEnterPressed() } TQSize -CalendarPanel::tqsizeHint() const +CalendarPanel::sizeHint() const { - TQSize tableSize=table->tqsizeHint(); + TQSize tableSize=table->sizeHint(); TQWidget *buttons[]={ yearBackward, monthBackward, @@ -427,13 +427,13 @@ CalendarPanel::tqsizeHint() const // ----- store the size hints: for(count=0; count<NoOfButtons; ++count) { if ( buttons[count] ) - sizes[count]=buttons[count]->tqsizeHint(); + sizes[count]=buttons[count]->sizeHint(); else sizes[count] = TQSize(0,0); if(buttons[count]==selectMonth) { TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin)); + cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin)); } else { cx+=sizes[count].width(); } @@ -442,7 +442,7 @@ CalendarPanel::tqsizeHint() const // ----- calculate width hint: cx=TQMAX(cx, tableSize.width()); // line edit ignored // ----- calculate height hint: - cy+=tableSize.height()+line->tqsizeHint().height(); + cy+=tableSize.height()+line->sizeHint().height(); return TQSize(cx, cy); } @@ -471,7 +471,7 @@ CalendarPanel::setFontSize(int s) } TQFontMetrics metrics(selectMonth->fontMetrics()); for(int i=1; i <= 12; ++i) - { // maxMonthRect is used by tqsizeHint() + { // maxMonthRect is used by sizeHint() r=metrics.boundingRect(KGlobal::locale()->calendar()->monthName(i, false)); maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width())); maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); @@ -490,7 +490,7 @@ CalendarPanel::setCloseButton( bool enable ) TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); connect( d->closeButton, TQT_SIGNAL( clicked() ), - tqtopLevelWidget(), TQT_SLOT( close() ) ); + topLevelWidget(), TQT_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/kplato/kptcalendarpanel.h b/kplato/kptcalendarpanel.h index 9cf6c4f8..0c72d763 100644 --- a/kplato/kptcalendarpanel.h +++ b/kplato/kptcalendarpanel.h @@ -54,7 +54,7 @@ public: /** The usual constructor. The given date will be displayed * initially. **/ - CalendarPanel(TQWidget *parent=0, TQDate=TQDate::tqcurrentDate(), const char *name=0, WFlags f=0); + CalendarPanel(TQWidget *parent=0, TQDate=TQDate::currentDate(), const char *name=0, WFlags f=0); /** * Standard qt widget constructor. The initial date will be the @@ -73,9 +73,9 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize tqsizeHint() const; + TQSize sizeHint() const; - TQSize tqminimumSizeHint() const { return tqsizeHint(); } + TQSize minimumSizeHint() const { return sizeHint(); } /** * Sets the date. * @@ -113,7 +113,7 @@ public: /** * By calling this method with @p enable = true, CalendarPanel will show * a little close-button in the upper button-row. Clicking the - * close-button will cause the CalendarPanel's tqtopLevelWidget()'s close() + * close-button will cause the CalendarPanel's topLevelWidget()'s close() * method being called. This is mostly useful for toplevel datepickers * without a window manager decoration. * @see #hasCloseButton diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc index 59690e3a..837fb48a 100644 --- a/kplato/kptcanvasitem.cc +++ b/kplato/kptcanvasitem.cc @@ -70,15 +70,15 @@ int PertNodeItem::RTTI = 2000; void PertNodeItem::setVisible(bool yes) { //kdDebug()<<k_funcinfo<<m_node.name()<<endl; - TQCanvasPolygon::tqsetVisible(yes); + TQCanvasPolygon::setVisible(yes); TQCanvasItemList list = canvas()->allItems(); TQCanvasItemList::Iterator it = list.begin(); for (; it != list.end(); ++it) { if ( *it == m_name ) - m_name->tqsetVisible(yes); + m_name->setVisible(yes); if ( *it == m_leader ) - m_leader->tqsetVisible(yes); + m_leader->setVisible(yes); } } @@ -88,7 +88,7 @@ void PertNodeItem::move(PertCanvas *view, int row, int col) m_row = row; m_col = col; view->mapNode(this); - // Now map my tqchildren + // Now map my children TQPtrListIterator<PertNodeRelation> it(m_childRelations); for (; it.current(); ++it) { @@ -274,7 +274,7 @@ PertRelationItem::PertRelationItem( PertCanvas *view, PertNodeItem *parent, Pert { //kdDebug()<<k_funcinfo<<"Parent="<<parent->node().name()<<" Child="<<child->node().name()<<endl; draw(); - tqsetVisible(true); + setVisible(true); } PertRelationItem::~PertRelationItem() @@ -708,10 +708,10 @@ void GanttViewSummaryItem::insertRelations(GanttView *view) { KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type())); //TODO i18n - TQString t = i18n("From: %1").tqarg(this->listViewText(0)); - t += "\n" + i18n("To: %1").tqarg(child->listViewText(0)); + TQString t = i18n("From: %1").arg(this->listViewText(0)); + t += "\n" + i18n("To: %1").arg(child->listViewText(0)); if (it.current()->lag() > Duration::zeroDuration) { - t += "\n" + i18n("Lag: %1").tqarg(it.current()->lag().toString(Duration::Format_i18nDayTime)); + t += "\n" + i18n("Lag: %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime)); } link->setTooltipText(t); view->addTaskLink(link); @@ -789,10 +789,10 @@ void GanttViewTaskItem::insertRelations(GanttView *view) { KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type())); //TODO i18n - TQString t = i18n("From: %1").tqarg(this->listViewText(0)); - t += "\n" + i18n("To: %1").tqarg(child->listViewText(0)); + TQString t = i18n("From: %1").arg(this->listViewText(0)); + t += "\n" + i18n("To: %1").arg(child->listViewText(0)); if (it.current()->lag() > Duration::zeroDuration) { - t += "\n" + i18n("Lag: %1").tqarg(it.current()->lag().toString(Duration::Format_i18nDayTime)); + t += "\n" + i18n("Lag: %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime)); } link->setTooltipText(t); view->addTaskLink(link); @@ -871,10 +871,10 @@ void GanttViewEventItem::insertRelations(GanttView *view) { KDGanttViewTaskLink *link = new KDGanttViewTaskLink(this, child, kdLinkType(it.current()->type())); - TQString t = i18n("From: %1").tqarg(this->listViewText(0)); - t += "\n" + i18n("To: %1").tqarg(child->listViewText(0)); + TQString t = i18n("From: %1").arg(this->listViewText(0)); + t += "\n" + i18n("To: %1").arg(child->listViewText(0)); if (it.current()->lag() > Duration::zeroDuration) { - t += "\n" + i18n("Lag: %1").tqarg(it.current()->lag().toString(Duration::Format_i18nDayTime)); + t += "\n" + i18n("Lag: %1").arg(it.current()->lag().toString(Duration::Format_i18nDayTime)); } link->setTooltipText(t); view->addTaskLink(link); diff --git a/kplato/kptcommand.cc b/kplato/kptcommand.cc index 662c0dd0..992bfb5c 100644 --- a/kplato/kptcommand.cc +++ b/kplato/kptcommand.cc @@ -347,7 +347,7 @@ NodeDeleteCmd::NodeDeleteCmd(Part *part, Node *node, TQString name) for (; it.current(); ++it) { Schedule *s = node->findSchedule(it.current()->id()); if (s && s->isScheduled()) { - // Only tqinvalidate schedules this node is part of + // Only invalidate schedules this node is part of addSchScheduled(it.current()); } } diff --git a/kplato/kptconfigbehaviorpanel.cc b/kplato/kptconfigbehaviorpanel.cc index 45cbf64a..9c74302b 100644 --- a/kplato/kptconfigbehaviorpanel.cc +++ b/kplato/kptconfigbehaviorpanel.cc @@ -33,7 +33,7 @@ #include <kstandarddirs.h> #include <kdebug.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc index 729d6443..2186d400 100644 --- a/kplato/kptconfigdialog.cc +++ b/kplato/kptconfigdialog.cc @@ -41,7 +41,7 @@ namespace KPlato // little helper stolen from kmail/kword static inline TQPixmap loadIcon( const char * name ) { return KGlobal::instance()->iconLoader() - ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } diff --git a/kplato/kptconfigtaskpanelbase.ui b/kplato/kptconfigtaskpanelbase.ui index 31e07542..178d1f08 100644 --- a/kplato/kptconfigtaskpanelbase.ui +++ b/kplato/kptconfigtaskpanelbase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ The estimation can be either effort based or duration based. If it is effort bas </widget> <widget class="TQLayoutWidget" row="3" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc index afa06591..c4d8022d 100644 --- a/kplato/kptdatetable.cc +++ b/kplato/kptdatetable.cc @@ -32,7 +32,7 @@ #include <tqpainter.h> #include <tqdialog.h> #include <assert.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvaluelist.h> #include <kglobalsettings.h> @@ -88,7 +88,7 @@ DateTable::DateTable(TQWidget *parent, TQDate date_, const char* name, WFlags f) setFontSize(10); if(!date_.isValid()) { kdError() <<k_funcinfo<<"Given date is invalid, using current date." << endl; - date_=TQDate::tqcurrentDate(); + date_=TQDate::currentDate(); } setFocusPolicy( TQ_StrongFocus ); setNumCols(7+m_dateStartCol); // 7 days a week + maybe 1 for weeknumbers @@ -175,7 +175,7 @@ void DateTable::paintWeekNumber(TQPainter *painter, int row) { painter->drawRect(0, 0, w, h); painter->setPen(KGlobalSettings::textColor()); - painter->drawText(0, 0, w, h-1, AlignCenter, TQString("%1").tqarg(m_weeks[row].first), -1, &rect); + painter->drawText(0, 0, w, h-1, AlignCenter, TQString("%1").arg(m_weeks[row].first), -1, &rect); painter->setPen(colorLine); painter->moveTo(w-1, 0); painter->lineTo(w-1, h-1); @@ -232,7 +232,7 @@ void DateTable::paintDay(TQPainter *painter, int row, int col) { painter->lineTo(w-1, h-1); } // then paint square if current date - if (d == TQDate::tqcurrentDate()) { + if (d == TQDate::currentDate()) { painter->setPen(colorLine); painter->drawRect(1, 1, w-2, h-2); } @@ -317,7 +317,7 @@ void DateTable::keyPressEvent( TQKeyEvent *e ) { return; } if ( e->key() == TQt::Key_N ) { - setDate(TQDate::tqcurrentDate()); + setDate(TQDate::currentDate()); return; } if ( e->key() == TQt::Key_Control ) { @@ -353,7 +353,7 @@ void DateTable::setFontSize(int size) { maxCell.setHeight(TQMAX(maxCell.height(), rect.height())); } // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::tqfromLatin1("88")); + rect=metrics.boundingRect(TQString::fromLatin1("88")); maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width())); maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height())); } @@ -527,7 +527,7 @@ bool DateTable::selectDate(const TQDate& date_) { return true; } -bool DateTable::setDate(const TQDate& date_, bool tqrepaint) { +bool DateTable::setDate(const TQDate& date_, bool repaint) { //kdDebug()<<k_funcinfo<<"date="<<date_.toString()<<endl; bool changed=false; TQDate temp; @@ -562,7 +562,7 @@ bool DateTable::setDate(const TQDate& date_, bool tqrepaint) { m_selectedDates.insert(date); }*/ numDaysPrevMonth=temp.daysInMonth(); - if(changed && tqrepaint) { + if(changed && repaint) { repaintContents(false); } if (m_enabled) @@ -582,12 +582,12 @@ void DateTable::focusOutEvent( TQFocusEvent *e ) { TQGridView::focusOutEvent( e ); } -TQSize DateTable::tqsizeHint() const { +TQSize DateTable::sizeHint() const { if(maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - //kdDebug() << "DateTable::tqsizeHint: obscure failure - " << endl; + //kdDebug() << "DateTable::sizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } @@ -794,7 +794,7 @@ DateInternalMonthPicker::DateInternalMonthPicker } TQSize -DateInternalMonthPicker::tqsizeHint() const +DateInternalMonthPicker::sizeHint() const { return TQSize((max.width()+6)*numCols()+2*frameWidth(), (max.height()+6)*numRows()+2*frameWidth()); @@ -894,7 +894,7 @@ DateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) updateCell( row, col /*, false */ ); // mark the new active cell } } - if ( tmpRow > -1 ) // tqrepaint the former active cell + if ( tmpRow > -1 ) // repaint the former active cell updateCell( tmpRow, tmpCol /*, true */ ); } } @@ -1053,7 +1053,7 @@ int PopupFrame::exec(TQPoint pos) { popup(pos); - tqrepaint(); + repaint(); tqApp->enter_loop(); hide(); return result; diff --git a/kplato/kptdatetable.h b/kplato/kptdatetable.h index 815a86e9..b75f98db 100644 --- a/kplato/kptdatetable.h +++ b/kplato/kptdatetable.h @@ -104,11 +104,11 @@ public: /** * The size hint. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * The minimum size hint. */ - TQSize tqminimumSizeHint() const { return tqsizeHint(); } + TQSize minimumSizeHint() const { return sizeHint(); } /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -260,7 +260,7 @@ public: /** * The constructor. */ - DateTable(TQWidget *parent=0, TQDate date=TQDate::tqcurrentDate(), + DateTable(TQWidget *parent=0, TQDate date=TQDate::currentDate(), const char* name="DateTable", WFlags f=0); /** @@ -268,9 +268,9 @@ public: * To save some time, the size of the largest used cell content is * calculated in each paintCell() call, since all calculations have * to be done there anyway. The size is stored in maxCell. The - * tqsizeHint() simply returns a multiple of maxCell. + * sizeHint() simply returns a multiple of maxCell. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Set the font size of the date table. */ @@ -278,7 +278,7 @@ public: /** * Select and display this date. */ - bool setDate(const TQDate&, bool tqrepaint=true); + bool setDate(const TQDate&, bool repaint=true); const TQDate& getDate() const; bool selectDate(const TQDate& date_); diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc index 2780d166..f855509c 100644 --- a/kplato/kptdoublelistviewbase.cc +++ b/kplato/kptdoublelistviewbase.cc @@ -23,10 +23,10 @@ #include "kptview.h" #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmap.h> #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> #include <tqptrvector.h> #include <tqsplitter.h> #include <tqstring.h> @@ -128,7 +128,7 @@ void DoubleListViewBase::SlaveListItem::clearColumn(int col) { } void DoubleListViewBase::SlaveListItem::setColumn(int col, double value) { if (col < listView()->columns()) { - //setText(col, TQString("%1").tqarg(value, m_fieldwidth, m_fmt, m_prec)); + //setText(col, TQString("%1").arg(value, m_fieldwidth, m_fmt, m_prec)); setText(col, KGlobal::locale()->formatNumber(value, m_prec)); m_valueMap.replace(col, value); //kdDebug()<<k_funcinfo<<m_masterItem->text(0)<<": column["<<col<<"]="<<value<<endl; @@ -240,14 +240,14 @@ void DoubleListViewBase::MasterListItem::slaveItemDeleted() { void DoubleListViewBase::MasterListItem::setTotal(double tot) { m_value = tot; - //setText(1, TQString("%1").tqarg(tot, m_fieldwidth, m_fmt, m_prec)); + //setText(1, TQString("%1").arg(tot, m_fieldwidth, m_fmt, m_prec)); setText(1, KGlobal::locale()->formatNumber(tot, m_prec)); //kdDebug()<<k_funcinfo<<text(0)<<"="<<tot<<endl; } void DoubleListViewBase::MasterListItem::addToTotal(double v) { m_value += v; - //setText(1, TQString("%1").tqarg(m_value, m_fieldwidth, m_fmt, m_prec)); + //setText(1, TQString("%1").arg(m_value, m_fieldwidth, m_fmt, m_prec)); setText(1, KGlobal::locale()->formatNumber(m_value, m_prec)); } @@ -388,9 +388,9 @@ DoubleListViewBase::DoubleListViewBase(TQWidget *parent, bool description) } -TQSize DoubleListViewBase::tqsizeHint() const { - //kdDebug()<<k_funcinfo<<tqminimumSizeHint()<<endl; - return tqminimumSizeHint(); //HACK: koshell splitter problem +TQSize DoubleListViewBase::sizeHint() const { + //kdDebug()<<k_funcinfo<<minimumSizeHint()<<endl; + return minimumSizeHint(); //HACK: koshell splitter problem } void DoubleListViewBase::clearSlaveList() { diff --git a/kplato/kptdoublelistviewbase.h b/kplato/kptdoublelistviewbase.h index aaaaf305..6b610475 100644 --- a/kplato/kptdoublelistviewbase.h +++ b/kplato/kptdoublelistviewbase.h @@ -83,7 +83,7 @@ public: void setFormat(int fieldwidth=0, char fmt='f', int prec=0); void setMasterFormat(int fieldwidth=0, char fmt='f', int prec=0); void setSlaveFormat(int fieldwidth=0, char fmt='f', int prec=0); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; class MasterListItem; class SlaveListItem : public KListViewItem { @@ -125,7 +125,7 @@ public: MasterListItem(TQListViewItem *parent, TQString text, bool highlight=false); ~MasterListItem(); - /// Creates slaveitems for myself and my tqchildren + /// Creates slaveitems for myself and my children void createSlaveItems(TQListView *lv, TQListViewItem *after=0); void slaveItemDeleted(); void setSlaveOpen(bool on); diff --git a/kplato/kptduration.cc b/kplato/kptduration.cc index 5e9d6b44..0a2296b0 100644 --- a/kplato/kptduration.cc +++ b/kplato/kptduration.cc @@ -129,11 +129,11 @@ TQString Duration::toString(Format format) const { hours = ms / (1000 * 60 * 60); ms -= (TQ_INT64)hours * (1000 * 60 * 60); minutes = ms / (1000 * 60); - result = TQString("%1h%2m").tqarg(hours).tqarg(minutes); + result = TQString("%1h%2m").arg(hours).arg(minutes); break; case Format_Day: days = m_ms / (1000 * 60 * 60 * 24.0); - result = TQString("%1d").tqarg(TQString::number(days, 'f', 4)); + result = TQString("%1d").arg(TQString::number(days, 'f', 4)); break; case Format_DayTime: ms = m_ms; @@ -156,7 +156,7 @@ TQString Duration::toString(Format format) const { hours = ms / (1000 * 60 * 60); ms -= (TQ_INT64)hours * (1000 * 60 * 60); minutes = ms / (1000 * 60); - result = i18n("<hours>h:<minutes>m", "%1h:%2m").tqarg(hours).tqarg(minutes); + result = i18n("<hours>h:<minutes>m", "%1h:%2m").arg(hours).arg(minutes); break; case Format_i18nDay: result = KGlobal::locale()->formatNumber(toDouble(Unit_d), 2); @@ -174,7 +174,7 @@ TQString Duration::toString(Format format) const { if (days == 0) { result = toString(Format_i18nHour); } else { - result = i18n("<days>d <hours>h:<minutes>m", "%1d %2h:%3m").tqarg(days).tqarg(hours).tqarg(minutes); + result = i18n("<days>d <hours>h:<minutes>m", "%1d %2h:%3m").arg(days).arg(hours).arg(minutes); } break; case Format_i18nHourFraction: diff --git a/kplato/kptdurationwidget.ui b/kplato/kptdurationwidget.ui index a923dab4..74018692 100644 --- a/kplato/kptdurationwidget.ui +++ b/kplato/kptdurationwidget.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -48,13 +48,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32676</width> <height>20</height> @@ -106,13 +106,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>70</width> <height>32767</height> @@ -125,7 +125,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignRight</set> </property> </widget> @@ -163,7 +163,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -175,7 +175,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignRight</set> </property> </widget> @@ -202,7 +202,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -214,7 +214,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignRight</set> </property> </widget> @@ -252,7 +252,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -264,7 +264,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignRight</set> </property> </widget> @@ -302,13 +302,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -320,7 +320,7 @@ <property name="frame"> <bool>false</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignRight</set> </property> </widget> diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc index 925598f9..fa5bca1e 100644 --- a/kplato/kptganttview.cc +++ b/kplato/kptganttview.cc @@ -45,7 +45,7 @@ #include <tqsplitter.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqheader.h> #include <tqpopupmenu.h> @@ -73,8 +73,8 @@ public: MyKDGanttView(TQWidget *parent, const char *name) : KDGanttView(parent, name) { } - virtual TQSize tqsizeHint() const { - return tqminimumSizeHint(); //HACK: koshell splitter tqminimumSize problem + virtual TQSize sizeHint() const { + return minimumSizeHint(); //HACK: koshell splitter minimumSize problem } }; @@ -322,7 +322,7 @@ void GanttView::resetDrawn(KDGanttViewItem *_item) for (; item; item = nextItem) { nextItem = item->nextSibling(); setDrawn(item, false); - resetDrawn(item->firstChild()); // then my tqchildren + resetDrawn(item->firstChild()); // then my children } } @@ -336,7 +336,7 @@ void GanttView::removeNotDrawn(KDGanttViewItem *_item) m_currentItem = 0; deleteItem(item); } else { - removeNotDrawn(item->firstChild()); // then my tqchildren + removeNotDrawn(item->firstChild()); // then my children } } } @@ -502,10 +502,10 @@ void GanttView::modifySummaryTask(KDGanttViewItem *item, Task *task) } else { item->setText(TQString()); } - TQString w = i18n("Name: %1").tqarg(task->name()); + TQString w = i18n("Name: %1").arg(task->name()); if (!task->notScheduled()) { - w += "\n" + i18n("Start: %1").tqarg(locale->formatDateTime(task->startTime())); - w += "\n" + i18n("End: %1").tqarg(locale->formatDateTime(task->endTime())); + w += "\n" + i18n("Start: %1").arg(locale->formatDateTime(task->startTime())); + w += "\n" + i18n("End: %1").arg(locale->formatDateTime(task->endTime())); } bool ok = true; if (task->notScheduled()) { @@ -582,15 +582,15 @@ void GanttView::modifyTask(KDGanttViewItem *item, Task *task) item->setFloatStartTime(TQDateTime()); item->setFloatEndTime(TQDateTime()); } - TQString w = i18n("Name: %1").tqarg(task->name()); + TQString w = i18n("Name: %1").arg(task->name()); if (!task->notScheduled()) { - w += "\n"; w += i18n("Start: %1").tqarg(locale->formatDateTime(task->startTime())); - w += "\n"; w += i18n("End: %1").tqarg(locale->formatDateTime(task->endTime())); + w += "\n"; w += i18n("Start: %1").arg(locale->formatDateTime(task->startTime())); + w += "\n"; w += i18n("End: %1").arg(locale->formatDateTime(task->endTime())); if (m_showProgress) { - w += "\n"; w += i18n("Completion: %1%").tqarg(task->progress().percentFinished); + w += "\n"; w += i18n("Completion: %1%").arg(task->progress().percentFinished); } if (task->positiveFloat() > Duration::zeroDuration) { - w += "\n" + i18n("Float: %1").tqarg(task->positiveFloat().toString(Duration::Format_i18nDayTime)); + w += "\n" + i18n("Float: %1").arg(task->positiveFloat().toString(Duration::Format_i18nDayTime)); } if (task->inCriticalPath()) { w += "\n" + i18n("Critical path"); @@ -623,7 +623,7 @@ void GanttView::modifyTask(KDGanttViewItem *item, Task *task) if (task->resourceOverbooked()) { ok = false; TQStringList rl = task->overbookedResources(); - sts += "\n" + i18n("arg: list of resources", "Resource overbooked: %1").tqarg(rl.join(",")); + sts += "\n" + i18n("arg: list of resources", "Resource overbooked: %1").arg(rl.join(",")); } if (!m_showNoInformation && m_project && m_project->notScheduled()) { @@ -684,12 +684,12 @@ void GanttView::modifyMilestone(KDGanttViewItem *item, Task *task) } //TODO: Show progress - TQString w = i18n("Name: %1").tqarg(task->name()); + TQString w = i18n("Name: %1").arg(task->name()); if (!task->notScheduled()) { - w += "\n" + i18n("Time: %1").tqarg(locale->formatDateTime(task->startTime())); + w += "\n" + i18n("Time: %1").arg(locale->formatDateTime(task->startTime())); if (task->positiveFloat() > Duration::zeroDuration) { - w += "\n" + i18n("Float: %1").tqarg(task->positiveFloat().toString(Duration::Format_i18nDayTime)); + w += "\n" + i18n("Float: %1").arg(task->positiveFloat().toString(Duration::Format_i18nDayTime)); } if (task->inCriticalPath()) { w += "\n" + i18n("Critical path"); @@ -1048,7 +1048,7 @@ void GanttView::print(KPrinter &prt) { p.drawRect(0,0,metrics.width(),metrics.height()); TQString text; int hei = 0; - text = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); + text = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); TQRect r = p.boundingRect(metrics.width()-1,0,0,0, TQt::AlignRight, text ); p.drawText( r, TQt::AlignRight, text ); hei = r.height(); diff --git a/kplato/kptintervaleditbase.ui b/kplato/kptintervaleditbase.ui index 76b00dc4..4967bd4a 100644 --- a/kplato/kptintervaleditbase.ui +++ b/kplato/kptintervaleditbase.ui @@ -50,7 +50,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -70,7 +70,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> diff --git a/kplato/kptmainprojectdialog.cc b/kplato/kptmainprojectdialog.cc index a9f40ae0..ee8ed8fc 100644 --- a/kplato/kptmainprojectdialog.cc +++ b/kplato/kptmainprojectdialog.cc @@ -39,7 +39,7 @@ MainProjectDialog::MainProjectDialog(Project &p, TQWidget *parent, const char *n setMainWidget(panel); enableButtonOK(false); - resize( TQSize(500, 410).expandedTo(tqminimumSizeHint())); + resize( TQSize(500, 410).expandedTo(minimumSizeHint())); connect(panel, TQT_SIGNAL(obligatedFieldsFilled(bool)), TQT_SLOT(enableButtonOK(bool))); } diff --git a/kplato/kptmainprojectpanel.cc b/kplato/kptmainprojectpanel.cc index 222ca0a9..29f2195e 100644 --- a/kplato/kptmainprojectpanel.cc +++ b/kplato/kptmainprojectpanel.cc @@ -62,7 +62,7 @@ MainProjectPanel::MainProjectPanel(Project &p, TQWidget *parent, const char *nam TQString s = i18n("Scheduling"); Schedule *sch = project.currentSchedule(); if (sch) { - s = i18n("Scheduling (%1)").tqarg(sch->typeToString(true)); + s = i18n("Scheduling (%1)").arg(sch->typeToString(true)); } schedulingGroup->setTitle(s); if (project.constraint() == Node::MustStartOn) { diff --git a/kplato/kptmainprojectpanelbase.ui b/kplato/kptmainprojectpanelbase.ui index f6622781..5a0ccb9a 100644 --- a/kplato/kptmainprojectpanelbase.ui +++ b/kplato/kptmainprojectpanelbase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -46,7 +46,7 @@ <property name="text"> <string>&Leader:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> @@ -99,7 +99,7 @@ <property name="name"> <cstring>wbs</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> diff --git a/kplato/kptmilestoneprogresspanel.cc b/kplato/kptmilestoneprogresspanel.cc index b5c1af0a..67b88443 100644 --- a/kplato/kptmilestoneprogresspanel.cc +++ b/kplato/kptmilestoneprogresspanel.cc @@ -85,7 +85,7 @@ void MilestoneProgressPanelImpl::slotChanged() { void MilestoneProgressPanelImpl::slotFinishedChanged(bool state) { if (state) { if (!finishTime->dateTime().isValid()) { - finishTime->setDateTime(TQDateTime::tqcurrentDateTime()); + finishTime->setDateTime(TQDateTime::currentDateTime()); } } enableWidgets(); diff --git a/kplato/kptmilestoneprogresspanelbase.ui b/kplato/kptmilestoneprogresspanelbase.ui index 97a06f4d..9856eca5 100644 --- a/kplato/kptmilestoneprogresspanelbase.ui +++ b/kplato/kptmilestoneprogresspanelbase.ui @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc index 1da218e6..c95a1c9b 100644 --- a/kplato/kptnode.cc +++ b/kplato/kptnode.cc @@ -96,7 +96,7 @@ void Node::init() { m_visitedForward = false; m_visitedBackward = false; - m_dateOnlyStartDate = m_dateOnlyEndDate = TQDate::tqcurrentDate(); + m_dateOnlyStartDate = m_dateOnlyEndDate = TQDate::currentDate(); m_dateOnlyDuration.addDays(1); m_runningAccount = 0; @@ -942,7 +942,7 @@ int Effort::pessimisticRatio() const { // Debugging #ifndef NDEBUG -void Node::printDebug(bool tqchildren, TQCString indent) { +void Node::printDebug(bool children, TQCString indent) { kdDebug()<<indent<<" Unique node identity="<<m_id<<endl; if (m_effort) m_effort->printDebug(indent); TQString s = " Constraint: " + constraintToString(); @@ -972,7 +972,7 @@ void Node::printDebug(bool tqchildren, TQCString indent) { } kdDebug()<<indent<<" No of successors: "<<m_dependChildNodes.count()<<endl; TQPtrListIterator<Relation> cit(m_dependChildNodes); - //kdDebug()<<indent<<" Dependant tqchildren="<<cit.count()<<endl; + //kdDebug()<<indent<<" Dependant children="<<cit.count()<<endl; if (cit.count() > 0) { for ( ; cit.current(); ++cit ) { cit.current()->printDebug(indent); @@ -981,7 +981,7 @@ void Node::printDebug(bool tqchildren, TQCString indent) { //kdDebug()<<indent<<endl; indent += " "; - if (tqchildren) { + if (children) { TQPtrListIterator<Node> it(m_nodes); for ( ; it.current(); ++it ) { it.current()->printDebug(true,indent); diff --git a/kplato/kptnode.h b/kplato/kptnode.h index 95d7c24b..10c5613f 100644 --- a/kplato/kptnode.h +++ b/kplato/kptnode.h @@ -91,7 +91,7 @@ public: virtual bool load(TQDomElement &) { return true; } virtual bool load(TQDomElement &, Project &) { return true; } virtual void save(TQDomElement &element) const = 0; - /// Save my and my tqchildrens relations. + /// Save my and my childrens relations. virtual void saveRelations(TQDomElement &element) const; // simple child node management @@ -458,7 +458,7 @@ public: void setRunningAccount(Account *acc) { m_runningAccount = acc; } Schedule *currentSchedule() const { return m_currentSchedule; } - /// Set current schedule to schedule with identity id, for me and my tqchildren + /// Set current schedule to schedule with identity id, for me and my children virtual void setCurrentSchedule(long id); // NOTE: Cannot use setCurrentSchedule() due to overload/casting problems void setCurrentSchedulePtr(Schedule *schedule) { m_currentSchedule = schedule; } @@ -541,7 +541,7 @@ private: #ifndef NDEBUG public: - virtual void printDebug(bool tqchildren, TQCString indent); + virtual void printDebug(bool children, TQCString indent); #endif }; diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc index e442c048..7ff06084 100644 --- a/kplato/kptpart.cc +++ b/kplato/kptpart.cc @@ -198,14 +198,14 @@ bool Part::loadXML(TQIODevice *, const TQDomDocument &document) { } else if (value != "application/x-vnd.kde.kplato") { kdError() << "Unknown mime type " << value << endl; - setErrorMessage(i18n("Invalid document. Expected mimetype application/x-vnd.kde.kplato, got %1").tqarg(value)); + setErrorMessage(i18n("Invalid document. Expected mimetype application/x-vnd.kde.kplato, got %1").arg(value)); return false; } TQString m_syntaxVersion = plan.attribute("version", CURRENT_SYNTAX_VERSION); if (m_syntaxVersion > CURRENT_SYNTAX_VERSION) { int ret = KMessageBox::warningContinueCancel( 0, i18n("This document was created with a newer version of KPlato (syntax version: %1)\n" - "Opening it in this version of KPlato will lose some information.").tqarg(m_syntaxVersion), + "Opening it in this version of KPlato will lose some information.").arg(m_syntaxVersion), i18n("File-Format Mismatch"), i18n("Continue") ); if (ret == KMessageBox::Cancel) { diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc index b1f49afb..09a3e744 100644 --- a/kplato/kptpertcanvas.cc +++ b/kplato/kptpertcanvas.cc @@ -25,7 +25,7 @@ #include <tqbuffer.h> #include <tqtimer.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqprogressdialog.h> #include <tqobjectlist.h> #include <tqpainter.h> @@ -83,7 +83,7 @@ void PertCanvas::draw(Project& project) if (!(it.current()->hasParent()) && it.current()->hasChild()) { m_rows.append(new TQMemArray<bool>(1)); // New node always goes into new row, first column - it.current()->move(this, m_rows.count()-1, 0); // item also moves it's tqchildren + it.current()->move(this, m_rows.count()-1, 0); // item also moves it's children } } // now items without relations @@ -140,7 +140,7 @@ void PertCanvas::createChildItems(PertNodeItem *parentItem) m_relations.append(it.current()); } - // Now my tqchildren + // Now my children TQPtrListIterator<Node> nit(parentItem->node().childNodeIterator()); for ( ; nit.current(); ++nit ) { createChildItems(createNodeItem(nit.current())); diff --git a/kplato/kptpertview.cc b/kplato/kptpertview.cc index 02830d37..f573e310 100644 --- a/kplato/kptpertview.cc +++ b/kplato/kptpertview.cc @@ -30,7 +30,7 @@ #include <tqsplitter.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqheader.h> #include <tqpopupmenu.h> @@ -40,19 +40,19 @@ namespace KPlato { -PertView::PertView( View *view, TQWidget *parent, TQLayout *tqlayout ) +PertView::PertView( View *view, TQWidget *parent, TQLayout *layout ) : TQWidget( parent, "Pert view" ), m_mainview( view ), m_node( 0 ) { - init(tqlayout); + init(layout); } PertView::~PertView() { } -void PertView::init(TQLayout */*tqlayout*/) +void PertView::init(TQLayout */*layout*/) { //kdDebug()<<k_funcinfo<<endl; TQGridLayout *gl = new TQGridLayout(this, 1, 1, -1, -1, "Pert TQGridLayout"); diff --git a/kplato/kptpertview.h b/kplato/kptpertview.h index b98b2cae..4937a421 100644 --- a/kplato/kptpertview.h +++ b/kplato/kptpertview.h @@ -44,7 +44,7 @@ class PertView : public TQWidget public: - PertView( View *view, TQWidget *parent, TQLayout *tqlayout ); + PertView( View *view, TQWidget *parent, TQLayout *layout ); ~PertView(); @@ -70,7 +70,7 @@ signals: void modifyRelation(Relation *rel); private: - void init(TQLayout *tqlayout); + void init(TQLayout *layout); View *m_mainview; PertCanvas *m_canvasview; Node *m_node; diff --git a/kplato/kptproject.cc b/kplato/kptproject.cc index 9379de4a..4b91916d 100644 --- a/kplato/kptproject.cc +++ b/kplato/kptproject.cc @@ -31,7 +31,7 @@ #include <tqdom.h> #include <tqstring.h> #include <tqdatetime.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcanvas.h> #include <tqptrlist.h> @@ -56,7 +56,7 @@ Project::Project(Node *parent) void Project::init() { if (m_parent == 0) { // set sensible defaults for a project wo parent - m_constraintStartTime = TQDateTime(TQDate::tqcurrentDate(), TQTime()); + m_constraintStartTime = TQDateTime(TQDate::currentDate(), TQTime()); m_constraintEndTime = TQDateTime(m_constraintStartTime.addDays(1)); } m_calendars.setAutoDelete(true); @@ -308,7 +308,7 @@ bool Project::load(TQDomElement &element) { if (!s.isEmpty()) m_constraintEndTime = DateTime::fromString(s); - // Load the project tqchildren + // Load the project children // Must do these first TQDomNodeList list = element.childNodes(); for (unsigned int i=0; i<list.count(); ++i) { @@ -498,7 +498,7 @@ void Project::save(TQDomElement &element) const { } for (int i=0; i<numChildren(); i++) - // Save all tqchildren + // Save all children getChildNode(i)->save(me); // Now we can save relations assuming no tasks have relations outside the project @@ -568,7 +568,7 @@ bool Project::addTask( Node* task, Node* position ) return addSubTask(task, position); } // find the position - // we have to tell the parent that we want to delete one of its tqchildren + // we have to tell the parent that we want to delete one of its children Node* parentNode = position->getParent(); if ( !parentNode ) { kdDebug()<<k_funcinfo<<"parent node not found???"<<endl; @@ -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 parent of task to manipulate its list of tqchildren + // we have to find the parent of task to manipulate its list of children Node* parentNode = node->getParent(); if ( !parentNode ) { return false; @@ -679,7 +679,7 @@ bool Project::canUnindentTask( Node* node ) //kdDebug()<<k_funcinfo<<"The root node cannot be unindented"<<endl; return false; } - // we have to find the parent of task to manipulate its list of tqchildren + // we have to find the parent of task to manipulate its list of children // and we need the parent's parent too Node* parentNode = node->getParent(); if ( !parentNode ) { @@ -714,7 +714,7 @@ bool Project::canMoveTaskUp( Node* node ) { if (node == 0) return false; // safety - // we have to find the parent of task to manipulate its list of tqchildren + // we have to find the parent of task to manipulate its list of children Node* parentNode = node->getParent(); if (!parentNode) { //kdDebug()<<k_funcinfo<<"No parent found"<<endl; @@ -742,7 +742,7 @@ bool Project::canMoveTaskDown( Node* node ) { if (node == 0) return false; // safety - // we have to find the parent of task to manipulate its list of tqchildren + // we have to find the parent of task to manipulate its list of children Node* parentNode = node->getParent(); if (!parentNode) { return false; @@ -779,10 +779,10 @@ Task *Project::createTask(Task &def, Node* parent) { TQString Project::uniqueNodeId(int seed) { int i = seed; - while (findNode(TQString("%1").tqarg(i))) { + while (findNode(TQString("%1").arg(i))) { ++i; } - return TQString("%1").tqarg(i); + return TQString("%1").arg(i); } bool Project::removeId(const TQString &id) { @@ -987,7 +987,7 @@ void Project::setStandardWorktime(StandardWorktime * worktime) { } bool Project::legalToLink(Node *par, Node *child) { - //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" parents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" tqchildren)"<<endl; + //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" parents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" children)"<<endl; if (!child || par->isDependChildOf(child)) { return false; @@ -1007,7 +1007,7 @@ bool Project::legalToLink(Node *par, Node *child) { bool Project::legalParents(Node *par, Node *child) { bool legal = true; - //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl; + //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" children)"<<endl; for (int i=0; i < par->numDependParentNodes() && legal; ++i) { Node *pNode = par->getDependParentNode(i)->parent(); if (child->isParentOf(pNode) || pNode->isParentOf(child)) { @@ -1024,7 +1024,7 @@ bool Project::legalParents(Node *par, Node *child) { bool Project::legalChildren(Node *par, Node *child) { bool legal = true; - //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl; + //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" children)"<<endl; for (int j=0; j < child->numDependChildNodes() && legal; ++j) { Node *cNode = child->getDependChildNode(j)->child(); if (par->isParentOf(cNode) || cNode->isParentOf(par)) { @@ -1079,7 +1079,7 @@ void Project::insertCalendarId(const TQString &id, const Calendar *calendar) { } #ifndef NDEBUG -void Project::printDebug(bool tqchildren, TQCString indent) { +void Project::printDebug(bool children, TQCString indent) { kdDebug()<<indent<<"+ Project node: "<<name()<<endl; indent += "!"; @@ -1087,7 +1087,7 @@ void Project::printDebug(bool tqchildren, TQCString indent) { for ( ; it.current(); ++it) it.current()->printDebug(indent); - Node::printDebug(tqchildren, indent); + Node::printDebug(children, indent); } void Project::printCalendarDebug(TQCString indent) { kdDebug()<<indent<<"-------- Calendars debug printout --------"<<endl; diff --git a/kplato/kptproject.h b/kplato/kptproject.h index 14f03384..d0dd1eb9 100644 --- a/kplato/kptproject.h +++ b/kplato/kptproject.h @@ -223,11 +223,11 @@ public: Accounts &accounts() { return m_accounts; } - /// Set current schedule to schedule with identity id, for me and my tqchildren + /// Set current schedule to schedule with identity id, for me and my children virtual void setCurrentSchedule(long id); /// Create new schedule with unique id. MainSchedule *createSchedule(TQString name, Schedule::Type type); - /// Set parent schedule for my tqchildren + /// Set parent schedule for my children virtual void setParentSchedule(Schedule *sch); protected: @@ -267,7 +267,7 @@ private: #ifndef NDEBUG #include <tqcstring.h> public: - void printDebug(bool tqchildren, TQCString indent); + void printDebug(bool children, TQCString indent); void printCalendarDebug(TQCString indent=""); #ifdef DEBUGPERT static void pert_test(); diff --git a/kplato/kptprojectdialog.cc b/kplato/kptprojectdialog.cc index a45bddf2..4b9b8139 100644 --- a/kplato/kptprojectdialog.cc +++ b/kplato/kptprojectdialog.cc @@ -20,12 +20,12 @@ #include <tqpushbutton.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlineedit.h> #include <tqdatetimeedit.h> #include <tqdatetime.h> #include <tqtabwidget.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <kdatepicker.h> #include <klocale.h> @@ -91,24 +91,24 @@ void ProjectDialog::slotSchedulingChanged(int activated) { switch(activated) { // TODO please provide nice explenations on this. case 0: // ASAP - label = label.tqarg(i18n("As Soon as Possible")); - label = label.tqarg(i18n("Place all events at the earliest possible moment permitted in the schedule")); + label = label.arg(i18n("As Soon as Possible")); + label = label.arg(i18n("Place all events at the earliest possible moment permitted in the schedule")); break; case 1: // ALAP - label = label.tqarg(i18n("As Late as Possible")); - label = label.tqarg(i18n("Place all events at the last possible moment permitted in the schedule")); + label = label.arg(i18n("As Late as Possible")); + label = label.arg(i18n("Place all events at the last possible moment permitted in the schedule")); break; case 2: // Start not earlier then - label = label.tqarg(i18n("Start not Earlier then")); - label = label.tqarg(i18n("")); + label = label.arg(i18n("Start not Earlier then")); + label = label.arg(i18n("")); break; case 3: // Finish not later then - label = label.tqarg(i18n("Finish not Later then")); - label = label.tqarg(i18n("")); + label = label.arg(i18n("Finish not Later then")); + label = label.arg(i18n("")); break; case 4: // Must start on - label = label.tqarg(i18n("Must Start on")); - label = label.tqarg(i18n("")); + label = label.arg(i18n("Must Start on")); + label = label.arg(i18n("")); break; default: // error ... dia->lSchedulingExplain->setText(""); diff --git a/kplato/kptprojectdialogbase.ui b/kplato/kptprojectdialogbase.ui index 2dab71fe..8eb79e69 100644 --- a/kplato/kptprojectdialogbase.ui +++ b/kplato/kptprojectdialogbase.ui @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -153,7 +153,7 @@ <property name="name"> <cstring>schedulerDate</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> diff --git a/kplato/kptrelationdialog.cc b/kplato/kptrelationdialog.cc index c79adb6f..f10a5022 100644 --- a/kplato/kptrelationdialog.cc +++ b/kplato/kptrelationdialog.cc @@ -25,7 +25,7 @@ #include "kptdurationwidget.h" #include "relationpanel.h" -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqlabel.h> #include <tqbuttongroup.h> diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc index 655d1907..a79f34e9 100644 --- a/kplato/kptreportview.cc +++ b/kplato/kptreportview.cc @@ -45,7 +45,7 @@ #include <tqfileinfo.h> #include <tqheader.h> #include <tqpopupmenu.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdom.h> #include <tqstringlist.h> @@ -83,7 +83,7 @@ public: if (!tag.contains('.')) { // global tags if (tag == "currentdate") { - return l->formatDate(TQDate::tqcurrentDate(), true); + return l->formatDate(TQDate::currentDate(), true); } return TQString(); } @@ -127,7 +127,7 @@ public: if (tag.section(".", 1, 1) == "availableuntil") return (m_resource ? l->formatDate(m_resource->availableUntil().date(), true) : TQString()); if (tag.section(".", 1, 1) == "units") - return (m_resource ? TQString("%1%").tqarg(m_resource->units()) : TQString()); + return (m_resource ? TQString("%1%").arg(m_resource->units()) : TQString()); if (tag.section(".", 1, 1) == "normalrate") return (m_resource ? l->formatMoney(m_resource->normalRate()) : TQString()); if (tag.section(".", 1, 1) == "overtimerate") @@ -494,11 +494,11 @@ void ReportView::loadTemplate(TQDomDocument &doc) { m_reportTags->m_project = &(mainView()->getPart()->getProject()); // Get all the child report elements - TQDomNodeList tqchildren = tpl.childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = tpl.childNodes(); + int childCount = children.length(); for(int j = 0; j < childCount; j++){ - child = tqchildren.item(j); + child = children.item(j); if(child.nodeType() == TQDomNode::ElementNode) { TQDomElement e = child.toElement(); //kdDebug()<<child.nodeName()<<endl; @@ -526,10 +526,10 @@ void ReportView::loadTemplate(TQDomDocument &doc) { void ReportView::handleHeader(TQDomNode &node) { TQDomNode child; - TQDomNodeList tqchildren = node.childNodes(); - int childCount = tqchildren.length(); + TQDomNodeList children = node.childNodes(); + int childCount = children.length(); for (int j = 0; j < childCount; j++) { - child = tqchildren.item(j); + child = children.item(j); if (child.nodeName() == "Label") { TQDomNode n = child.attributes().namedItem("Text"); TQString s = n.nodeValue(); @@ -658,14 +658,14 @@ void ReportView::getTemplateFile(const TQString &tpl) { if (!url.isValid()) { - KMessageBox::sorry(this,i18n("Malformed template filename: %1").tqarg(url.prettyURL())); + KMessageBox::sorry(this,i18n("Malformed template filename: %1").arg(url.prettyURL())); } else { if (KIO::NetAccess::download(url,localtpl,this)) isTemp = true; else - KMessageBox::sorry(this,i18n("Unable to download template file: %1").tqarg(url.prettyURL())); + KMessageBox::sorry(this,i18n("Unable to download template file: %1").arg(url.prettyURL())); } if (!localtpl.isNull()) diff --git a/kplato/kptrequestresourcespanel.cc b/kplato/kptrequestresourcespanel.cc index d65f86e7..bca9a208 100644 --- a/kplato/kptrequestresourcespanel.cc +++ b/kplato/kptrequestresourcespanel.cc @@ -72,7 +72,7 @@ void ResourceTableItem::insert(TQTable *table, int row) { } GroupLVItem::GroupLVItem(TQListView *parent, ResourceGroup *group, Task &task) - : TQListViewItem(parent, group->name(), TQString("%1").tqarg(group->units())), + : TQListViewItem(parent, group->name(), TQString("%1").arg(group->units())), m_group(group), m_units(0) { diff --git a/kplato/kptresource.cc b/kplato/kptresource.cc index 448074ae..2c218fe9 100644 --- a/kplato/kptresource.cc +++ b/kplato/kptresource.cc @@ -203,7 +203,7 @@ Resource::Resource(Project *project) : m_project(project), m_schedules(), m_work m_type = Type_Work; m_units = 100; // % - m_availableFrom = DateTime(TQDate::tqcurrentDate()); + m_availableFrom = DateTime(TQDate::currentDate()); m_availableUntil = TQDateTime(m_availableFrom.addYears(2)); cost.normalRate = 100; diff --git a/kplato/kptresourceappointmentsview.cc b/kplato/kptresourceappointmentsview.cc index 4b6d7a44..5531156f 100644 --- a/kplato/kptresourceappointmentsview.cc +++ b/kplato/kptresourceappointmentsview.cc @@ -200,7 +200,7 @@ void ResourceAppointmentsView::print(KPrinter &/*printer*/) { // m_dlv->setSizes(list); // m_date = context.date; // if (!m_date.isValid()) -// m_date = TQDate::tqcurrentDate(); +// m_date = TQDate::currentDate(); // m_period = context.period; // m_cumulative = context.cumulative; // diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc index d596ff44..58ea413e 100644 --- a/kplato/kptresourceview.cc +++ b/kplato/kptresourceview.cc @@ -203,7 +203,7 @@ protected: c = fc; // draw to last interesting column - const TQColorGroup &cg = ( tqpalette().inactive() ); + const TQColorGroup &cg = ( palette().inactive() ); while ( c < lc && !drawables.isEmpty() ) { int i = header()->mapToLogical( c ); @@ -240,7 +240,7 @@ protected: if ( tx < 0 ) tx = header()->cellPos( cell ); - // do any tqchildren of current need to be painted? + // do any children of current need to be painted? /* FIXME: painting branches doesn't work for some reason... if ( ih != ith && rootIsDecorated() && @@ -268,7 +268,7 @@ protected: p->translate( rleft, crtop ); //kdDebug()<<k_funcinfo<<"paintBranches: "<<current->i->text(0)<<endl; - current->i->paintBranches( p, tqcolorGroup(), treeStepSize(), + current->i->paintBranches( p, colorGroup(), treeStepSize(), rtop - crtop, r.height() ); p->restore(); } @@ -362,8 +362,8 @@ public: TQDate date; }; -TQSize ResourceView::tqsizeHint() const { - return tqminimumSizeHint(); // HACK: koshell splitter tqminimumSize problem +TQSize ResourceView::sizeHint() const { + return minimumSizeHint(); // HACK: koshell splitter minimumSize problem } ResourceView::ResourceView(View *view, TQWidget *parent) diff --git a/kplato/kptresourceview.h b/kplato/kptresourceview.h index b3049ed3..7154af8f 100644 --- a/kplato/kptresourceview.h +++ b/kplato/kptresourceview.h @@ -71,7 +71,7 @@ class ResourceItemPrivate; virtual bool setContext(Context::Resourceview &context); virtual void getContext(Context::Resourceview &context) const; - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void setShowAppointments(bool on) { m_showAppointments = on; } diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cc index fb5a9c0e..c244a57e 100644 --- a/kplato/kptstandardworktimedialog.cc +++ b/kplato/kptstandardworktimedialog.cc @@ -31,7 +31,7 @@ #include <tqspinbox.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqdatetimeedit.h> #include <tqdatetime.h> diff --git a/kplato/kptsummarytaskgeneralpanel.cc b/kplato/kptsummarytaskgeneralpanel.cc index 73ba4f95..97cc47e0 100644 --- a/kplato/kptsummarytaskgeneralpanel.cc +++ b/kplato/kptsummarytaskgeneralpanel.cc @@ -35,7 +35,7 @@ #include <kabc/addresseedialog.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqdatetime.h> #include <tqdatetimeedit.h> diff --git a/kplato/kptsummarytaskgeneralpanelbase.ui b/kplato/kptsummarytaskgeneralpanelbase.ui index 57dd2654..afef245e 100644 --- a/kplato/kptsummarytaskgeneralpanelbase.ui +++ b/kplato/kptsummarytaskgeneralpanelbase.ui @@ -13,7 +13,7 @@ <height>250</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>0</height> @@ -31,7 +31,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -95,7 +95,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -103,7 +103,7 @@ This is not limited to persons available in a resource group but can be anyone. </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -127,7 +127,7 @@ This is not limited to persons available in a resource group but can be anyone. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -171,7 +171,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kpttask.cc b/kplato/kpttask.cc index 964b8e4e..43ccb1bb 100644 --- a/kplato/kpttask.cc +++ b/kplato/kpttask.cc @@ -29,7 +29,7 @@ #include "kptschedule.h" #include <tqdom.h> -#include <tqbrush.h> +#include <brush.h> #include <kdebug.h> namespace KPlato @@ -198,7 +198,7 @@ bool Task::load(TQDomElement &element, Project &project) { m_wbs = element.attribute("wbs", ""); - // Load the project tqchildren + // Load the project children TQDomNodeList list = element.childNodes(); for (unsigned int i=0; i<list.count(); ++i) { if (list.item(i).isElement()) { @@ -570,7 +570,7 @@ void Task::initiateCalculationLists(TQPtrList<Node> &startnodes, TQPtrList<Node> //kdDebug()<<k_funcinfo<<m_name<<endl; if (type() == Node::Type_Summarytask) { summarytasks.append(this); - // propagate my relations to my tqchildren and dependent nodes + // propagate my relations to my children and dependent nodes TQPtrListIterator<Node> nodes = m_nodes; for (; nodes.current(); ++nodes) { @@ -1293,7 +1293,7 @@ void Task::clearProxyRelations() { void Task::addParentProxyRelations(TQPtrList<Relation> &list) { //kdDebug()<<k_funcinfo<<m_name<<endl; if (type() == Type_Summarytask) { - // propagate to my tqchildren + // propagate to my children //kdDebug()<<k_funcinfo<<m_name<<" is summary task"<<endl; TQPtrListIterator<Node> nodes = m_nodes; for (; nodes.current(); ++nodes) { @@ -1315,7 +1315,7 @@ void Task::addParentProxyRelations(TQPtrList<Relation> &list) { void Task::addChildProxyRelations(TQPtrList<Relation> &list) { //kdDebug()<<k_funcinfo<<m_name<<endl; if (type() == Type_Summarytask) { - // propagate to my tqchildren + // propagate to my children //kdDebug()<<k_funcinfo<<m_name<<" is summary task"<<endl; TQPtrListIterator<Node> nodes = m_nodes; for (; nodes.current(); ++nodes) { @@ -1337,7 +1337,7 @@ 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 parent proxy from my tqchildren "<<m_name<<" to "<<node->name()<<endl; + //kdDebug()<<"Add parent proxy from my children "<<m_name<<" to "<<node->name()<<endl; TQPtrListIterator<Node> nodes = m_nodes; for (; nodes.current(); ++nodes) { nodes.current()->addParentProxyRelation(node, rel); @@ -1352,7 +1352,7 @@ void Task::addParentProxyRelation(Node *node, const Relation *rel) { void Task::addChildProxyRelation(Node *node, const Relation *rel) { if (node->type() != Type_Summarytask) { if (type() == Type_Summarytask) { - //kdDebug()<<"Add child proxy from my tqchildren "<<m_name<<" to "<<node->name()<<endl; + //kdDebug()<<"Add child proxy from my children "<<m_name<<" to "<<node->name()<<endl; TQPtrListIterator<Node> nodes = m_nodes; for (; nodes.current(); ++nodes) { nodes.current()->addChildProxyRelation(node, rel); @@ -1525,7 +1525,7 @@ bool Task::effortMetError() const { } #ifndef NDEBUG -void Task::printDebug(bool tqchildren, TQCString indent) { +void Task::printDebug(bool children, TQCString indent) { kdDebug()<<indent<<"+ Task node: "<<name()<<" type="<<type()<<endl; indent += "! "; kdDebug()<<indent<<"Requested resources (total): "<<units()<<"%"<<endl; @@ -1533,7 +1533,7 @@ void Task::printDebug(bool tqchildren, TQCString indent) { if (m_requests) m_requests->printDebug(indent); - Node::printDebug(tqchildren, indent); + Node::printDebug(children, indent); } diff --git a/kplato/kpttask.h b/kplato/kpttask.h index 2d3776db..55abd23f 100644 --- a/kplato/kpttask.h +++ b/kplato/kpttask.h @@ -244,7 +244,7 @@ public: /// Calculate critical path virtual bool calcCriticalPath(bool fromEnd); - /// Set current schedule to schedule with identity id, for me nd my tqchildren + /// Set current schedule to schedule with identity id, for me nd my children virtual void setCurrentSchedule(long id); virtual bool effortMetError() const; @@ -296,7 +296,7 @@ private: #ifndef NDEBUG public: - void printDebug(bool tqchildren, TQCString indent); + void printDebug(bool children, TQCString indent); #endif }; diff --git a/kplato/kpttaskappointmentsview.cc b/kplato/kpttaskappointmentsview.cc index 5e96030e..387e75e5 100644 --- a/kplato/kpttaskappointmentsview.cc +++ b/kplato/kpttaskappointmentsview.cc @@ -151,7 +151,7 @@ void TaskAppointmentsView::print(KPrinter &/*printer*/) { // m_dlv->setSizes(list); // m_date = context.date; // if (!m_date.isValid()) -// m_date = TQDate::tqcurrentDate(); +// m_date = TQDate::currentDate(); // m_period = context.period; // m_cumulative = context.cumulative; // diff --git a/kplato/kpttaskappointmentsview.ui.h b/kplato/kpttaskappointmentsview.ui.h index 7e090fb7..b06fb4be 100644 --- a/kplato/kpttaskappointmentsview.ui.h +++ b/kplato/kpttaskappointmentsview.ui.h @@ -90,7 +90,7 @@ void TaskAppointmentsView::init() m_appList->setColumnAlignment(6, AlignRight); m_task = 0; - m_date->setDate(TQDate::tqcurrentDate()); + m_date->setDate(TQDate::currentDate()); } @@ -106,8 +106,8 @@ void TaskAppointmentsView::drawCostEffort() m_plannedEffort->setText(m_task->plannedEffortTo(m_date->date()).toString(Duration::Format_HourFraction)); m_plannedEffortTotal->setText(m_task->plannedEffort().toString(Duration::Format_HourFraction)); - m_epi->setText(TQString("%1").tqarg(m_task->effortPerformanceIndex(m_date->date()),3,'f',2)); - m_cpi->setText(TQString("%1").tqarg(m_task->costPerformanceIndex(m_date->date()),3,'f',2)); + m_epi->setText(TQString("%1").arg(m_task->effortPerformanceIndex(m_date->date()),3,'f',2)); + m_cpi->setText(TQString("%1").arg(m_task->costPerformanceIndex(m_date->date()),3,'f',2)); } diff --git a/kplato/kpttaskcostpanelbase.ui b/kplato/kpttaskcostpanelbase.ui index 38250f2b..9907a26a 100644 --- a/kplato/kpttaskcostpanelbase.ui +++ b/kplato/kpttaskcostpanelbase.ui @@ -65,7 +65,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kplato/kpttaskdefaultpanel.cc b/kplato/kpttaskdefaultpanel.cc index 3fd5472b..5d5c779a 100644 --- a/kplato/kpttaskdefaultpanel.cc +++ b/kplato/kpttaskdefaultpanel.cc @@ -38,7 +38,7 @@ #include <kabc/addresseedialog.h> #include <kdatewidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqdatetime.h> #include <tqdatetimeedit.h> @@ -81,7 +81,7 @@ void TaskDefaultPanel::setStartValues(Task &task, StandardWorktime *workTime) { if (task.constraintStartTime().isValid()) { setStartDateTime(task.constraintStartTime()); } else { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); setStartDateTime(TQDateTime(date, TQTime())); } if (task.constraintEndTime().isValid()) { diff --git a/kplato/kpttaskgeneralpanel.cc b/kplato/kpttaskgeneralpanel.cc index 6dd1dad2..c40554de 100644 --- a/kplato/kpttaskgeneralpanel.cc +++ b/kplato/kpttaskgeneralpanel.cc @@ -39,7 +39,7 @@ #include <kabc/addresseedialog.h> #include <kdatewidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqdatetime.h> #include <tqdatetimeedit.h> @@ -93,7 +93,7 @@ void TaskGeneralPanel::setStartValues(Task &task, StandardWorktime *workTime) { if (task.constraintStartTime().isValid()) { setStartDateTime(task.constraintStartTime()); } else { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); setStartDateTime(TQDateTime(date, TQTime())); } if (task.constraintEndTime().isValid()) { diff --git a/kplato/kpttaskgeneralpanelbase.ui b/kplato/kpttaskgeneralpanelbase.ui index 1d153a02..5d950f6b 100644 --- a/kplato/kpttaskgeneralpanelbase.ui +++ b/kplato/kpttaskgeneralpanelbase.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -89,7 +89,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -97,7 +97,7 @@ This is not limited to persons available in a resource group but can be anyone. </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -121,7 +121,7 @@ This is not limited to persons available in a resource group but can be anyone. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -159,7 +159,7 @@ This is not limited to persons available in a resource group but can be anyone. </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -316,7 +316,7 @@ The estimation can be either effort based or duration based. If it is effort bas </widget> <widget class="TQLayoutWidget" row="3" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kpttasknotespanelbase.ui b/kplato/kpttasknotespanelbase.ui index 90f413ff..f3f52ab9 100644 --- a/kplato/kpttasknotespanelbase.ui +++ b/kplato/kpttasknotespanelbase.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> diff --git a/kplato/kpttaskprogresspanel.cc b/kplato/kpttaskprogresspanel.cc index e8cfb570..bed7a3c2 100644 --- a/kplato/kpttaskprogresspanel.cc +++ b/kplato/kpttaskprogresspanel.cc @@ -147,7 +147,7 @@ void TaskProgressPanelImpl::slotChanged() { void TaskProgressPanelImpl::slotStartedChanged(bool state) { if (state) { - startTime->setDateTime(TQDateTime::tqcurrentDateTime()); + startTime->setDateTime(TQDateTime::currentDateTime()); percentFinished->setValue(0); } enableWidgets(); @@ -158,7 +158,7 @@ void TaskProgressPanelImpl::slotFinishedChanged(bool state) { if (state) { percentFinished->setValue(100); if (!finishTime->dateTime().isValid()) { - finishTime->setDateTime(TQDateTime::tqcurrentDateTime()); + finishTime->setDateTime(TQDateTime::currentDateTime()); } } enableWidgets(); diff --git a/kplato/kpttaskprogresspanelbase.ui b/kplato/kpttaskprogresspanelbase.ui index 00d23dda..b4c5b24f 100644 --- a/kplato/kpttaskprogresspanelbase.ui +++ b/kplato/kpttaskprogresspanelbase.ui @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>41</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>70</height> @@ -226,7 +226,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -247,7 +247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -258,7 +258,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -290,7 +290,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -303,7 +303,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>320</width> <height>0</height> @@ -320,7 +320,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>59</width> <height>20</height> @@ -365,7 +365,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kplato/kpttaskresourcespanelbase.ui b/kplato/kpttaskresourcespanelbase.ui index dfa3b818..93444894 100644 --- a/kplato/kpttaskresourcespanelbase.ui +++ b/kplato/kpttaskresourcespanelbase.ui @@ -49,7 +49,7 @@ <property name="name"> <cstring>groupList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -58,7 +58,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> diff --git a/kplato/kptview.cc b/kplato/kptview.cc index e986ea99..5e99a9da 100644 --- a/kplato/kptview.cc +++ b/kplato/kptview.cc @@ -26,7 +26,7 @@ #include <tqapplication.h> #include <tqpainter.h> #include <tqiconset.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsplitter.h> #include <tqcanvas.h> #include <tqscrollview.h> @@ -102,9 +102,9 @@ namespace KPlato View::View(Part* part, TQWidget* parent, const char* /*name*/) : KoView(part, parent, "Main View"), m_ganttview(0), - m_gantttqlayout(0), + m_ganttlayout(0), m_pertview(0), - m_perttqlayout(0), + m_pertlayout(0), // m_reportview(0), m_baselineMode(false), m_currentEstimateType(Effort::Use_Expected) @@ -122,15 +122,15 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/) dcopObject(); m_tab = new TQWidgetStack(this); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); - tqlayout->add(m_tab); + TQVBoxLayout *layout = new TQVBoxLayout(this); + layout->add(m_tab); m_ganttview = new GanttView(m_tab, part->isReadWrite()); m_tab->addWidget(m_ganttview); m_updateGanttview = false; m_ganttview->draw(getPart()->getProject()); - m_pertview = new PertView( this, m_tab, tqlayout ); + m_pertview = new PertView( this, m_tab, layout ); m_tab->addWidget(m_pertview); m_resourceview = new ResourceView( this, m_tab ); diff --git a/kplato/kptview.h b/kplato/kptview.h index 38d93501..b2c85346 100644 --- a/kplato/kptview.h +++ b/kplato/kptview.h @@ -176,9 +176,9 @@ protected: private: GanttView *m_ganttview; - TQHBoxLayout *m_gantttqlayout; + TQHBoxLayout *m_ganttlayout; PertView *m_pertview; - TQHBoxLayout *m_perttqlayout; + TQHBoxLayout *m_pertlayout; TQWidgetStack *m_tab; ResourceView *m_resourceview; AccountsView *m_accountsview; diff --git a/kplato/kptwbsdefinition.cc b/kplato/kptwbsdefinition.cc index fd6b48aa..e25f9fe6 100644 --- a/kplato/kptwbsdefinition.cc +++ b/kplato/kptwbsdefinition.cc @@ -108,25 +108,25 @@ const TQChar Letters[] = { '?','a','b','c','d','e','f','g','h','i','j','k','l',' TQString WBSDefinition::code(CodeDef &def, uint index) { if (def.code == "Number") { - return TQString("%1").tqarg(index); + return TQString("%1").arg(index); } if (def.code == "Roman, lower case") { - return TQString("%1").tqarg(toRoman(index)); + return TQString("%1").arg(toRoman(index)); } if (def.code == "Roman, upper case") { - return TQString("%1").tqarg(toRoman(index, true)); + return TQString("%1").arg(toRoman(index, true)); } if (def.code == "Letter, lower case") { if (index > 26) { index = 0; } - return TQString("%1").tqarg(Letters[index]); + return TQString("%1").arg(Letters[index]); } if (def.code == "Letter, upper case") { if (index > 26) { index = 0; } - return TQString("%1").tqarg(Letters[index].upper()); + return TQString("%1").arg(Letters[index].upper()); } return TQString(); } @@ -140,7 +140,7 @@ const TQCString RNThousands[] = {"", "m", "mm", "mmm"}; TQString WBSDefinition::toRoman( int n, bool upper ) { if ( n >= 0 ) { - TQString s = TQString::tqfromLatin1( RNThousands[ ( n / 1000 ) ] + + TQString s = TQString::fromLatin1( RNThousands[ ( n / 1000 ) ] + RNHundreds[ ( n / 100 ) % 10 ] + RNTens[ ( n / 10 ) % 10 ] + RNUnits[ ( n ) % 10 ] ); diff --git a/kplato/kptwbsdefinitionpanel.cc b/kplato/kptwbsdefinitionpanel.cc index 8dcfe891..083c9216 100644 --- a/kplato/kptwbsdefinitionpanel.cc +++ b/kplato/kptwbsdefinitionpanel.cc @@ -57,7 +57,7 @@ WBSDefinitionPanel::WBSDefinitionPanel(WBSDefinition &def, TQWidget *p, const ch kdDebug()<<"Map size="<<lev.count()<<endl; TQMap<int, WBSDefinition::CodeDef>::const_iterator it; for (it = lev.begin(); it != lev.end(); ++it) { - levelsTable->verticalHeader()->setLabel(i, TQString("%1").tqarg(it.key())); + levelsTable->verticalHeader()->setLabel(i, TQString("%1").arg(it.key())); TQComboTableItem *item = new TQComboTableItem(levelsTable, codeList, true); item->setCurrentItem(it.data().code); levelsTable->setItem(i, 0, item); @@ -108,7 +108,7 @@ void WBSDefinitionPanel::slotSelectionChanged() { bool rowSelected = false; for (int i=0; i < levelsTable->numRows(); ++i) { if (levelsTable->isRowSelected(i, true)) { - s += TQString("Row[%1]=selected ").tqarg(i); + s += TQString("Row[%1]=selected ").arg(i); rowSelected = true; } } @@ -141,7 +141,7 @@ void WBSDefinitionPanel::slotAddBtnClicked() { } i++; levelsTable->insertRows(i); - levelsTable->verticalHeader()->setLabel(i, TQString("%1").tqarg(level->value())); + levelsTable->verticalHeader()->setLabel(i, TQString("%1").arg(level->value())); TQComboTableItem *item = new TQComboTableItem(levelsTable, m_def.codeList(), true); levelsTable->setItem(i, 0, item); levelsTable->clearSelection(); diff --git a/kplato/kptwbsdefinitionpanelbase.ui b/kplato/kptwbsdefinitionpanelbase.ui index 4656ce4e..5f76c4f4 100644 --- a/kplato/kptwbsdefinitionpanelbase.ui +++ b/kplato/kptwbsdefinitionpanelbase.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -121,7 +121,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -154,7 +154,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> diff --git a/kplato/kptxmlloaderobject.h b/kplato/kptxmlloaderobject.h index 814af40b..272c3599 100644 --- a/kplato/kptxmlloaderobject.h +++ b/kplato/kptxmlloaderobject.h @@ -46,18 +46,18 @@ public: void startLoad() { m_timer.start(); - m_starttime = TQDateTime::tqcurrentDateTime(); + m_starttime = TQDateTime::currentDateTime(); m_errors = m_warnings = 0; m_log.clear(); - addMsg(TQString("Loading started at %1").tqarg(m_starttime.toString())); + addMsg(TQString("Loading started at %1").arg(m_starttime.toString())); } void stopLoad() { m_elapsed = m_timer.elapsed(); - addMsg(TQString("Loading finished at %1, took %2").tqarg(TQDateTime::tqcurrentDateTime().toString()).tqarg(formatElapsed())); + addMsg(TQString("Loading finished at %1, took %2").arg(TQDateTime::currentDateTime().toString()).arg(formatElapsed())); } TQDateTime lastLoaded() const { return m_starttime; } int elapsed() const { return m_elapsed; } - TQString formatElapsed() { return TQString("%1 seconds").tqarg((double)m_elapsed/1000); } + TQString formatElapsed() { return TQString("%1 seconds").arg((double)m_elapsed/1000); } void setLogLevel(Severity sev) { m_logLevel = sev; } const TQStringList &log() const { return m_log; } @@ -70,7 +70,7 @@ public: else if (sev == Diagnostics) s = "Diagnostic"; else if (sev == Debug) s = "Debug"; else s = "Message"; - m_log<<TQString("%1: %2").tqarg(s, 13).tqarg(msg); + m_log<<TQString("%1: %2").arg(s, 13).arg(msg); } void addMsg(TQString msg) { m_log<<msg; } void increment(int sev) { diff --git a/kplato/relationpanel.ui b/kplato/relationpanel.ui index 409a52f9..2f7b904e 100644 --- a/kplato/relationpanel.ui +++ b/kplato/relationpanel.ui @@ -24,7 +24,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -47,7 +47,7 @@ <property name="name"> <cstring>groupBox1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -121,7 +121,7 @@ <property name="text"> <string>From:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -140,7 +140,7 @@ <property name="text"> <string>To:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -151,7 +151,7 @@ <property name="text"> <string>Task 1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -162,7 +162,7 @@ <property name="text"> <string>Task 2</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -207,7 +207,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -220,7 +220,7 @@ <property name="text"> <string>Lag:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom</set> </property> </widget> @@ -236,7 +236,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/kplato/resourcedialogbase.ui b/kplato/resourcedialogbase.ui index 8107e9ac..f7b75137 100644 --- a/kplato/resourcedialogbase.ui +++ b/kplato/resourcedialogbase.ui @@ -61,7 +61,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -79,7 +79,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>32767</height> @@ -112,7 +112,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -146,7 +146,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -198,7 +198,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kplato/resourcespanelbase.ui b/kplato/resourcespanelbase.ui index 8428e29c..cc47ad3f 100644 --- a/kplato/resourcespanelbase.ui +++ b/kplato/resourcespanelbase.ui @@ -13,7 +13,7 @@ <height>227</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>200</height> @@ -28,7 +28,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -99,7 +99,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout51</cstring> + <cstring>layout51</cstring> </property> <vbox> <property name="name"> @@ -127,7 +127,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>220</height> diff --git a/kplato/standardworktimedialogbase.ui b/kplato/standardworktimedialogbase.ui index 61f4fddb..eafdca61 100644 --- a/kplato/standardworktimedialogbase.ui +++ b/kplato/standardworktimedialogbase.ui @@ -28,7 +28,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -200,7 +200,7 @@ when there is no calendar defined for a resource.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>210</height> |