diff options
Diffstat (limited to 'kontact')
-rw-r--r-- | kontact/plugins/kmail/kcmkmailsummary.cpp | 6 | ||||
-rw-r--r-- | kontact/plugins/knotes/knotes_part.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/knotes/knotes_part_p.h | 8 | ||||
-rw-r--r-- | kontact/plugins/knotes/knotetip.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/korganizer/kcmkorgsummary.cpp | 10 | ||||
-rw-r--r-- | kontact/plugins/newsticker/kcmkontactknt.cpp | 22 | ||||
-rw-r--r-- | kontact/plugins/newsticker/summarywidget.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/specialdates/kcmsdsummary.cpp | 12 | ||||
-rw-r--r-- | kontact/plugins/summary/kcmkontactsummary.cpp | 8 | ||||
-rw-r--r-- | kontact/plugins/summary/summaryview_part.cpp | 10 | ||||
-rw-r--r-- | kontact/plugins/weather/summarywidget.cpp | 10 | ||||
-rw-r--r-- | kontact/src/iconsidepane.cpp | 2 |
12 files changed, 48 insertions, 48 deletions
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 16146f2c7..7409fcd1b 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -75,7 +75,7 @@ void KCMKMailSummary::modified() void KCMKMailSummary::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mFolderView = new KListView( this ); mFolderView->setRootIsDecorated( true ); @@ -85,8 +85,8 @@ void KCMKMailSummary::initGUI() mFullPath = new TQCheckBox( i18n( "Show full path for folders" ), this ); - tqlayout->addWidget( mFolderView ); - tqlayout->addWidget( mFullPath ); + layout->addWidget( mFolderView ); + layout->addWidget( mFullPath ); } void KCMKMailSummary::initFolders() diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index db6e43b65..a66aa4c1b 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -201,7 +201,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text ) TQString KNotesPart::newNoteFromClipboard( const TQString& name ) { - const TQString& text = KApplication::tqclipboard()->text(); + const TQString& text = KApplication::clipboard()->text(); return newNote( name, text ); } diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 274d140e1..3794638ef 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -130,9 +130,9 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient actionCollection()->setWidget( this ); TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); + TQVBoxLayout *layout = new TQVBoxLayout( page ); - TQHBoxLayout *hbl = new TQHBoxLayout( tqlayout, marginHint() ); + TQHBoxLayout *hbl = new TQHBoxLayout( layout, marginHint() ); TQLabel *label = new TQLabel( page); label->setText( i18n( "Name:" ) ); hbl->addWidget( label,0 ); @@ -149,8 +149,8 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient mTool = static_cast<KToolBar *>(factory.container( "note_tool", this )); - tqlayout->addWidget( mTool ); - tqlayout->addWidget( mNoteEdit ); + layout->addWidget( mTool ); + layout->addWidget( mNoteEdit ); } TQString text() const diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index 79a45d21e..ec77cc509 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -52,8 +52,8 @@ KNoteTip::KNoteTip( KIconView *parent ) mPreview->setHScrollBarMode( TQScrollView::AlwaysOff ); mPreview->setVScrollBarMode( TQScrollView::AlwaysOff ); - TQBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( mPreview ); + TQBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( mPreview ); setPalette( TQToolTip::palette() ); setMargin( 1 ); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 4466c5c6d..170e3195e 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -90,10 +90,10 @@ void KCMKOrgSummary::customDaysChanged( int value ) void KCMKOrgSummary::initGUI() { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mCalendarGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Appointments" ), this ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->tqlayout(), + TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "How many days should the calendar show at once?" ), mCalendarGroup ); @@ -122,15 +122,15 @@ void KCMKOrgSummary::initGUI() hbox->addStretch( 1 ); - tqlayout->addWidget( mCalendarGroup ); + layout->addWidget( mCalendarGroup ); mTodoGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "To-dos" ), this ); new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup ); new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup ); - tqlayout->addWidget( mTodoGroup ); + layout->addWidget( mTodoGroup ); - tqlayout->addStretch(); + layout->addStretch(); } void KCMKOrgSummary::load() diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index fe2a20c63..50aa975fe 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -60,22 +60,22 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi Ok, parent, 0, true, true ) { TQWidget *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(), + TQGridLayout *layout = new TQGridLayout( page, 2, 3, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( i18n( "Name:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mTitle = new TQLineEdit( page ); label->setBuddy( mTitle ); - tqlayout->addMultiCellWidget( mTitle, 0, 0, 1, 2 ); + layout->addMultiCellWidget( mTitle, 0, 0, 1, 2 ); label = new TQLabel( i18n( "URL:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mURL = new TQLineEdit( page ); label->setBuddy( mURL ); - tqlayout->addMultiCellWidget( mURL, 1, 1, 1, 2 ); + layout->addMultiCellWidget( mURL, 1, 1, 1, 2 ); mTitle->setText( title ); mURL->setText( url ); @@ -331,16 +331,16 @@ void KCMKontactKNT::modified() void KCMKontactKNT::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); mAllNews = new KListView( this ); mAllNews->addColumn( i18n( "All" ) ); mAllNews->setRootIsDecorated( true ); mAllNews->setFullWidth( true ); - tqlayout->addWidget( mAllNews, 0, 0 ); + layout->addWidget( mAllNews, 0, 0 ); - TQVBoxLayout *vbox = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); + TQVBoxLayout *vbox = new TQVBoxLayout( layout, KDialog::spacingHint() ); vbox->addStretch(); mAddButton = new KPushButton( i18n( "Add" ), this ); @@ -354,12 +354,12 @@ void KCMKontactKNT::initGUI() mSelectedNews = new KListView( this ); mSelectedNews->addColumn( i18n( "Selected" ) ); mSelectedNews->setFullWidth( true ); - tqlayout->addWidget( mSelectedNews, 0, 2 ); + layout->addWidget( mSelectedNews, 0, 2 ); TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, i18n( "News Feed Settings" ), this ); - TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3, + TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Refresh time:" ), box ); @@ -384,7 +384,7 @@ void KCMKontactKNT::initGUI() mDeleteButton->setEnabled( false ); boxLayout->addWidget( mDeleteButton, 1, 2 ); - tqlayout->addMultiCellWidget( box, 1, 1, 0, 2 ); + layout->addMultiCellWidget( box, 1, 1, 0, 2 ); } bool KCMKontactKNT::dcopActive() const diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 3c58e0dd9..ecd70a1e1 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -300,7 +300,7 @@ void SummaryWidget::rmbMenu( const TQString& url ) menu.insertItem( i18n( "Copy URL to Clipboard" ) ); int id = menu.exec( TQCursor::pos() ); if ( id != -1 ) - kapp->tqclipboard()->setText( url, TQClipboard::Clipboard ); + kapp->clipboard()->setText( url, TQClipboard::Clipboard ); } bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index a59406590..7d7cae936 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -85,10 +85,10 @@ void KCMSDSummary::customDaysChanged( int value ) void KCMSDSummary::initGUI() { - TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() ); mDaysGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Special Dates Summary" ), this ); - TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->tqlayout(), + TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->layout(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "How many days should the special dates summary show at once?" ), mDaysGroup ); @@ -117,7 +117,7 @@ void KCMSDSummary::initGUI() hbox->addStretch( 1 ); - tqlayout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 ); mCalendarGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Calendar" ), this ); @@ -132,10 +132,10 @@ void KCMSDSummary::initGUI() mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup ); mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup ); - tqlayout->addWidget( mCalendarGroup, 1, 0 ); - tqlayout->addWidget( mContactGroup, 1, 1 ); + layout->addWidget( mCalendarGroup, 1, 0 ); + layout->addWidget( mContactGroup, 1, 1 ); - tqlayout->setRowStretch( 2, 1 ); + layout->setRowStretch( 2, 1 ); } void KCMSDSummary::load() diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index bf0197cb9..f85feda2c 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -93,15 +93,15 @@ PluginView::~PluginView() KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) : KCModule( parent, name ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Here you can select which summary plugins to have visible in your summary view." ), this ); - tqlayout->addWidget( label ); + layout->addWidget( label ); mPluginView = new PluginView( this ); - tqlayout->addWidget( mPluginView ); + layout->addWidget( mPluginView ); - tqlayout->setStretchFactor( mPluginView, 1 ); + layout->setStretchFactor( mPluginView, 1 ); connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ), this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index 97bb4c53f..01c5a7f13 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -214,11 +214,11 @@ void SummaryViewPart::updateWidgets() TQFrame *vline = new TQFrame( mFrame ); vline->setFrameStyle( TQFrame::VLine | TQFrame::Plain ); - TQHBoxLayout *tqlayout = new TQHBoxLayout( mFrame ); + TQHBoxLayout *layout = new TQHBoxLayout( mFrame ); - mLeftColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - tqlayout->addWidget( vline ); - mRightColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); + mLeftColumn = new TQVBoxLayout( layout, KDialog::spacingHint() ); + layout->addWidget( vline ); + mRightColumn = new TQVBoxLayout( layout, KDialog::spacingHint() ); TQStringList::Iterator strIt; @@ -311,7 +311,7 @@ void SummaryViewPart::slotTextChanged() void SummaryViewPart::slotAdjustPalette() { - mMainWidget->setPaletteBackgroundColor( kapp->tqpalette().active().base() ); + mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() ); } void SummaryViewPart::setDate( const TQDate& newDate ) diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index bf7624e4b..fb8bd9510 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -106,8 +106,8 @@ void SummaryWidget::updateView() TQImage img; img = (*it).icon(); - TQGridLayout *tqlayout = new TQGridLayout( mLayout, 3, 3, 3 ); - mLayouts.append( tqlayout ); + TQGridLayout *layout = new TQGridLayout( mLayout, 3, 3, 3 ); + mLayouts.append( layout ); KURLLabel* urlLabel = new KURLLabel( this ); urlLabel->installEventFilter( this ); @@ -115,7 +115,7 @@ void SummaryWidget::updateView() urlLabel->setPixmap( img.smoothScale( 32, 32 ) ); urlLabel->setMaximumSize( urlLabel->sizeHint() ); urlLabel->setAlignment( AlignTop ); - tqlayout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); + layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); mLabels.append( urlLabel ); connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), this, TQT_SLOT( showReport( const TQString& ) ) ); @@ -126,7 +126,7 @@ void SummaryWidget::updateView() font.setBold( true ); label->setFont( font ); label->setAlignment( AlignLeft ); - tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 ); + layout->addMultiCellWidget( label, 0, 0, 1, 2 ); mLabels.append( label ); TQString labelText; @@ -144,7 +144,7 @@ void SummaryWidget::updateView() label = new TQLabel( cover, this ); label->setAlignment( AlignLeft ); - tqlayout->addMultiCellWidget( label, 1, 1, 1, 2 ); + layout->addMultiCellWidget( label, 1, 1, 1, 2 ); mLabels.append( label ); } diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 91abb28a0..a64907663 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -223,7 +223,7 @@ void EntryItem::paint( TQPainter *p ) } if ( plugin()->disabled() ) { - p->setPen( box->tqpalette().disabled().text( ) ); + p->setPen( box->palette().disabled().text( ) ); } else if ( isCurrent() || isSelected() || mHasHover ) { p->setPen( box->colorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), |