From dfb7562b7e607f0ae077a6a436966203029df56d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korganizer/calendarview.cpp | 4 +-- korganizer/filteredit_base.ui | 2 +- korganizer/ical2vcal.in | 2 +- korganizer/koagenda.cpp | 4 +-- korganizer/koagendaview.h | 2 +- korganizer/kodialogmanager.cpp | 2 +- korganizer/koeditoralarms_base.ui | 2 +- korganizer/koeditorgeneralevent.cpp | 34 +++++++++++----------- korganizer/koeditorgeneraltodo.cpp | 32 ++++++++++---------- korganizer/koeditorrecurrence.cpp | 6 ++-- korganizer/koeventviewer.cpp | 6 ++-- korganizer/kogroupwareprefspage.ui | 2 +- korganizer/koincidencetooltip.cpp | 2 +- korganizer/kolistview.cpp | 4 +-- korganizer/korganizer_part.cpp | 6 ++-- korganizer/korganizer_part.h | 2 +- korganizer/kotodoview.cpp | 10 +++---- .../printing/journal/calprintjournalconfig_base.ui | 2 +- .../printing/list/calprintlistconfig_base.ui | 2 +- .../whatsnext/calprintwhatsnextconfig_base.ui | 2 +- .../printing/year/calprintyearconfig_base.ui | 2 +- korganizer/plugins/projectview/koprojectview.cpp | 4 +-- korganizer/plugins/projectview/koprojectview.h | 2 +- korganizer/printing/calprintdayconfig_base.ui | 2 +- .../printing/calprintincidenceconfig_base.ui | 2 +- korganizer/printing/calprintmonthconfig_base.ui | 2 +- korganizer/printing/calprinttodoconfig_base.ui | 2 +- korganizer/printing/calprintweekconfig_base.ui | 2 +- korganizer/publishdialog_base.ui | 2 +- korganizer/resourceview.cpp | 4 +-- korganizer/template_management_dialog_base.ui | 2 +- 31 files changed, 77 insertions(+), 77 deletions(-) (limited to 'korganizer') diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index bdf334014..115be5ffc 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1314,12 +1314,12 @@ void CalendarView::newSubTodo() if ( todo ) newSubTodo( todo ); } -void CalendarView::newSubTodo(Todo *tqparentEvent) +void CalendarView::newSubTodo(Todo *parentEvent) { KOTodoEditor *todoEditor = mDialogManager->getTodoEditor(); connectIncidenceEditor( todoEditor ); todoEditor->newTodo(); - todoEditor->setDates( TQDateTime(), false, tqparentEvent ); + todoEditor->setDates( TQDateTime(), false, parentEvent ); todoEditor->show(); } diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index 27a9d9c4d..f1bdc7902 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -312,7 +312,7 @@ Only to-dos which have least one attendee will be checked. If you are not in th updateFilter() - + knuminput.h knuminput.h diff --git a/korganizer/ical2vcal.in b/korganizer/ical2vcal.in index 3bdbdb722..c83f60104 100755 --- a/korganizer/ical2vcal.in +++ b/korganizer/ical2vcal.in @@ -75,7 +75,7 @@ sub process_appointment { undef(%curappt); - # this is a count of the total # of tqparentheses. + # this is a count of the total # of parentheses. while ($pcount) { $line = &getLine; diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index f2ac4ac7a..8a49360f3 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -1276,7 +1276,7 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth ) // kdDebug(5850) << "KOAgenda::placeAgendaItem(): " << item->incidence()->summary() // << " subCellWidth: " << subCellWidth << endl; - // "left" upper corner, no subcells yet, RTL tqlayouts have right/left switched, widths are negative then + // "left" upper corner, no subcells yet, RTL layouts have right/left switched, widths are negative then TQPoint pt = gridToContents( TQPoint( item->cellXLeft(), item->cellYTop() ) ); // right lower corner TQPoint pt1 = gridToContents( TQPoint( item->cellXLeft() + item->cellWidth(), @@ -1393,7 +1393,7 @@ void KOAgenda::drawContents(TQPainter* p, int cx, int cy, int cw, int ch) if ( pt2.x() >= pt1.x() /*&& pt2.y() >= pt1.y()*/) { int gxStart = contentsToGrid( pt1 ).x(); int gxEnd = contentsToGrid( pt2 ).x(); - // correct start/end for rtl tqlayouts + // correct start/end for rtl layouts if ( gxStart > gxEnd ) { int tmp = gxStart; gxStart = gxEnd; diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index b55e92b9c..3b0e51b56 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h @@ -222,7 +222,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer void createDayLabels( bool force ); /** - Set the tqmasks on the agenda widgets indicating, which days are holidays. + Set the masks on the agenda widgets indicating, which days are holidays. */ void setHolidayMasks(); diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index cae637613..296bde57f 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -91,7 +91,7 @@ KODialogManager::KODialogManager( CalendarView *mainView ) : mCategoryEditDialog = new KPIM::CategoryEditDialog( KOPrefs::instance(), mMainView ); // don't set any specific tqparent for the dialog, as its kept around and reused - // in different cases where it should have different tqparents + // in different cases where it should have different parents KWin::setMainWindow( mCategoryEditDialog, 0 ); connect( mainView, TQT_SIGNAL( categoriesChanged() ), mCategoryEditDialog, TQT_SLOT( reload() ) ); diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui index 64f10a317..980a93ace 100644 --- a/korganizer/koeditoralarms_base.ui +++ b/korganizer/koeditoralarms_base.ui @@ -662,7 +662,7 @@ addresseelineedit.h - + kurlrequester.h klineedit.h diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index e09007508..0849682ec 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -104,36 +104,36 @@ void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) TQFrame *timeBoxFrame = new TQFrame(timeGroupBox); - TQGridLayout *tqlayoutTimeBox = new TQGridLayout( timeBoxFrame ); - tqlayoutTimeBox->setSpacing(topLayout->spacing()); - tqlayoutTimeBox->setColStretch( 3, 1 ); + TQGridLayout *layoutTimeBox = new TQGridLayout( timeBoxFrame ); + layoutTimeBox->setSpacing(topLayout->spacing()); + layoutTimeBox->setColStretch( 3, 1 ); mStartDateLabel = new TQLabel(i18n("&Start:"),timeBoxFrame); - tqlayoutTimeBox->addWidget(mStartDateLabel,0,0); + layoutTimeBox->addWidget(mStartDateLabel,0,0); mStartDateEdit = new KDateEdit(timeBoxFrame); - tqlayoutTimeBox->addWidget(mStartDateEdit,0,1); + layoutTimeBox->addWidget(mStartDateEdit,0,1); mStartDateLabel->setBuddy( mStartDateEdit ); mStartTimeEdit = new KTimeEdit(timeBoxFrame); - tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2); + layoutTimeBox->addWidget(mStartTimeEdit,0,2); mEndDateLabel = new TQLabel(i18n("&End:"),timeBoxFrame); - tqlayoutTimeBox->addWidget(mEndDateLabel,1,0); + layoutTimeBox->addWidget(mEndDateLabel,1,0); mEndDateEdit = new KDateEdit(timeBoxFrame); - tqlayoutTimeBox->addWidget(mEndDateEdit,1,1); + layoutTimeBox->addWidget(mEndDateEdit,1,1); mEndDateLabel->setBuddy( mEndDateEdit ); mEndTimeEdit = new KTimeEdit(timeBoxFrame); - tqlayoutTimeBox->addWidget(mEndTimeEdit,1,2); + layoutTimeBox->addWidget(mEndTimeEdit,1,2); mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame); - tqlayoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 ); + layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 ); connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool))); mDurationLabel = new TQLabel( timeBoxFrame ); - tqlayoutTimeBox->addWidget( mDurationLabel, 1, 3 ); + layoutTimeBox->addWidget( mDurationLabel, 1, 3 ); // time widgets are checked if they contain a valid time connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), @@ -148,9 +148,9 @@ void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) this, TQT_SLOT(endDateChanged(const TQDate&))); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); - tqlayoutTimeBox->addWidget( label, 2, 0 ); + layoutTimeBox->addWidget( label, 2, 0 ); TQBoxLayout *recLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 ); + layoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 ); mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); @@ -160,18 +160,18 @@ void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) recLayout->addStretch( 1 ); label = new TQLabel( i18n("Reminder:"), timeBoxFrame ); - tqlayoutTimeBox->addWidget( label, 3, 0 ); + layoutTimeBox->addWidget( label, 3, 0 ); TQBoxLayout *alarmLineLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 ); + layoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 ); initAlarm( timeBoxFrame, alarmLineLayout ); alarmLineLayout->addStretch( 1 ); TQBoxLayout *secLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addLayout( secLayout, 0, 4 ); + layoutTimeBox->addLayout( secLayout, 0, 4 ); initSecrecy( timeBoxFrame, secLayout ); TQBoxLayout *classLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addLayout( classLayout, 1, 4 ); + layoutTimeBox->addLayout( classLayout, 1, 4 ); initClass( timeBoxFrame, classLayout ); } diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index d5856dd63..af001503f 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -105,59 +105,59 @@ void KOEditorGeneralTodo::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) i18n("Sets options for due and start dates and times " "for this to-do.") ); - TQGridLayout *tqlayoutTimeBox = new TQGridLayout(timeBoxFrame,1,1); - tqlayoutTimeBox->setSpacing(topLayout->spacing()); + TQGridLayout *layoutTimeBox = new TQGridLayout(timeBoxFrame,1,1); + layoutTimeBox->setSpacing(topLayout->spacing()); TQString whatsThis = i18n("Sets the start date for this to-do"); mStartCheck = new TQCheckBox(i18n("Sta&rt:"),timeBoxFrame); TQWhatsThis::add( mStartCheck, whatsThis ); - tqlayoutTimeBox->addWidget(mStartCheck,0,0); + layoutTimeBox->addWidget(mStartCheck,0,0); connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableStartEdit(bool))); connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(startDateModified())); mStartDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mStartDateEdit, whatsThis ); - tqlayoutTimeBox->addWidget(mStartDateEdit,0,1); + layoutTimeBox->addWidget(mStartDateEdit,0,1); connect(mStartDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(startDateModified())); mStartTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mStartTimeEdit, i18n("Sets the start time for this to-do.") ); - tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2); + layoutTimeBox->addWidget(mStartTimeEdit,0,2); connect(mStartTimeEdit,TQT_SIGNAL(timeChanged(TQTime)),TQT_SLOT(startDateModified())); whatsThis = i18n("Sets the due date for this to-do."); mDueCheck = new TQCheckBox(i18n("&Due:"),timeBoxFrame); TQWhatsThis::add( mDueCheck, whatsThis ); - tqlayoutTimeBox->addWidget(mDueCheck,1,0); + layoutTimeBox->addWidget(mDueCheck,1,0); connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableDueEdit(bool))); connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SIGNAL(dueDateEditToggle(bool))); connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); mDueDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mDueDateEdit, whatsThis ); - tqlayoutTimeBox->addWidget(mDueDateEdit,1,1); + layoutTimeBox->addWidget(mDueDateEdit,1,1); connect(mDueDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(dateChanged())); mDueTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mDueTimeEdit, i18n("Sets the due time for this to-do.") ); - tqlayoutTimeBox->addWidget(mDueTimeEdit,1,2); + layoutTimeBox->addWidget(mDueTimeEdit,1,2); connect(mDueTimeEdit,TQT_SIGNAL(timeChanged( TQTime )),TQT_SLOT(dateChanged())); mTimeButton = new TQCheckBox(i18n("Ti&me associated"),timeBoxFrame); TQWhatsThis::add( mTimeButton, i18n("Sets whether or not this to-do's start and due dates " "have times associated with them.") ); - tqlayoutTimeBox->addWidget( mTimeButton, 0, 3 ); + layoutTimeBox->addWidget( mTimeButton, 0, 3 ); connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableTimeEdits(bool))); connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); - tqlayoutTimeBox->addWidget( label, 3, 0 ); + layoutTimeBox->addWidget( label, 3, 0 ); TQBoxLayout *recLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addMultiCellLayout( recLayout, 3, 3, 1, 4 ); + layoutTimeBox->addMultiCellLayout( recLayout, 3, 3, 1, 4 ); mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); @@ -167,17 +167,17 @@ void KOEditorGeneralTodo::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) recLayout->addStretch( 1 ); label = new TQLabel( i18n("Reminder:"), timeBoxFrame ); - tqlayoutTimeBox->addWidget( label, 4, 0 ); + layoutTimeBox->addWidget( label, 4, 0 ); TQBoxLayout *alarmLineLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 4, 4, 1, 4 ); + layoutTimeBox->addMultiCellLayout( alarmLineLayout, 4, 4, 1, 4 ); initAlarm( timeBoxFrame, alarmLineLayout ); alarmLineLayout->addStretch( 1 ); - // some more tqlayouting - tqlayoutTimeBox->setColStretch( 3, 1 ); + // some more layouting + layoutTimeBox->setColStretch( 3, 1 ); TQBoxLayout *secLayout = new TQHBoxLayout(); - tqlayoutTimeBox->addLayout( secLayout, 0, 4 ); + layoutTimeBox->addLayout( secLayout, 0, 4 ); initSecrecy( timeBoxFrame, secLayout ); } diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 21deaeed6..67b2a9719 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -991,12 +991,12 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* tqparent, const char *name ) : } // TQFrame *timeFrame = new TQFrame( mTimeGroupBox ); -// TQBoxLayout *tqlayoutTimeFrame = new TQHBoxLayout( timeFrame ); -// tqlayoutTimeFrame->setSpacing( KDialog::spacingHint() ); +// TQBoxLayout *layoutTimeFrame = new TQHBoxLayout( timeFrame ); +// layoutTimeFrame->setSpacing( KDialog::spacingHint() ); mDateTimeLabel = new TQLabel( mTimeGroupBox ); // mDateTimeLabel = new TQLabel( timeFrame ); -// tqlayoutTimeFrame->addWidget( mDateTimeLabel ); +// layoutTimeFrame->addWidget( mDateTimeLabel ); Qt::Orientation orientation; if ( KOPrefs::instance()->mCompactDialogs ) orientation = Qt::Horizontal; diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 391ad42ac..2a49934a5 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -105,7 +105,7 @@ void KOEventViewer::writeSettings( KConfig * config ) void KOEventViewer::setSource( const TQString &n ) { - UriHandler::process( tqparentWidget(), n ); + UriHandler::process( parentWidget(), n ); } bool KOEventViewer::appendIncidence( Incidence *incidence, const TQDate &date ) @@ -177,10 +177,10 @@ void KOEventViewer::contentsContextMenuEvent( TQContextMenuEvent *e ) switch( menu->exec( TQCursor::pos(), 0 ) ) { case 0: // open - AttachmentHandler::view( tqparentWidget(), name, uid ); + AttachmentHandler::view( parentWidget(), name, uid ); break; case 1: // save as - AttachmentHandler::saveAs( tqparentWidget(), name, uid ); + AttachmentHandler::saveAs( parentWidget(), name, uid ); break; default: break; diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index 0e3da4bb5..c8bcfbcec 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -627,5 +627,5 @@ For security reasons, it is not recommended to store your password in the config slotChanged() KDE_EXPORT - + diff --git a/korganizer/koincidencetooltip.cpp b/korganizer/koincidencetooltip.cpp index ca1e76721..e3ff30f5c 100644 --- a/korganizer/koincidencetooltip.cpp +++ b/korganizer/koincidencetooltip.cpp @@ -56,7 +56,7 @@ void KOIncidenceToolTip::add( KOAgendaItem *item, Calendar *calendar, void KOIncidenceToolTip::maybeTip(const TQPoint & pos) { Q_UNUSED( pos ); - KOAgendaItem *item = dynamic_cast( tqparentWidget() ); + KOAgendaItem *item = dynamic_cast( parentWidget() ); if ( !item ) return; if ( !mText ) diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index ce75b6543..09dc07dab 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -220,8 +220,8 @@ KOListView::KOListView( Calendar *calendar, mListView->addColumn( i18n("Categories") ); - TQBoxLayout *tqlayoutTop = new TQVBoxLayout( this ); - tqlayoutTop->addWidget( mListView ); + TQBoxLayout *layoutTop = new TQVBoxLayout( this ); + layoutTop->addWidget( mListView ); mPopupMenu = eventPopup(); /* diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index 271eee12e..4d2382917 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -66,10 +66,10 @@ typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory; K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory ) -KOrganizerPart::KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName, +KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & ) : - KParts::ReadOnlyPart(tqparent, name), mTopLevelWidget( tqparentWidget->tqtopLevelWidget() ) + KParts::ReadOnlyPart(tqparent, name), mTopLevelWidget( parentWidget->tqtopLevelWidget() ) { KGlobal::locale()->insertCatalogue( "libkcal" ); KGlobal::locale()->insertCatalogue( "libkdepim" ); @@ -80,7 +80,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName TQString pname( name ); // create a canvas to insert our widget - TQWidget *canvas = new TQWidget( tqparentWidget, widgetName ); + TQWidget *canvas = new TQWidget( parentWidget, widgetName ); canvas->setFocusPolicy( TQ_ClickFocus ); setWidget( canvas ); mView = new CalendarView( canvas ); diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index fb6584e19..a20485f29 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -59,7 +59,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart, Q_OBJECT TQ_OBJECT public: - KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName, + KOrganizerPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & ); virtual ~KOrganizerPart(); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 6fe060427..6b511f790 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -704,14 +704,14 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action) } else { // correctly update changes in relations Todo*tqparent = dynamic_cast( todo->relatedTo() ); - KOTodoViewItem*tqparentItem = 0; + KOTodoViewItem*parentItem = 0; if ( tqparent && mTodoMap.tqcontains(tqparent) ) { - tqparentItem = mTodoMap[ tqparent ]; + parentItem = mTodoMap[ tqparent ]; } - if ( todoItem->tqparent() != tqparentItem ) { + if ( todoItem->tqparent() != parentItem ) { // The relations changed - if ( tqparentItem ) { - tqparentItem->insertItem( todoItem ); + if ( parentItem ) { + parentItem->insertItem( todoItem ); } else { mTodoListView->insertItem( todoItem ); } diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui index 0b0d0efb9..bf8bf7ad6 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -193,7 +193,7 @@ mFromDate mToDate - + kdateedit.h kdateedit.h diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui index 2628c7a79..b27389b6c 100644 --- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui +++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui @@ -182,5 +182,5 @@ mFromDate mToDate - + diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui index bd416a856..c920d0b22 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -168,7 +168,7 @@ mFromDate mToDate - + kdateedit.h kdateedit.h diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui index 294cd590c..e0f52d6cb 100644 --- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui +++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui @@ -196,5 +196,5 @@ - + diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index d0d2db381..c559a6960 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -45,11 +45,11 @@ using namespace KOrg; -KOProjectViewItem::KOProjectViewItem(Todo *event,KGanttItem* tqparentTask, +KOProjectViewItem::KOProjectViewItem(Todo *event,KGanttItem* parentTask, const TQString& text, const TQDateTime& start, const TQDateTime& end) : - KGanttItem(tqparentTask,text,start,end) + KGanttItem(parentTask,text,start,end) { mEvent = event; } diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h index b71afbd0a..21aa4b2b0 100644 --- a/korganizer/plugins/projectview/koprojectview.h +++ b/korganizer/plugins/projectview/koprojectview.h @@ -46,7 +46,7 @@ class TQListView; */ class KOProjectViewItem : public KGanttItem { public: - KOProjectViewItem(Todo *,KGanttItem* tqparentTask, const TQString& text, + KOProjectViewItem(Todo *,KGanttItem* parentTask, const TQString& text, const TQDateTime& start, const TQDateTime& end); ~KOProjectViewItem(); diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui index 6dad9c039..9073176b8 100644 --- a/korganizer/printing/calprintdayconfig_base.ui +++ b/korganizer/printing/calprintdayconfig_base.ui @@ -249,7 +249,7 @@ kdateedit.h - + libkdepim/kdateedit.h libkdepim/kdateedit.h diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui index a470859b7..68afdecb1 100644 --- a/korganizer/printing/calprintincidenceconfig_base.ui +++ b/korganizer/printing/calprintincidenceconfig_base.ui @@ -99,5 +99,5 @@ - + diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui index e09033c65..a6c5ba0e9 100644 --- a/korganizer/printing/calprintmonthconfig_base.ui +++ b/korganizer/printing/calprintmonthconfig_base.ui @@ -200,7 +200,7 @@ kdateedit.h - + kcombobox.h knuminput.h diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index d49860f18..63509d355 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -447,7 +447,7 @@ kdateedit.h - + libkdepim/kdateedit.h libkdepim/kdateedit.h diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui index 1998a801d..49608e5b1 100644 --- a/korganizer/printing/calprintweekconfig_base.ui +++ b/korganizer/printing/calprintweekconfig_base.ui @@ -292,7 +292,7 @@ kdateedit.h - + libkdepim/kdateedit.h libkdepim/kdateedit.h diff --git a/korganizer/publishdialog_base.ui b/korganizer/publishdialog_base.ui index ffefbbfc0..76efbe645 100644 --- a/korganizer/publishdialog_base.ui +++ b/korganizer/publishdialog_base.ui @@ -129,5 +129,5 @@ mRemove mSelectAddressee - + diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index cc6a8af9b..6c0bda0fd 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -372,8 +372,8 @@ void ResourceView::addResource() &ok, this ); if ( !ok ) return; - const TQString tqparentId = item->isSubresource() ? item->resourceIdentifier() : TQString:: null; - if ( !item->resource()->addSubresource( folderName, tqparentId ) ) { + const TQString parentId = item->isSubresource() ? item->resourceIdentifier() : TQString:: null; + if ( !item->resource()->addSubresource( folderName, parentId ) ) { KMessageBox::error( this, i18n( "Unable to create subresource %1." ).tqarg( folderName ) ); diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui index 60b8aa1b7..db3402424 100644 --- a/korganizer/template_management_dialog_base.ui +++ b/korganizer/template_management_dialog_base.ui @@ -86,7 +86,7 @@ - + klistbox.h -- cgit v1.2.1