diff options
author | Timothy Pearson <[email protected]> | 2011-12-18 18:34:45 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-18 18:34:45 -0600 |
commit | 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (patch) | |
tree | 4138783f7dad757fc5fbfaa8d66a355288d3125e /kontact | |
parent | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (diff) | |
download | tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.tar.gz tdepim-0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kontact')
26 files changed, 266 insertions, 266 deletions
diff --git a/kontact/Thoughts b/kontact/Thoughts index 6fca8f43c..16aa9c4a7 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -203,7 +203,7 @@ Don: Don: And the same for all other loadX apps. -tqStatus Bar +Status Bar ---------- d We need a more sophisticated handling (progressbar, etc) diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index e4e44e704..ed8848c61 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -42,7 +42,7 @@ Core::Core( TQWidget *parent, const char *name ) { d = new Private; TQTimer* timer = new TQTimer( this ); - mLastDate = TQDate::tqcurrentDate(); + mLastDate = TQDate::currentDate(); connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) ); timer->start( 1000*60 ); } @@ -114,10 +114,10 @@ void Core::slotPartDestroyed( TQObject * obj ) void Core::checkNewDay() { - if ( mLastDate != TQDate::tqcurrentDate() ) - emit dayChanged( TQDate::tqcurrentDate() ); + if ( mLastDate != TQDate::currentDate() ) + emit dayChanged( TQDate::currentDate() ); - mLastDate = TQDate::tqcurrentDate(); + mLastDate = TQDate::currentDate(); } TQString Core::lastErrorMessage() const diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index 085125222..ece3a5775 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -55,20 +55,20 @@ TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQ TQLabel *label = new TQLabel( hbox ); label->setPixmap( icon ); - label->setFixedSize( label->tqsizeHint() ); - label->setPaletteBackgroundColor( tqcolorGroup().mid() ); + label->setFixedSize( label->sizeHint() ); + label->setPaletteBackgroundColor( colorGroup().mid() ); label->setAcceptDrops( true ); label = new TQLabel( heading, hbox ); - label->tqsetAlignment( AlignLeft|AlignVCenter ); + label->setAlignment( AlignLeft|AlignVCenter ); label->setIndent( KDialog::spacingHint() ); label->setFont( boldFont ); - label->setPaletteForegroundColor( tqcolorGroup().light() ); - label->setPaletteBackgroundColor( tqcolorGroup().mid() ); + label->setPaletteForegroundColor( colorGroup().light() ); + label->setPaletteBackgroundColor( colorGroup().mid() ); - hbox->setPaletteBackgroundColor( tqcolorGroup().mid() ); + hbox->setPaletteBackgroundColor( colorGroup().mid() ); - hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() ); + hbox->setMaximumHeight( hbox->minimumSizeHint().height() ); return hbox; } diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 01cef3a6d..266823ff7 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -83,7 +83,7 @@ bool KMailPlugin::canDecodeDrag( TQMimeSource *qms ) void KMailPlugin::processDropEvent( TQDropEvent * de ) { kdDebug() << k_funcinfo << endl; - CalendarLocal cal( TQString::tqfromLatin1("UTC") ); + CalendarLocal cal( TQString::fromLatin1("UTC") ); KABC::Addressee::List list; if ( VCalDrag::decode( de, &cal ) || ICalDrag::decode( de, &cal ) ) { diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 195d853a3..3a0b16591 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -132,7 +132,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) KURLLabel *urlLabel = new KURLLabel( *it, folderPath, this ); urlLabel->installEventFilter( this ); - urlLabel->tqsetAlignment( AlignLeft ); + urlLabel->setAlignment( AlignLeft ); urlLabel->show(); connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), TQT_SLOT( selectFolder( const TQString& ) ) ); @@ -143,7 +143,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) new TQLabel( TQString( i18n("%1: number of unread messages " "%2: total number of messages", "%1 / %2") ) .tqarg( numUnreadMsg ).tqarg( numMsg ), this ); - label->tqsetAlignment( AlignLeft ); + label->setAlignment( AlignLeft ); label->show(); mLayout->addWidget( label, counter, 2 ); mLabels.append( label ); @@ -154,7 +154,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) if ( counter == 0 ) { TQLabel *label = new TQLabel( i18n( "No unread messages in your monitored folders" ), this ); - label->tqsetAlignment( AlignHCenter | AlignVCenter ); + label->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addMultiCellWidget( label, 0, 0, 0, 2 ); label->show(); mLabels.append( label ); diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 769c1acf5..db6e43b65 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -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 ); diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index 2bd0456ca..2f598990f 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -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->tqalignment() | 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 ); } diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 7c2140b36..6d39d413a 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -224,8 +224,8 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) KTempFile tf; tf.setAutoDelete( true ); - TQString uri = TQString::tqfromLatin1("kmail:") + TQString::number( mail.serialNumber() ); - tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) ); + TQString uri = TQString::fromLatin1("kmail:") + TQString::number( mail.serialNumber() ); + tf.file()->writeBlock( event->encodedData( "message/rfc822" ) ); tf.close(); interface()->openEventEditor( i18n("Mail: %1").tqarg( mail.subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822" ); diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 7c3a1bed9..c4c4dad9c 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -97,9 +97,9 @@ void SummaryWidget::updateView() TQPixmap pma = loader.loadIcon( "calendaranniversary", KIcon::Small ); TQDate dt; - TQDate tqcurrentDate = TQDate::tqcurrentDate(); - for ( dt=tqcurrentDate; - dt<=tqcurrentDate.addDays( days - 1 ); + TQDate currentDate = TQDate::currentDate(); + for ( dt=currentDate; + dt<=currentDate.addDays( days - 1 ); dt=dt.addDays(1) ) { KCal::Event::List events = mCalendar->events( dt ); @@ -123,8 +123,8 @@ void SummaryWidget::updateView() int span=1; int dayof=1; if ( ev->isMultiDay() ) { TQDate d = ev->dtStart().date(); - if ( d < tqcurrentDate ) { - d = tqcurrentDate; + if ( d < currentDate ) { + d = currentDate; } while ( d < ev->dtEnd().date() ) { if ( d < dt ) { @@ -148,8 +148,8 @@ void SummaryWidget::updateView() } else { 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 ); @@ -159,12 +159,12 @@ void SummaryWidget::updateView() // Modify event date for printing TQDate sD = TQDate( dt.year(), dt.month(), dt.day() ); - if ( ( sD.month() == tqcurrentDate.month() ) && - ( sD.day() == tqcurrentDate.day() ) ) { + if ( ( sD.month() == currentDate.month() ) && + ( sD.day() == currentDate.day() ) ) { datestr = i18n( "Today" ); makeBold = true; - } else if ( ( sD.month() == tqcurrentDate.addDays( 1 ).month() ) && - ( sD.day() == tqcurrentDate.addDays( 1 ).day() ) ) { + } else if ( ( sD.month() == currentDate.addDays( 1 ).month() ) && + ( sD.day() == currentDate.addDays( 1 ).day() ) ) { datestr = i18n( "Tomorrow" ); } else { datestr = KGlobal::locale()->formatDate( sD ); @@ -179,7 +179,7 @@ void SummaryWidget::updateView() } label = new TQLabel( datestr, this ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); if ( makeBold ) { TQFont font = label->font(); font.setBold( true ); @@ -198,7 +198,7 @@ void SummaryWidget::updateView() urlLabel->setText( newtext ); urlLabel->setURL( ev->uid() ); urlLabel->installEventFilter( this ); - urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak ); + urlLabel->setAlignment( urlLabel->tqalignment() | TQt::WordBreak ); mLayout->addWidget( urlLabel, counter, 2 ); mLabels.append( urlLabel ); @@ -228,7 +228,7 @@ void SummaryWidget::updateView() .tqarg( KGlobal::locale()->formatTime( sST ) ) .tqarg( KGlobal::locale()->formatTime( sET ) ); label = new TQLabel( datestr, this ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 3 ); mLabels.append( label ); } @@ -242,7 +242,7 @@ void SummaryWidget::updateView() i18n( "No appointments pending within the next day", "No appointments pending within the next %n days", days ), this, "nothing to see" ); - noEvents->tqsetAlignment( AlignHCenter | AlignVCenter ); + noEvents->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addWidget( noEvents, 0, 2 ); mLabels.append( noEvents ); } diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index caaaaf91d..c17b153f5 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -217,7 +217,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) tf.setAutoDelete( true ); TQString uri = "kmail:" + TQString::number( mail.serialNumber() ) + "/" + mail.messageId(); - tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) ); + tf.file()->writeBlock( event->encodedData( "message/rfc822" ) ); tf.close(); interface()->openTodoEditor( i18n("Mail: %1").tqarg( mail.subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", false ); diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 0849dde74..ed21f40bf 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -94,7 +94,7 @@ void TodoSummaryWidget::updateView() TQLabel *label = 0; int counter = 0; - TQDate tqcurrentDate = TQDate::tqcurrentDate(); + TQDate currentDate = TQDate::currentDate(); KCal::Todo::List todos = mCalendar->todos(); if ( todos.count() > 0 ) { TQPixmap pm = loader.loadIcon( "todo", KIcon::Small ); @@ -111,27 +111,27 @@ void TodoSummaryWidget::updateView() // show uncomplete todos from the last days if ( todo->hasDueDate() && !todo->isCompleted() && - todo->dtDue().date() < tqcurrentDate ) { + todo->dtDue().date() < currentDate ) { accepted = true; stateText = i18n( "overdue" ); } // show todos which started somewhere in the past and has to be finished in future if ( todo->hasStartDate() && todo->hasDueDate() && - todo->dtStart().date() < tqcurrentDate && - tqcurrentDate < todo->dtDue().date() ) { + todo->dtStart().date() < currentDate && + currentDate < todo->dtDue().date() ) { accepted = true; stateText = i18n( "in progress" ); } // all todos which start today - if ( todo->hasStartDate() && todo->dtStart().date() == tqcurrentDate ) { + if ( todo->hasStartDate() && todo->dtStart().date() == currentDate ) { accepted = true; stateText = i18n( "starts today" ); } // all todos which end today - if ( todo->hasDueDate() && todo->dtDue().date() == tqcurrentDate ) { + if ( todo->hasDueDate() && todo->dtDue().date() == currentDate ) { accepted = true; stateText = i18n( "ends today" ); } @@ -141,13 +141,13 @@ void TodoSummaryWidget::updateView() label = new TQLabel( this ); label->setPixmap( pm ); - label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); mLayout->addWidget( label, counter, 0 ); mLabels.append( label ); label = new TQLabel( TQString::number( todo->percentComplete() ) + "%", this ); - label->tqsetAlignment( AlignHCenter | AlignVCenter ); - label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + label->setAlignment( AlignHCenter | AlignVCenter ); + label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); mLayout->addWidget( label, counter, 1 ); mLabels.append( label ); @@ -168,14 +168,14 @@ void TodoSummaryWidget::updateView() connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), this, TQT_SLOT( popupMenu( const TQString& ) ) ); - TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, tqcurrentDate, true ) ); + TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) ); if ( !tipText.isEmpty() ) { TQToolTip::add( urlLabel, tipText ); } label = new TQLabel( stateText, this ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); - label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + label->setAlignment( AlignLeft | AlignVCenter ); + label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); mLayout->addWidget( label, counter, 3 ); mLabels.append( label ); @@ -185,7 +185,7 @@ void TodoSummaryWidget::updateView() if ( counter == 0 ) { TQLabel *noTodos = new TQLabel( i18n( "No to-dos pending" ), this ); - noTodos->tqsetAlignment( AlignHCenter | AlignVCenter ); + noTodos->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addWidget( noTodos, 0, 1 ); mLabels.append( noTodos ); } @@ -214,7 +214,7 @@ void TodoSummaryWidget::completeTodo( const TQString &uid ) IncidenceChanger *changer = new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ); if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) { KCal::Todo *oldTodo = todo->clone(); - todo->setCompleted( TQDateTime::tqcurrentDateTime() ); + todo->setCompleted( TQDateTime::currentDateTime() ); changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED, this ); changer->endChange( todo, 0, TQString() ); delete oldTodo; diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index 46ec7fdfe..ff6d41852 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -88,7 +88,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mPilotDeviceLabel = new TQLabel( i18n( "Unknown" ), this ); mLayout->addMultiCellWidget( mPilotDeviceLabel, row, row, 1, 3 ); - // tqStatus + // Status row++; mDaemonStatusTextLabel = new TQLabel( i18n( "<i>Status:</i>" ), this); mLayout->addWidget( mDaemonStatusTextLabel, row, 0 ); @@ -98,10 +98,10 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) // Conduits: row++; mConduitsTextLabel = new TQLabel( i18n( "<i>Conduits:</i>" ), this ); - mConduitsTextLabel->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs ); + mConduitsTextLabel->setAlignment( AlignAuto | AlignTop | ExpandTabs ); mLayout->addWidget( mConduitsTextLabel, row, 0 ); mConduitsLabel = new TQLabel( i18n( "No information available" ), this ); - mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak ); + mConduitsLabel->setAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak ); mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 ); // widgets shown if kpilotDaemon is not running @@ -141,7 +141,7 @@ void SummaryWidget::receiveDaemonStatusDetails(TQDateTime lastSyncTime, TQString { mDCOPSuccess = true; mLastSyncTime = lastSyncTime; - mDaemontqStatus = status; + mDaemonStatus = status; mConduits = conduits; mSyncLog = logFileName; mUserName = userName; @@ -166,7 +166,7 @@ void SummaryWidget::updateView() } mPilotUserLabel->setText( mUserName.isEmpty() ? i18n( "unknown" ) : mUserName ); mPilotDeviceLabel->setText( mPilotDevice.isEmpty() ? i18n( "unknown" ) : mPilotDevice ); - mDaemonStatusLabel->setText( mDaemontqStatus ); + mDaemonStatusLabel->setText( mDaemonStatus ); mConduitsLabel->setText( mConduits.join( ", " ) ); } else { mSyncTimeLabel->setText( i18n( "No information available (Daemon not running?)" ) ); diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h index b1b60a053..3e04ed88d 100644 --- a/kontact/plugins/kpilot/summarywidget.h +++ b/kontact/plugins/kpilot/summarywidget.h @@ -85,7 +85,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject TQGridLayout *mLayout; TQDateTime mLastSyncTime; - TQString mDaemontqStatus; + TQString mDaemonStatus; TQStringList mConduits; TQString mSyncLog; TQString mUserName; diff --git a/kontact/plugins/newsticker/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h index b092469aa..0fe52d3b7 100644 --- a/kontact/plugins/newsticker/newsfeeds.h +++ b/kontact/plugins/newsticker/newsfeeds.h @@ -58,257 +58,257 @@ class NewsSourceData static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = { // Arts --------------- NewsSourceData( - TQString::tqfromLatin1("Bureau 42"), - TQString::tqfromLatin1("http://www.bureau42.com/rdf/"), - TQString::tqfromLatin1("http://www.bureau42.com/favicon.ico"), + TQString::fromLatin1("Bureau 42"), + TQString::fromLatin1("http://www.bureau42.com/rdf/"), + TQString::fromLatin1("http://www.bureau42.com/favicon.ico"), NewsSourceData::Arts ), NewsSourceData( - TQString::tqfromLatin1("eFilmCritic"), - TQString::tqfromLatin1("http://efilmcritic.com/fo.rdf"), - TQString::tqfromLatin1("http://efilmcritic.com/favicon.ico"), + TQString::fromLatin1("eFilmCritic"), + TQString::fromLatin1("http://efilmcritic.com/fo.rdf"), + TQString::fromLatin1("http://efilmcritic.com/favicon.ico"), NewsSourceData::Arts ), // Business ----------- NewsSourceData( - TQString::tqfromLatin1("Internet.com Business"), - TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), + TQString::fromLatin1("Internet.com Business"), + TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"), TQString(), NewsSourceData::Business ), NewsSourceData( - TQString::tqfromLatin1("TradeSims"), - TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"), + TQString::fromLatin1("TradeSims"), + TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"), TQString(), NewsSourceData::Business ), // Computers ---------- NewsSourceData( - TQString::tqfromLatin1("KDE Deutschland"), - TQString::tqfromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"), - TQString::tqfromLatin1("http://www.kde.de/favicon.ico"), + TQString::fromLatin1("KDE Deutschland"), + TQString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"), + TQString::fromLatin1("http://www.kde.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("KDE France"), - TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"), + TQString::fromLatin1("KDE France"), + TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("FreeBSD Project News"), - TQString::tqfromLatin1("http://www.freebsd.org/news/news.rdf"), - TQString::tqfromLatin1("http://www.freebsd.org/favicon.ico"), + TQString::fromLatin1("FreeBSD Project News"), + TQString::fromLatin1("http://www.freebsd.org/news/news.rdf"), + TQString::fromLatin1("http://www.freebsd.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("dot.kde.org"), - TQString::tqfromLatin1("http://www.kde.org/dotkdeorg.rdf"), - TQString::tqfromLatin1("http://www.kde.org/favicon.ico"), + TQString::fromLatin1("dot.kde.org"), + TQString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"), + TQString::fromLatin1("http://www.kde.org/favicon.ico"), NewsSourceData::Computers ), - NewsSourceData( TQString::tqfromLatin1("KDE-Look.org"), - TQString::tqfromLatin1("http://www.kde.org/kde-look-content.rdf"), - TQString::tqfromLatin1("http://kde-look.org/img/favicon-1-1.ico"), + NewsSourceData( TQString::fromLatin1("KDE-Look.org"), + TQString::fromLatin1("http://www.kde.org/kde-look-content.rdf"), + TQString::fromLatin1("http://kde-look.org/img/favicon-1-1.ico"), NewsSourceData::Computers ), - NewsSourceData( TQString::tqfromLatin1("KDE-Apps.org"), - TQString::tqfromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"), - TQString::tqfromLatin1("http://kde-apps.org/img/favicon-1-1.ico"), + NewsSourceData( TQString::fromLatin1("KDE-Apps.org"), + TQString::fromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"), + TQString::fromLatin1("http://kde-apps.org/img/favicon-1-1.ico"), NewsSourceData::Computers ), - NewsSourceData( TQString::tqfromLatin1("DesktopLinux"), - TQString::tqfromLatin1("http://www.desktoplinux.com/backend/index.html"), - TQString::tqfromLatin1("http://www.desktoplinux.com/images/favicon.ico"), + NewsSourceData( TQString::fromLatin1("DesktopLinux"), + TQString::fromLatin1("http://www.desktoplinux.com/backend/index.html"), + TQString::fromLatin1("http://www.desktoplinux.com/images/favicon.ico"), NewsSourceData::Computers ), - NewsSourceData( TQString::tqfromLatin1("DistroWatch"), - TQString::tqfromLatin1("http://distrowatch.com/news/dw.xml"), - TQString::tqfromLatin1("http://distrowatch.com/favicon.ico"), + NewsSourceData( TQString::fromLatin1("DistroWatch"), + TQString::fromLatin1("http://distrowatch.com/news/dw.xml"), + TQString::fromLatin1("http://distrowatch.com/favicon.ico"), NewsSourceData::Computers ), /*URL changed*/ NewsSourceData( - TQString::tqfromLatin1("GNOME News"), - TQString::tqfromLatin1("http://www.gnomedesktop.org/node/feed"), + TQString::fromLatin1("GNOME News"), + TQString::fromLatin1("http://www.gnomedesktop.org/node/feed"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Slashdot"), - TQString::tqfromLatin1("http://slashdot.org/slashdot.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot"), + TQString::fromLatin1("http://slashdot.org/slashdot.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Ask Slashdot"), - TQString::tqfromLatin1("http://slashdot.org/askslashdot.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Ask Slashdot"), + TQString::fromLatin1("http://slashdot.org/askslashdot.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Slashdot: Features"), - TQString::tqfromLatin1("http://slashdot.org/features.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Features"), + TQString::fromLatin1("http://slashdot.org/features.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Slashdot: Apache"), - TQString::tqfromLatin1("http://slashdot.org/apache.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Apache"), + TQString::fromLatin1("http://slashdot.org/apache.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Slashdot: Books"), - TQString::tqfromLatin1("http://slashdot.org/books.rdf"), - TQString::tqfromLatin1("http://slashdot.org/favicon.ico"), + TQString::fromLatin1("Slashdot: Books"), + TQString::fromLatin1("http://slashdot.org/books.rdf"), + TQString::fromLatin1("http://slashdot.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Jabber News"), - TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"), + TQString::fromLatin1("Jabber News"), + TQString::fromLatin1("http://www.jabber.org/news/rss.xml"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Freshmeat"), - TQString::tqfromLatin1("http://freshmeat.net/backend/fm.rdf"), - TQString::tqfromLatin1("http://freshmeat.net/favicon.ico"), + TQString::fromLatin1("Freshmeat"), + TQString::fromLatin1("http://freshmeat.net/backend/fm.rdf"), + TQString::fromLatin1("http://freshmeat.net/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Linux Weekly News"), - TQString::tqfromLatin1("http://www.lwn.net/headlines/rss"), - TQString::tqfromLatin1("http://www.lwn.net/favicon.ico"), + TQString::fromLatin1("Linux Weekly News"), + TQString::fromLatin1("http://www.lwn.net/headlines/rss"), + TQString::fromLatin1("http://www.lwn.net/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("heise online news"), - TQString::tqfromLatin1("http://www.heise.de/newsticker/heise.rdf"), - TQString::tqfromLatin1("http://www.heise.de/favicon.ico"), + TQString::fromLatin1("heise online news"), + TQString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"), + TQString::fromLatin1("http://www.heise.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("RUS-CERT Ticker"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), + TQString::fromLatin1("RUS-CERT Ticker"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("RUS-CERT Elsewhere"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"), - TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), + TQString::fromLatin1("RUS-CERT Elsewhere"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"), + TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Kuro5hin"), - TQString::tqfromLatin1("http://kuro5hin.org/backend.rdf"), - TQString::tqfromLatin1("http://kuro5hin.org/favicon.ico"), + TQString::fromLatin1("Kuro5hin"), + TQString::fromLatin1("http://kuro5hin.org/backend.rdf"), + TQString::fromLatin1("http://kuro5hin.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Prolinux"), - TQString::tqfromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"), - TQString::tqfromLatin1("http://www.prolinux.de/favicon.ico"), + TQString::fromLatin1("Prolinux"), + TQString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"), + TQString::fromLatin1("http://www.prolinux.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("LinuxSecurity.com"), - TQString::tqfromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), - TQString::tqfromLatin1("http://www.linuxsecurity.com/favicon.ico"), + TQString::fromLatin1("LinuxSecurity.com"), + TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"), + TQString::fromLatin1("http://www.linuxsecurity.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Linux Game Tome"), - TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"), + TQString::fromLatin1("Linux Game Tome"), + TQString::fromLatin1("http://happypenguin.org/html/news.rdf"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Mozilla"), - TQString::tqfromLatin1("http://www.mozilla.org/news.rdf"), - TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"), + TQString::fromLatin1("Mozilla"), + TQString::fromLatin1("http://www.mozilla.org/news.rdf"), + TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("MozillaZine"), - TQString::tqfromLatin1("http://www.mozillazine.org/contents.rdf"), - TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"), + TQString::fromLatin1("MozillaZine"), + TQString::fromLatin1("http://www.mozillazine.org/contents.rdf"), + TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Daemon News"), - TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), + TQString::fromLatin1("Daemon News"), + TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("use Perl;"), - TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"), + TQString::fromLatin1("use Perl;"), + TQString::fromLatin1("http://use.perl.org/useperl.rdf"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Root prompt"), - TQString::tqfromLatin1("http://www.rootprompt.org/rss/"), - TQString::tqfromLatin1("http://www.rootprompt.org/favicon.ico"), + TQString::fromLatin1("Root prompt"), + TQString::fromLatin1("http://www.rootprompt.org/rss/"), + TQString::fromLatin1("http://www.rootprompt.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("SecurityFocus"), - TQString::tqfromLatin1("http://www.securityfocus.com/topnews-rdf.html"), - TQString::tqfromLatin1("http://www.securityfocus.com/favicon.ico"), + TQString::fromLatin1("SecurityFocus"), + TQString::fromLatin1("http://www.securityfocus.com/topnews-rdf.html"), + TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("Arstechnica"), - TQString::tqfromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), - TQString::tqfromLatin1("http://arstechnica.com/favicon.ico"), + TQString::fromLatin1("Arstechnica"), + TQString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"), + TQString::fromLatin1("http://arstechnica.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"), - TQString::tqfromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"), - TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"), + TQString::fromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"), + TQString::fromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"), + TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("amiga-news.de - english Amiga news"), - TQString::tqfromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"), - TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"), + TQString::fromLatin1("amiga-news.de - english Amiga news"), + TQString::fromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"), + TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("FreshPorts - the place for ports"), - TQString::tqfromLatin1("http://www.freshports.org/news.php3"), - TQString::tqfromLatin1("http://www.freshports.org/favicon.ico"), + TQString::fromLatin1("FreshPorts - the place for ports"), + TQString::fromLatin1("http://www.freshports.org/news.php3"), + TQString::fromLatin1("http://www.freshports.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("zez.org - about code "), - TQString::tqfromLatin1("http://zez.org/article/rssheadlines"), + TQString::fromLatin1("zez.org - about code "), + TQString::fromLatin1("http://zez.org/article/rssheadlines"), TQString(), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("BSDatwork.com"), - TQString::tqfromLatin1("http://BSDatwork.com/backend.php"), - TQString::tqfromLatin1("http://BSDatwork.com/favicon.ico"), + TQString::fromLatin1("BSDatwork.com"), + TQString::fromLatin1("http://BSDatwork.com/backend.php"), + TQString::fromLatin1("http://BSDatwork.com/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("FreshSource - the place for source"), - TQString::tqfromLatin1("http://www.freshsource.org/news.php"), - TQString::tqfromLatin1("http://www.freshsource.org/favicon.ico"), + TQString::fromLatin1("FreshSource - the place for source"), + TQString::fromLatin1("http://www.freshsource.org/news.php"), + TQString::fromLatin1("http://www.freshsource.org/favicon.ico"), NewsSourceData::Computers ), NewsSourceData( - TQString::tqfromLatin1("The FreeBSD Diary"), - TQString::tqfromLatin1("http://www.freebsddiary.org/news.php"), - TQString::tqfromLatin1("http://www.freebsddiary.org/favicon.ico"), + TQString::fromLatin1("The FreeBSD Diary"), + TQString::fromLatin1("http://www.freebsddiary.org/news.php"), + TQString::fromLatin1("http://www.freebsddiary.org/favicon.ico"), NewsSourceData::Computers ), // Miscellaneous ------ NewsSourceData( - TQString::tqfromLatin1("tagesschau.de"), - TQString::tqfromLatin1("http://www.tagesschau.de/newsticker.rdf"), - TQString::tqfromLatin1("http://www.tagesschau.de/favicon.ico"), + TQString::fromLatin1("tagesschau.de"), + TQString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"), + TQString::fromLatin1("http://www.tagesschau.de/favicon.ico"), NewsSourceData::Misc ), NewsSourceData( - TQString::tqfromLatin1("CNN Top Stories"), - TQString::tqfromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"), - TQString::tqfromLatin1("http://www.cnn.com/favicon.ico"), + TQString::fromLatin1("CNN Top Stories"), + TQString::fromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"), + TQString::fromLatin1("http://www.cnn.com/favicon.ico"), NewsSourceData::Misc ), /*feed URL changed*/ NewsSourceData( - TQString::tqfromLatin1("HotWired"), - TQString::tqfromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"), - TQString::tqfromLatin1("http://www.hotwired.com/favicon.ico"), + TQString::fromLatin1("HotWired"), + TQString::fromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"), + TQString::fromLatin1("http://www.hotwired.com/favicon.ico"), NewsSourceData::Misc ), NewsSourceData( - TQString::tqfromLatin1("The Register"), - TQString::tqfromLatin1("http://www.theregister.co.uk/headlines.rss"), - TQString::tqfromLatin1("http://www.theregister.co.uk/favicon.ico"), + TQString::fromLatin1("The Register"), + TQString::fromLatin1("http://www.theregister.co.uk/headlines.rss"), + TQString::fromLatin1("http://www.theregister.co.uk/favicon.ico"), NewsSourceData::Misc ), NewsSourceData( - TQString::tqfromLatin1( "Christian Science Monitor" ), - TQString::tqfromLatin1( "http://www.csmonitor.com/rss/csm.rss"), - TQString::tqfromLatin1( "http://www.csmonitor.com/favicon.ico"), + TQString::fromLatin1( "Christian Science Monitor" ), + TQString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"), + TQString::fromLatin1( "http://www.csmonitor.com/favicon.ico"), NewsSourceData::Misc ), // Recreation // Society NewsSourceData( - TQString::tqfromLatin1("nippon.it"), - TQString::tqfromLatin1("http://www.nippon.it/backend.it.php"), - TQString::tqfromLatin1("http://www.nippon.it/favicon.ico"), + TQString::fromLatin1("nippon.it"), + TQString::fromLatin1("http://www.nippon.it/backend.it.php"), + TQString::fromLatin1("http://www.nippon.it/favicon.ico"), NewsSourceData::Society ), NewsSourceData( - TQString::tqfromLatin1( "gflash" ), - TQString::tqfromLatin1( "http://www.gflash.de/backend.php"), - TQString::tqfromLatin1( "http://www.gflash.de/favicon.ico"), + TQString::fromLatin1( "gflash" ), + TQString::fromLatin1( "http://www.gflash.de/backend.php"), + TQString::fromLatin1( "http://www.gflash.de/favicon.ico"), NewsSourceData::Society ), NewsSourceData( - TQString::tqfromLatin1( "Quintessenz" ), - TQString::tqfromLatin1( "http://quintessenz.at/cgi-bin/rdf"), - TQString::tqfromLatin1( "http://quintessenz.at/favicon.ico"), + TQString::fromLatin1( "Quintessenz" ), + TQString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"), + TQString::fromLatin1( "http://quintessenz.at/favicon.ico"), NewsSourceData::Society ) }; diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 2ba0dfcfa..3c58e0dd9 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -220,7 +220,7 @@ void SummaryWidget::updateView() KURLLabel *urlLabel = new KURLLabel( hbox ); urlLabel->setURL( (*it).url ); urlLabel->setPixmap( (*it).logo ); - urlLabel->setMaximumSize( urlLabel->tqminimumSizeHint() ); + urlLabel->setMaximumSize( urlLabel->minimumSizeHint() ); mLabels.append( urlLabel ); connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), @@ -231,13 +231,13 @@ void SummaryWidget::updateView() // header TQLabel *label = new TQLabel( hbox ); label->setText( KCharsets::resolveEntities( (*it).title ) ); - label->tqsetAlignment( AlignLeft|AlignVCenter ); + label->setAlignment( AlignLeft|AlignVCenter ); label->setFont( boldFont ); label->setIndent( 6 ); - label->setMaximumSize( label->tqminimumSizeHint() ); + label->setMaximumSize( label->minimumSizeHint() ); mLabels.append( label ); - hbox->setMaximumWidth( hbox->tqminimumSizeHint().width() ); + hbox->setMaximumWidth( hbox->minimumSizeHint().width() ); hbox->show(); // articles diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 3fbac9d2e..9b5c27efe 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -183,8 +183,8 @@ int SDSummaryWidget::span( KCal::Event *event ) int span=1; if ( event->isMultiDay() && event->doesFloat() ) { TQDate d = event->dtStart().date(); - if ( d < TQDate::tqcurrentDate() ) { - d = TQDate::tqcurrentDate(); + if ( d < TQDate::currentDate() ) { + d = TQDate::currentDate(); } while ( d < event->dtEnd().date() ) { span++; @@ -199,8 +199,8 @@ int SDSummaryWidget::dayof( KCal::Event *event, const TQDate& date ) { int dayof=1; TQDate d = event->dtStart().date(); - if ( d < TQDate::tqcurrentDate() ) { - d = TQDate::tqcurrentDate(); + if ( d < TQDate::currentDate() ) { + d = TQDate::currentDate(); } while ( d < event->dtEnd().date() ) { if ( d < date ) { @@ -269,9 +269,9 @@ void SDSummaryWidget::updateView() // Search for Birthdays, Anniversaries, Holidays, and Special Occasions // in the Calendar TQDate dt; - TQDate tqcurrentDate = TQDate::tqcurrentDate(); - for ( dt=tqcurrentDate; - dt<=tqcurrentDate.addDays( mDaysAhead - 1 ); + TQDate currentDate = TQDate::currentDate(); + for ( dt=currentDate; + dt<=currentDate.addDays( mDaysAhead - 1 ); dt=dt.addDays(1) ) { KCal::Event::List events = mCalendar->events( dt, KCal::EventSortStartDate, @@ -358,8 +358,8 @@ void SDSummaryWidget::updateView() // Seach for Holidays if ( mShowHolidays ) { if ( initHolidays() ) { - for ( dt=tqcurrentDate; - dt<=tqcurrentDate.addDays( mDaysAhead - 1 ); + for ( dt=currentDate; + dt<=currentDate.addDays( mDaysAhead - 1 ); dt=dt.addDays(1) ) { TQValueList<KHoliday> holidays = mHolidays->getHolidays( dt ); TQValueList<KHoliday>::ConstIterator it = holidays.begin(); @@ -429,8 +429,8 @@ void SDSummaryWidget::updateView() } else { label->setPixmap( icon_img ); } - label->setMaximumWidth( label->tqminimumSizeHint().width() ); - label->tqsetAlignment( AlignVCenter ); + label->setMaximumWidth( label->minimumSizeHint().width() ); + label->setAlignment( AlignVCenter ); mLayout->addWidget( label, counter, 0 ); mLabels.append( label ); @@ -438,7 +438,7 @@ void SDSummaryWidget::updateView() TQString datestr; //Muck with the year -- change to the year 'daysTo' days away - int year = tqcurrentDate.addDays( (*addrIt).daysTo ).year(); + int year = currentDate.addDays( (*addrIt).daysTo ).year(); TQDate sD = TQDate( year, (*addrIt).date.month(), (*addrIt).date.day() ); if ( (*addrIt).daysTo == 0 ) { @@ -457,7 +457,7 @@ void SDSummaryWidget::updateView() } label = new TQLabel( datestr, this ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 1 ); mLabels.append( label ); if ( makeBold ) { @@ -474,7 +474,7 @@ void SDSummaryWidget::updateView() label->setText( i18n( "in 1 day", "in %n days", (*addrIt).daysTo ) ); } - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 2 ); mLabels.append( label ); @@ -492,7 +492,7 @@ void SDSummaryWidget::updateView() } label = new TQLabel( this ); label->setText( what ); - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 3 ); mLabels.append( label ); @@ -530,7 +530,7 @@ void SDSummaryWidget::updateView() } else { label->setText( i18n( "one year", "%n years", (*addrIt).yearsOld ) ); } - label->tqsetAlignment( AlignLeft | AlignVCenter ); + label->setAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 5 ); mLabels.append( label ); } @@ -542,7 +542,7 @@ void SDSummaryWidget::updateView() i18n( "No special dates within the next 1 day", "No special dates pending within the next %n days", mDaysAhead ), this, "nothing to see" ); - label->tqsetAlignment( AlignHCenter | AlignVCenter ); + label->setAlignment( AlignHCenter | AlignVCenter ); mLayout->addMultiCellWidget( label, 0, 0, 0, 4 ); mLabels.append( label ); } @@ -605,27 +605,27 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) void SDSummaryWidget::dateDiff( const TQDate &date, int &days, int &years ) { - TQDate tqcurrentDate; + TQDate currentDate; TQDate eventDate; if ( TQDate::leapYear( date.year() ) && date.month() == 2 && date.day() == 29 ) { - tqcurrentDate = TQDate( date.year(), TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() ); - if ( !TQDate::leapYear( TQDate::tqcurrentDate().year() ) ) + currentDate = TQDate( date.year(), TQDate::currentDate().month(), TQDate::currentDate().day() ); + if ( !TQDate::leapYear( TQDate::currentDate().year() ) ) eventDate = TQDate( date.year(), date.month(), 28 ); // celebrate one day earlier ;) else eventDate = TQDate( date.year(), date.month(), date.day() ); } else { - tqcurrentDate = TQDate( 0, TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() ); + currentDate = TQDate( 0, TQDate::currentDate().month(), TQDate::currentDate().day() ); eventDate = TQDate( 0, date.month(), date.day() ); } - int offset = tqcurrentDate.daysTo( eventDate ); + int offset = currentDate.daysTo( eventDate ); if ( offset < 0 ) { days = 365 + offset; - years = TQDate::tqcurrentDate().year() + 1 - date.year(); + years = TQDate::currentDate().year() + 1 - date.year(); } else { days = offset; - years = TQDate::tqcurrentDate().year() - date.year(); + years = TQDate::currentDate().year() - date.year(); } } diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 47c9bca64..076692948 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -119,7 +119,7 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) void KCMKontactSummary::load() { KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1( "Kontact/Plugin" ), + TQString::fromLatin1( "Kontact/Plugin" ), TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); TQStringList activeSummaries; diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index d65228cd1..9caeeb6d6 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -80,7 +80,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) ); slotAdjustPalette(); - setDate( TQDate::tqcurrentDate() ); + setDate( TQDate::currentDate() ); connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ), TQT_SLOT( setDate( const TQDate& ) ) ); @@ -137,7 +137,7 @@ void SummaryViewPart::updateWidgets() const KPIM::Identity &id = idm.defaultIdentity(); TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() ); - mUsernameLabel->setText( TQString::tqfromLatin1( "<b>%1</b>" ).tqarg( currentUser ) ); + mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).tqarg( currentUser ) ); mSummaries.clear(); @@ -374,7 +374,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core ) mUsernameLabel = new TQLabel( mMainWidget ); hbl->addWidget( mUsernameLabel ); mDateLabel = new TQLabel( mMainWidget ); - mDateLabel->tqsetAlignment( AlignRight ); + mDateLabel->setAlignment( AlignRight ); hbl->addWidget( mDateLabel ); TQFrame *hline = new TQFrame( mMainWidget ); diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index bf4d452ad..a0ff4341c 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -43,7 +43,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) DCOPObject( "WeatherSummaryWidget" ), mProc( 0 ) { mLayout = new TQVBoxLayout( this, 3, 3 ); - mLayout->tqsetAlignment( TQt::AlignTop ); + mLayout->setAlignment( TQt::AlignTop ); TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium ); TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) ); @@ -113,8 +113,8 @@ void SummaryWidget::updateView() urlLabel->installEventFilter( this ); urlLabel->setURL( (*it).stationID() ); urlLabel->setPixmap( img.smoothScale( 32, 32 ) ); - urlLabel->setMaximumSize( urlLabel->tqsizeHint() ); - urlLabel->tqsetAlignment( AlignTop ); + urlLabel->setMaximumSize( urlLabel->sizeHint() ); + urlLabel->setAlignment( AlignTop ); tqlayout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); mLabels.append( urlLabel ); connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), @@ -125,7 +125,7 @@ void SummaryWidget::updateView() TQFont font = label->font(); font.setBold( true ); label->setFont( font ); - label->tqsetAlignment( AlignLeft ); + label->setAlignment( AlignLeft ); tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 ); mLabels.append( label ); @@ -143,7 +143,7 @@ void SummaryWidget::updateView() TQToolTip::add( label, labelText.replace( " ", " " ) ); label = new TQLabel( cover, this ); - label->tqsetAlignment( AlignLeft ); + label->setAlignment( AlignLeft ); tqlayout->addMultiCellWidget( label, 1, 1, 1, 2 ); mLabels.append( label ); } diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index 1bbd0ef6c..1d52da2f1 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -96,7 +96,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon, text.replace( "\n", "<br>" ); KActiveLabel *label = new KActiveLabel( text, topFrame ); - label->tqsetAlignment( AlignTop ); + label->setAlignment( AlignTop ); topLayout->addWidget( label ); diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 4eacd6088..91abb28a0 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -173,13 +173,13 @@ void EntryItem::paint( TQPainter *p ) TQBrush brush; if ( isCurrent() || isSelected() || mPaintActive ) - brush = box->tqcolorGroup().brush( TQColorGroup::Highlight ); + brush = box->colorGroup().brush( TQColorGroup::Highlight ); else - brush = TQBrush(box->tqcolorGroup().highlight().light( 115 )); + brush = TQBrush(box->colorGroup().highlight().light( 115 )); p->fillRect( 1, 0, w - 2, h - 1, brush ); TQPen pen = p->pen(); TQPen oldPen = pen; - pen.setColor( box->tqcolorGroup().mid() ); + pen.setColor( box->colorGroup().mid() ); p->setPen( pen ); p->drawPoint( 1, 0 ); @@ -196,9 +196,9 @@ void EntryItem::paint( TQPainter *p ) p->drawPixmap( x, y, mPixmap ); } - TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115); + TQColor shadowColor = listBox()->colorGroup().background().dark(115); if ( isCurrent() || isSelected() ) { - p->setPen( box->tqcolorGroup().highlightedText() ); + p->setPen( box->colorGroup().highlightedText() ); } if ( !text().isEmpty() && navigator()->showText() ) { @@ -225,13 +225,13 @@ void EntryItem::paint( TQPainter *p ) if ( plugin()->disabled() ) { p->setPen( box->tqpalette().disabled().text( ) ); } else if ( isCurrent() || isSelected() || mHasHover ) { - p->setPen( box->tqcolorGroup().highlight().dark(115) ); + p->setPen( box->colorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), y + 1, text() ); - p->setPen( box->tqcolorGroup().highlightedText() ); + p->setPen( box->colorGroup().highlightedText() ); } else - p->setPen( box->tqcolorGroup().text() ); + p->setPen( box->colorGroup().text() ); p->drawText( x, y, text() ); } @@ -284,7 +284,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name ) } -TQSize Navigator::tqsizeHint() const +TQSize Navigator::sizeHint() const { return TQSize( 100, 100 ); } diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h index d215558df..135332284 100644 --- a/kontact/src/iconsidepane.h +++ b/kontact/src/iconsidepane.h @@ -101,12 +101,12 @@ class EntryItemToolTip : public TQToolTip if ( !mListBox ) return; TQListBoxItem* item = mListBox->itemAt( p ); if ( !item ) return; - const TQRect tqitemRect = mListBox->tqitemRect( item ); - if ( !tqitemRect.isValid() ) return; + const TQRect itemRect = mListBox->itemRect( item ); + if ( !itemRect.isValid() ) return; const EntryItem *entryItem = static_cast<EntryItem*>( item ); TQString tipStr = entryItem->text(); - tip( tqitemRect, tipStr ); + tip( itemRect, tipStr ); } private: TQListBox* mListBox; @@ -126,7 +126,7 @@ class Navigator : public KListBox void updatePlugins( TQValueList<Kontact::Plugin*> plugins ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void highlightItem( EntryItem* item ); diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 7bfed9cd4..5de81055e 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -114,7 +114,7 @@ PluginSelection::~PluginSelection() void PluginSelection::readConfig() { const KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1( "Kontact/Plugin" ), + TQString::fromLatin1( "Kontact/Plugin" ), TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); int activeComponent = 0; diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index d2a57bcb7..5cf0bfd50 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -76,7 +76,7 @@ static void listPlugins() { KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1( "Kontact/Plugin" ), + TQString::fromLatin1( "Kontact/Plugin" ), TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = (*it); diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index fe24bd8dd..06664d41e 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -124,7 +124,7 @@ void MainWindow::initGUI() TQT_SLOT( showAboutDialog() ) ); KTrader::OfferList offers = KTrader::self()->query( - TQString::tqfromLatin1( "Kontact/Plugin" ), + TQString::fromLatin1( "Kontact/Plugin" ), TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); @@ -244,7 +244,7 @@ void MainWindow::initWidgets() mSplitter = new TQSplitter( mTopWidget ); mBox = new TQHBox( mTopWidget ); mSidePane = new IconSidePane( this, mSplitter ); - mSidePane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, + mSidePane->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); // donÄt occupy screen estate on load TQValueList<int> sizes; @@ -278,7 +278,7 @@ void MainWindow::initWidgets() mLittleProgress = new KPIM::StatusbarProgressWidget( progressDialog, statusBar() ); mStatusMsgLabel = new KRSqueezedTextLabel( i18n( " Initializing..." ), statusBar() ); - mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter ); + mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter ); statusBar()->addWidget( mStatusMsgLabel, 10 , false ); statusBar()->addWidget( mLittleProgress, 0 , true ); @@ -802,13 +802,13 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) } // store old focus widget - TQWidget *tqfocusWidget = kapp->tqfocusWidget(); - if ( mCurrentPlugin && tqfocusWidget ) { + TQWidget *focusWidget = kapp->focusWidget(); + if ( mCurrentPlugin && focusWidget ) { // save the focus widget only when it belongs to the activated part - TQWidget *parent = tqfocusWidget->parentWidget(); + TQWidget *parent = focusWidget->parentWidget(); while ( parent ) { if ( parent == mCurrentPlugin->part()->widget() ) - mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) ); + mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( focusWidget ) ); parent = parent->parentWidget(); } @@ -829,9 +829,9 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) view->show(); if ( mFocusWidgets.contains( plugin->identifier() ) ) { - tqfocusWidget = mFocusWidgets[ plugin->identifier() ]; - if ( tqfocusWidget ) - tqfocusWidget->setFocus(); + focusWidget = mFocusWidgets[ plugin->identifier() ]; + if ( focusWidget ) + focusWidget->setFocus(); } else view->setFocus(); diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 91fc370db..67f1bd198 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -178,7 +178,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil void Kontact::ProfileManager::readConfig() { - const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::tqfromLatin1( "kontact/profiles/*/profile.cfg" ) ); + const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) ); typedef TQMap<TQString, Kontact::Profile> ProfileMap; ProfileMap profiles; |