summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/summary
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /kontact/plugins/summary
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz
tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kontact/plugins/summary')
-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
5 files changed, 30 insertions, 30 deletions
diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp
index 4b5373b3..63c1d3ce 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 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 );
+ 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 );
}
#include "dropwidget.moc"
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index c4fe2c8b..e2d11c9e 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 alignment );
+ void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
protected:
virtual void dragEnterEvent( TQDragEnterEvent* );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index d9609569..47c9bca6 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -33,7 +33,7 @@
#include <kplugininfo.h>
#include <ktrader.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqpixmap.h>
@@ -93,15 +93,15 @@ PluginView::~PluginView()
KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
: KCModule( parent, name )
{
- TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+ TQVBoxLayout *tqlayout = 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 );
- layout->addWidget( label );
+ tqlayout->addWidget( label );
mPluginView = new PluginView( this );
- layout->addWidget( mPluginView );
+ tqlayout->addWidget( mPluginView );
- layout->setStretchFactor( mPluginView, 1 );
+ tqlayout->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::fromLatin1( "Kontact/Plugin" ),
- TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+ TQString::tqfromLatin1( "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 93f48d66..d65228cd 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 <layout.h>
+#include <tqlayout.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::currentDate() );
+ setDate( TQDate::tqcurrentDate() );
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" ).arg( id.fullName() );
- mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).arg( currentUser ) );
+ TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() );
+ mUsernameLabel->setText( TQString::tqfromLatin1( "<b>%1</b>" ).tqarg( currentUser ) );
mSummaries.clear();
@@ -214,11 +214,11 @@ void SummaryViewPart::updateWidgets()
TQFrame *vline = new TQFrame( mFrame );
vline->setFrameStyle( TQFrame::VLine | TQFrame::Plain );
- TQHBoxLayout *layout = new TQHBoxLayout( mFrame );
+ TQHBoxLayout *tqlayout = new TQHBoxLayout( mFrame );
- mLeftColumn = new TQVBoxLayout( layout, KDialog::spacingHint() );
- layout->addWidget( vline );
- mRightColumn = new TQVBoxLayout( layout, KDialog::spacingHint() );
+ mLeftColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+ tqlayout->addWidget( vline );
+ mRightColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
TQStringList::Iterator strIt;
@@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets()
mRightColumn->addStretch();
}
-void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment )
+void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment )
{
if ( target == widget )
return;
@@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
if ( target == mFrame ) {
int pos = 0;
- if ( alignment & TQt::AlignTop )
+ if ( tqalignment & TQt::AlignTop )
pos = 0;
- if ( alignment & TQt::AlignLeft ) {
- if ( alignment & TQt::AlignBottom )
+ if ( tqalignment & TQt::AlignLeft ) {
+ if ( tqalignment & TQt::AlignBottom )
pos = mLeftColumnSummaries.count();
mLeftColumn->insertWidget( pos, widget );
mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) );
} else {
- if ( alignment & TQt::AlignBottom )
+ if ( tqalignment & 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 ( alignment == TQt::AlignBottom )
+ if ( tqalignment == 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 ( alignment == TQt::AlignBottom )
+ if ( tqalignment == TQt::AlignBottom )
targetPos++;
mRightColumn->insertWidget( targetPos, widget );
@@ -311,13 +311,13 @@ void SummaryViewPart::slotTextChanged()
void SummaryViewPart::slotAdjustPalette()
{
- mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() );
+ mMainWidget->setPaletteBackgroundColor( kapp->tqpalette().active().base() );
}
void SummaryViewPart::setDate( const TQDate& newDate )
{
TQString date( "<b>%1</b>" );
- date = date.arg( KGlobal::locale()->formatDate( newDate ) );
+ date = date.tqarg( 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->setAlignment( AlignRight );
+ mDateLabel->tqsetAlignment( 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 28a591dd..5a99b947 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 alignment );
+ void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment );
private:
void initGUI( Kontact::Core *core );