summaryrefslogtreecommitdiffstats
path: root/kontact/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:21 -0600
commit3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (patch)
tree89de88213bd261e4ccaade899ab2d6ec34b3a5a7 /kontact/plugins
parent1dad5f662a09dfc5cc041caffe0f674044a4dcec (diff)
downloadtdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.tar.gz
tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kontact/plugins')
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp8
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp12
-rw-r--r--kontact/plugins/knotes/knotes_part.cpp8
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h10
-rw-r--r--kontact/plugins/knotes/knotetip.cpp8
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp14
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp12
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp14
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp40
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp12
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp32
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp16
-rw-r--r--kontact/plugins/kpilot/summarywidget.h2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp24
-rw-r--r--kontact/plugins/newsticker/newsfeeds.h282
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp14
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp14
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp52
-rw-r--r--kontact/plugins/summary/dropwidget.cpp6
-rw-r--r--kontact/plugins/summary/dropwidget.h2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp14
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp36
-rw-r--r--kontact/plugins/summary/summaryview_part.h2
-rw-r--r--kontact/plugins/test/test_part.cpp2
-rw-r--r--kontact/plugins/weather/summarywidget.cpp38
27 files changed, 339 insertions, 339 deletions
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 34bec493..88a975b7 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -171,7 +171,7 @@ void KAddressbookPlugin::processDropEvent( TQDropEvent *event )
}
KMessageBox::sorry( core(), i18n( "Cannot handle drop events of type '%1'." )
- .tqarg( event->format() ) );
+ .arg( event->format() ) );
}
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 16146f2c..14202cab 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -22,7 +22,7 @@
*/
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <dcopref.h>
@@ -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/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 01cef3a6..266823ff 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 195d853a..42625f70 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -23,7 +23,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <dcopref.h>
#include <kapplication.h>
@@ -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& ) ) );
@@ -142,8 +142,8 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
TQLabel *label =
new TQLabel( TQString( i18n("%1: number of unread messages "
"%2: total number of messages", "%1 / %2") )
- .tqarg( numUnreadMsg ).tqarg( numMsg ), this );
- label->tqsetAlignment( AlignLeft );
+ .arg( numUnreadMsg ).arg( numMsg ), this );
+ 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 );
@@ -166,7 +166,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
if ( e->type() == TQEvent::Enter )
- emit message( i18n( "Open Folder: \"%1\"" ).tqarg( label->text() ) );
+ emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
emit message( TQString() );
}
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 769c1acf..a723ef31 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -20,7 +20,7 @@
*/
#include <tqpopupmenu.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <kapplication.h>
#include <kdebug.h>
@@ -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 274d140e..7ae15485 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 <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <kactioncollection.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 79a45d21..17638d0c 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -30,8 +30,8 @@
*/
#include <tqtooltip.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
#include <kapplication.h>
#include <kglobalsettings.h>
@@ -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 2bd0456c..0fbd7d9a 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -23,7 +23,7 @@
#include <tqobject.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <dcopclient.h>
@@ -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<KURLLabel*>( 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() );
}
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 4466c5c6..115de0e9 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -23,7 +23,7 @@
#include <tqbuttongroup.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
@@ -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/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 7c2140b3..2262dcef 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -195,7 +195,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
KCal::Incidence *i = incidences.first();
TQString summary;
if ( dynamic_cast<KCal::Journal*>( i ) )
- summary = i18n( "Note: %1" ).tqarg( i->summary() );
+ summary = i18n( "Note: %1" ).arg( i->summary() );
else
summary = i->summary();
interface()->openEventEditor( summary, i->description(), TQString() );
@@ -219,22 +219,22 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
i18n("Drops of multiple mails are not supported." ) );
} else {
KPIM::MailSummary mail = mails.first();
- TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() )
- .tqarg( mail.to() ).tqarg( mail.subject() );
+ TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() )
+ .arg( mail.to() ).arg( mail.subject() );
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,
+ interface()->openEventEditor( i18n("Mail: %1").arg( mail.subject() ), txt,
uri, tf.name(), TQStringList(), "message/rfc822" );
}
return;
}
KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.")
- .tqarg( event->format() ) );
+ .arg( event->format() ) );
}
bool KOrganizerPlugin::queryClose() const {
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 7c3a1bed..8803f05f 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -23,7 +23,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <kdialog.h>
@@ -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 );
@@ -191,14 +191,14 @@ void SummaryWidget::updateView()
// Fill Event Summary Field
TQString newtext = ev->summary();
if ( ev->isMultiDay() && !ev->doesFloat() ) {
- newtext.append( TQString(" (%1/%2)").tqarg( dayof ).tqarg( span ) );
+ newtext.append( TQString(" (%1/%2)").arg( dayof ).arg( span ) );
}
KURLLabel *urlLabel = new KURLLabel( this );
urlLabel->setText( newtext );
urlLabel->setURL( ev->uid() );
urlLabel->installEventFilter( this );
- urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak );
+ urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak );
mLayout->addWidget( urlLabel, counter, 2 );
mLabels.append( urlLabel );
@@ -225,10 +225,10 @@ void SummaryWidget::updateView()
}
}
datestr = i18n( "Time from - to", "%1 - %2" )
- .tqarg( KGlobal::locale()->formatTime( sST ) )
- .tqarg( KGlobal::locale()->formatTime( sET ) );
+ .arg( KGlobal::locale()->formatTime( sST ) )
+ .arg( 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 );
}
@@ -288,7 +288,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
if ( e->type() == TQEvent::Enter )
- emit message( i18n( "Edit Appointment: \"%1\"" ).tqarg( label->text() ) );
+ emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
emit message( TQString() );
}
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index caaaaf91..e3ff2ba8 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -187,7 +187,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
KCal::Incidence *i = incidences.first();
TQString summary;
if ( dynamic_cast<KCal::Journal*>( i ) )
- summary = i18n( "Note: %1" ).tqarg( i->summary() );
+ summary = i18n( "Note: %1" ).arg( i->summary() );
else
summary = i->summary();
interface()->openTodoEditor( summary, i->description(), TQString() );
@@ -210,23 +210,23 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
i18n("Drops of multiple mails are not supported." ) );
} else {
KPIM::MailSummary mail = mails.first();
- TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() )
- .tqarg( mail.to() ).tqarg( mail.subject() );
+ TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() )
+ .arg( mail.to() ).arg( mail.subject() );
KTempFile tf;
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() ),
+ interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ),
txt, uri, tf.name(), TQStringList(), "message/rfc822", false );
}
return;
}
KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.")
- .tqarg( event->format() ) );
+ .arg( event->format() ) );
}
#include "todoplugin.moc"
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 0849dde7..b16b638c 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -23,7 +23,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <kdialog.h>
@@ -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;
@@ -253,7 +253,7 @@ bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
if ( e->type() == TQEvent::Enter )
- emit message( i18n( "Edit To-do: \"%1\"" ).tqarg( label->text() ) );
+ emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
emit message( TQString() );
}
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 46ec7fdf..51539f59 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -24,11 +24,11 @@
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqfile.h>
#include <tqlabel.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqvbox.h>
#include <dcopclient.h>
@@ -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->alignment() | 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?)" ) );
@@ -202,7 +202,7 @@ void SummaryWidget::showSyncLog( const TQString &filename )
TQFile f(filename);
if ( !f.open( IO_ReadOnly ) ) {
- KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).tqarg( filename ) );
+ KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).arg( filename ) );
return;
}
diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h
index b1b60a05..3e04ed88 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/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index fe2a20c6..4f0bbd38 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -23,7 +23,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqvaluevector.h>
#include <tqspinbox.h>
@@ -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/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h
index b092469a..0fe52d3b 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 2ba0dfcf..40eddd2f 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -21,10 +21,10 @@
without including the source code for TQt in the source distribution.
*/
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqeventloop.h>
#include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpixmap.h>
#include <tqpopupmenu.h>
#include <tqcursor.h>
@@ -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
@@ -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 a5940659..eb954ccf 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -25,7 +25,7 @@
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
@@ -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/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 3fbac9d2..733ef1ac 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -24,7 +24,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqimage.h>
#include <tqtooltip.h>
@@ -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 );
}
@@ -595,7 +595,7 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
if ( e->type() == TQEvent::Enter )
- emit message( i18n( "Mail to:\"%1\"" ).tqarg( label->text() ) );
+ emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
emit message( TQString() );
}
@@ -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/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp
index 63c1d3ce..4b5373b3 100644
--- a/kontact/plugins/summary/dropwidget.cpp
+++ b/kontact/plugins/summary/dropwidget.cpp
@@ -36,9 +36,9 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event )
void DropWidget::dropEvent( TQDropEvent *event )
{
- int tqalignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight );
- tqalignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom );
- emit summaryWidgetDropped( this, event->source(), tqalignment );
+ int alignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight );
+ alignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom );
+ emit summaryWidgetDropped( this, event->source(), alignment );
}
#include "dropwidget.moc"
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index e2d11c9e..c4fe2c8b 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -33,7 +33,7 @@ class DropWidget : public TQWidget
DropWidget( TQWidget *parent, const char *name = 0 );
signals:
- void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
+ void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
protected:
virtual void dragEnterEvent( TQDragEnterEvent* );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 47c9bca6..d9609569 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -33,7 +33,7 @@
#include <kplugininfo.h>
#include <ktrader.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqpixmap.h>
@@ -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* ) ) );
@@ -119,8 +119,8 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
void KCMKontactSummary::load()
{
KTrader::OfferList offers = KTrader::self()->query(
- TQString::tqfromLatin1( "Kontact/Plugin" ),
- TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
+ TQString::fromLatin1( "Kontact/Plugin" ),
+ TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
TQStringList activeSummaries;
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index d65228cd..93f48d66 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -23,7 +23,7 @@
#include <tqframe.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <dcopclient.h>
@@ -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& ) ) );
@@ -136,8 +136,8 @@ void SummaryViewPart::updateWidgets()
KPIM::IdentityManager idm( true, this );
const KPIM::Identity &id = idm.defaultIdentity();
- TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() );
- mUsernameLabel->setText( TQString::tqfromLatin1( "<b>%1</b>" ).tqarg( currentUser ) );
+ TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() );
+ mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).arg( currentUser ) );
mSummaries.clear();
@@ -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;
@@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets()
mRightColumn->addStretch();
}
-void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment )
+void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment )
{
if ( target == widget )
return;
@@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
if ( target == mFrame ) {
int pos = 0;
- if ( tqalignment & TQt::AlignTop )
+ if ( alignment & TQt::AlignTop )
pos = 0;
- if ( tqalignment & TQt::AlignLeft ) {
- if ( tqalignment & TQt::AlignBottom )
+ if ( alignment & TQt::AlignLeft ) {
+ if ( alignment & TQt::AlignBottom )
pos = mLeftColumnSummaries.count();
mLeftColumn->insertWidget( pos, widget );
mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) );
} else {
- if ( tqalignment & TQt::AlignBottom )
+ if ( alignment & TQt::AlignBottom )
pos = mRightColumnSummaries.count();
mRightColumn->insertWidget( pos, widget );
@@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
int targetPos = mLeftColumn->findWidget( target );
if ( targetPos != -1 ) {
- if ( tqalignment == TQt::AlignBottom )
+ if ( alignment == TQt::AlignBottom )
targetPos++;
mLeftColumn->insertWidget( targetPos, widget );
@@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
} else {
targetPos = mRightColumn->findWidget( target );
- if ( tqalignment == TQt::AlignBottom )
+ if ( alignment == TQt::AlignBottom )
targetPos++;
mRightColumn->insertWidget( targetPos, widget );
@@ -311,13 +311,13 @@ void SummaryViewPart::slotTextChanged()
void SummaryViewPart::slotAdjustPalette()
{
- mMainWidget->setPaletteBackgroundColor( kapp->tqpalette().active().base() );
+ mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() );
}
void SummaryViewPart::setDate( const TQDate& newDate )
{
TQString date( "<b>%1</b>" );
- date = date.tqarg( KGlobal::locale()->formatDate( newDate ) );
+ date = date.arg( KGlobal::locale()->formatDate( newDate ) );
mDateLabel->setText( date );
}
@@ -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/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 5a99b947..28a591dd 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -76,7 +76,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart
protected slots:
void slotConfigure();
void updateWidgets();
- void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment );
+ void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment );
private:
void initGUI( Kontact::Core *core );
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index 3c900a53..a114dd4d 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -25,7 +25,7 @@
#include "test_part.h"
#include "kaddressbookiface_stub.h"
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqcombobox.h>
#include "sidebarextension.h"
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index bf4d452a..a9dae3f0 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -22,7 +22,7 @@
*/
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <dcopclient.h>
@@ -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" ) );
@@ -101,50 +101,50 @@ void SummaryWidget::updateView()
for ( it = dataList.begin(); it != dataList.end(); ++it ) {
TQString cover;
for ( uint i = 0; i < (*it).cover().count(); ++i )
- cover += TQString( "- %1\n" ).tqarg( (*it).cover()[ i ] );
+ cover += TQString( "- %1\n" ).arg( (*it).cover()[ i ] );
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 );
urlLabel->setURL( (*it).stationID() );
urlLabel->setPixmap( img.smoothScale( 32, 32 ) );
- urlLabel->setMaximumSize( urlLabel->tqsizeHint() );
- urlLabel->tqsetAlignment( AlignTop );
- tqlayout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
+ urlLabel->setMaximumSize( urlLabel->sizeHint() );
+ urlLabel->setAlignment( AlignTop );
+ layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
mLabels.append( urlLabel );
connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
this, TQT_SLOT( showReport( const TQString& ) ) );
TQLabel* label = new TQLabel( this );
- label->setText( TQString( "%1 (%2)" ).tqarg( (*it).name() ).tqarg( (*it).temperature() ) );
+ label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) );
TQFont font = label->font();
font.setBold( true );
label->setFont( font );
- label->tqsetAlignment( AlignLeft );
- tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 );
+ label->setAlignment( AlignLeft );
+ layout->addMultiCellWidget( label, 0, 0, 1, 2 );
mLabels.append( label );
TQString labelText;
labelText = TQString( "<b>%1:</b> %2<br>"
"<b>%3:</b> %4<br>"
"<b>%5:</b> %6" )
- .tqarg( i18n( "Last updated on" ) )
- .tqarg( (*it).date() )
- .tqarg( i18n( "Wind Speed" ) )
- .tqarg( (*it).windSpeed() )
- .tqarg( i18n( "Rel. Humidity" ) )
- .tqarg( (*it).relativeHumidity() );
+ .arg( i18n( "Last updated on" ) )
+ .arg( (*it).date() )
+ .arg( i18n( "Wind Speed" ) )
+ .arg( (*it).windSpeed() )
+ .arg( i18n( "Rel. Humidity" ) )
+ .arg( (*it).relativeHumidity() );
TQToolTip::add( label, labelText.replace( " ", "&nbsp;" ) );
label = new TQLabel( cover, this );
- label->tqsetAlignment( AlignLeft );
- tqlayout->addMultiCellWidget( label, 1, 1, 1, 2 );
+ label->setAlignment( AlignLeft );
+ layout->addMultiCellWidget( label, 1, 1, 1, 2 );
mLabels.append( label );
}