From 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kontact/plugins/knotes/knotes_part.cpp | 8 ++++---- kontact/plugins/knotes/knotes_part_p.h | 10 +++++----- kontact/plugins/knotes/knotetip.cpp | 8 ++++---- kontact/plugins/knotes/summarywidget.cpp | 14 +++++++------- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kontact/plugins/knotes') diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 769c1acf5..a723ef31d 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include @@ -139,7 +139,7 @@ void KNotesPart::printSelectedNotes() //printer.setFont( m_config->font() ); //printer.setContext( m_editor->context() ); //printer.setStyleSheet( m_editor->styleSheet() ); - printer.tqsetColorGroup( tqcolorGroup() ); + printer.setColorGroup( colorGroup() ); printer.printNote( , content ); #endif } @@ -161,7 +161,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text ) if ( !name.isEmpty() ) journal->setSummary( name ); else - journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); + journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); // the body of the note journal->setDescription( text ); @@ -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..7ae154859 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -32,7 +32,7 @@ #ifndef KNOTES_PART_P_H #define KNOTES_PART_P_H -#include +#include #include #include @@ -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(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..17638d0cb 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -30,8 +30,8 @@ */ #include -#include -#include +#include +#include #include #include @@ -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/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index 2bd0456ca..0fbd7d9a9 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -58,7 +58,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin, mLayout = new TQGridLayout( mainLayout, 7, 3, 3 ); mLayout->setRowStretch( 6, 1 ); - mCalendar = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") ); + mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); KNotesResourceManager *manager = new KNotesResourceManager(); TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), @@ -92,8 +92,8 @@ void KNotesSummaryWidget::updateView() // Fill Note Pixmap Field label = new TQLabel( this ); label->setPixmap( pm ); - label->setMaximumWidth( label->tqminimumSizeHint().width() ); - label->tqsetAlignment( AlignVCenter ); + label->setMaximumWidth( label->minimumSizeHint().width() ); + label->setAlignment( AlignVCenter ); mLayout->addWidget( label, counter, 0 ); mLabels.append( label ); @@ -103,7 +103,7 @@ void KNotesSummaryWidget::updateView() KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this ); urlLabel->installEventFilter( this ); urlLabel->setTextFormat(RichText); - urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak ); + urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak ); mLayout->addWidget( urlLabel, counter, 1 ); mLabels.append( urlLabel ); @@ -118,7 +118,7 @@ void KNotesSummaryWidget::updateView() } else { TQLabel *noNotes = new TQLabel( i18n( "No Notes Available" ), this ); - noNotes->tqsetAlignment( AlignHCenter | AlignVCenter ); + noNotes->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addWidget( noNotes, 0, 1 ); mLabels.append( noNotes ); } @@ -140,7 +140,7 @@ bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( obj->inherits( "KURLLabel" ) ) { KURLLabel* label = static_cast( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Read Note: \"%1\"" ).tqarg( label->text() ) ); + emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } -- cgit v1.2.1