summaryrefslogtreecommitdiffstats
path: root/kaddressbook/views
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook/views')
-rw-r--r--kaddressbook/views/Makefile.am6
-rw-r--r--kaddressbook/views/cardview.cpp72
-rw-r--r--kaddressbook/views/cardview.h14
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp16
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp10
-rw-r--r--kaddressbook/views/configuretableviewdialog.h2
-rw-r--r--kaddressbook/views/contactlistview.cpp10
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp8
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp6
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp4
10 files changed, 74 insertions, 74 deletions
diff --git a/kaddressbook/views/Makefile.am b/kaddressbook/views/Makefile.am
index 39db0f589..98cf458ad 100644
--- a/kaddressbook/views/Makefile.am
+++ b/kaddressbook/views/Makefile.am
@@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
configurecardviewdialog.cpp \
kaddressbookcardview.cpp
libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_cardview_la_LIBADD = $(XXLIBS)
+libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC)
libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_iconview_la_LIBADD = $(XXLIBS)
+libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC)
libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
contactlistview.cpp \
kaddressbooktableview.cpp
libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_tableview_la_LIBADD = $(XXLIBS)
+libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY)
noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
configuretableviewdialog.h contactlistview.h \
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 6e7d71d67..5c8ccf827 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -107,9 +107,9 @@ class CardViewSeparator
cg.brush(TQColorGroup::Button) );
}
- void repaintSeparator()
+ void tqrepaintSeparator()
{
- mView->repaintContents( mRect );
+ mView->tqrepaintContents( mRect );
}
private:
@@ -355,7 +355,7 @@ int CardViewItem::height( bool allowCache ) const
for ( iter.toFirst(); iter.current(); ++iter ) {
if ( !sef && (*iter)->second.isEmpty() )
continue;
- lines = QMIN( (*iter)->second.contains( '\n' ) + 1, maxLines );
+ lines = QMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines );
fieldHeight += ( lines * fh ) + 2;
}
@@ -448,16 +448,16 @@ CardViewItem *CardViewItem::nextItem() const
return item;
}
-void CardViewItem::repaintCard()
+void CardViewItem::tqrepaintCard()
{
if ( mView )
- mView->repaintItem( this );
+ mView->tqrepaintItem( this );
}
void CardViewItem::setCaption( const TQString &caption )
{
d->mCaption = caption;
- repaintCard();
+ tqrepaintCard();
}
TQString CardViewItem::fieldValue( const TQString &label ) const
@@ -507,7 +507,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
Field *_f;
for ( _f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next() )
if ( se || ! _f->second.isEmpty() )
- y += ( QMIN( _f->second.contains( '\n' ) + 1, maxLines ) * fh ) + 2;
+ y += ( QMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2;
if ( isLabel && itempos.y() > y + fh )
return;
@@ -521,7 +521,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
trimmed = mView->d->mFm->width( s ) > mw - colonWidth;
} else {
TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) );
- trimmed = r.width() > mw || r.height() / fh > QMIN( s.contains( '\n' ) + 1, maxLines );
+ trimmed = r.width() > mw || r.height() / fh > QMIN( s.tqcontains( '\n' ) + 1, maxLines );
}
}
@@ -560,7 +560,7 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const
Field *f;
for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() ) {
if ( showEmpty || !f->second.isEmpty() )
- ypos += (QMIN( f->second.contains( '\n' )+1, maxLines ) * fh) + 2;
+ ypos += (QMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2;
if ( iy <= ypos )
break;
}
@@ -653,9 +653,9 @@ void CardView::setCurrentItem( CardViewItem *item )
CardViewItem *it = d->mCurrentItem;
d->mCurrentItem = item;
if ( it )
- it->repaintCard();
+ it->tqrepaintCard();
- item->repaintCard();
+ item->tqrepaintCard();
}
if ( ! d->mOnSeparator )
@@ -671,7 +671,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const
bool found = false;
for ( iter.toFirst(); iter.current() && !found; ++iter ) {
item = *iter;
- if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).contains( viewPos ) )
+ if ( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ).tqcontains( viewPos ) )
found = true;
}
@@ -681,7 +681,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const
return 0;
}
-TQRect CardView::itemRect( const CardViewItem *item ) const
+TQRect CardView::tqitemRect( const CardViewItem *item ) const
{
return TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
}
@@ -692,9 +692,9 @@ void CardView::ensureItemVisible( const CardViewItem *item )
ensureVisible( item->d->x + d->mItemWidth, item->d->y, d->mItemSpacing, 0 );
}
-void CardView::repaintItem( const CardViewItem *item )
+void CardView::tqrepaintItem( const CardViewItem *item )
{
- repaintContents( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ) );
+ tqrepaintContents( TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() ) );
}
void CardView::setSelectionMode( CardView::SelectionMode mode )
@@ -716,7 +716,7 @@ void CardView::selectAll( bool state )
for ( iter.toFirst(); iter.current(); ++iter ) {
if ( (*iter)->isSelected() ) {
(*iter)->setSelected( false );
- (*iter)->repaintCard();
+ (*iter)->tqrepaintCard();
}
}
@@ -743,7 +743,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
CardViewItem *it = d->mCurrentItem;
d->mCurrentItem = item;
if ( it )
- it->repaintCard();
+ it->tqrepaintCard();
}
if ( d->mSelectionMode == CardView::Single ) {
@@ -754,7 +754,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
if ( selected ) {
item->setSelected( selected );
- item->repaintCard();
+ item->tqrepaintCard();
emit selectionChanged();
emit selectionChanged( item );
} else {
@@ -763,7 +763,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
}
} else if ( d->mSelectionMode == CardView::Multi ) {
item->setSelected( selected );
- item->repaintCard();
+ item->tqrepaintCard();
emit selectionChanged();
} else if ( d->mSelectionMode == CardView::Extended ) {
bool b = signalsBlocked();
@@ -772,7 +772,7 @@ void CardView::setSelected( CardViewItem *item, bool selected )
blockSignals( b );
item->setSelected( selected );
- item->repaintCard();
+ item->tqrepaintCard();
emit selectionChanged();
}
}
@@ -860,7 +860,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
item = *iter;
cardRect.setRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
- if ( clipRect.intersects( cardRect ) || clipRect.contains( cardRect ) ) {
+ if ( clipRect.intersects( cardRect ) || clipRect.tqcontains( cardRect ) ) {
// Tell the card to paint
p->save();
p->translate( cardRect.x(), cardRect.y() );
@@ -875,7 +875,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
sep = *sepIter;
sepRect = sep->mRect;
- if ( clipRect.intersects( sepRect ) || clipRect.contains( sepRect ) ) {
+ if ( clipRect.intersects( sepRect ) || clipRect.tqcontains( sepRect ) ) {
p->save();
p->translate( sepRect.x(), sepRect.y() );
sep->paintSeparator( p, cg );
@@ -893,7 +893,7 @@ void CardView::resizeEvent( TQResizeEvent *event )
void CardView::calcLayout()
{
- // Start in the upper left corner and layout all the
+ // Start in the upper left corner and tqlayout all the
// cars using their height and width
int maxWidth = 0;
int maxHeight = 0;
@@ -1048,12 +1048,12 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
blockSignals( b );
item->setSelected( true );
- item->repaintCard();
+ item->tqrepaintCard();
emit selectionChanged( item );
} else if ( d->mSelectionMode == CardView::Multi ) {
// toggle the selection
item->setSelected( !item->isSelected() );
- item->repaintCard();
+ item->tqrepaintCard();
emit selectionChanged();
} else if ( d->mSelectionMode == CardView::Extended ) {
if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::ShiftButton) ) {
@@ -1079,13 +1079,13 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
for ( ; from <= to; from++ ) {
aItem = d->mItemList.at( from );
aItem->setSelected( s );
- repaintItem( aItem );
+ tqrepaintItem( aItem );
}
emit selectionChanged();
} else if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::ControlButton) ) {
item->setSelected( !item->isSelected() );
- item->repaintCard();
+ item->tqrepaintCard();
emit selectionChanged();
} else if ( e->button() & Qt::LeftButton ) {
bool b = signalsBlocked();
@@ -1094,7 +1094,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
blockSignals( b );
item->setSelected( true );
- item->repaintCard();
+ item->tqrepaintCard();
emit selectionChanged();
}
}
@@ -1202,13 +1202,13 @@ void CardView::focusInEvent( TQFocusEvent* )
if ( !d->mCurrentItem && d->mItemList.count() )
setCurrentItem( d->mItemList.first() );
else if ( d->mCurrentItem )
- d->mCurrentItem->repaintCard();
+ d->mCurrentItem->tqrepaintCard();
}
void CardView::focusOutEvent( TQFocusEvent* )
{
if ( d->mCurrentItem )
- d->mCurrentItem->repaintCard();
+ d->mCurrentItem->tqrepaintCard();
}
void CardView::keyPressEvent( TQKeyEvent *e )
@@ -1324,7 +1324,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
break;
case Key_Menu:
emit contextMenuRequested( d->mCurrentItem, viewport()->mapToGlobal(
- itemRect(d->mCurrentItem).center() ) );
+ tqitemRect(d->mCurrentItem).center() ) );
break;
default:
if ( (e->state() & ControlButton) && e->key() == Key_A ) {
@@ -1363,7 +1363,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
for ( ; from <= to; from++ ) {
item = d->mItemList.at( from );
item->setSelected( s );
- repaintItem( item );
+ tqrepaintItem( item );
}
emit selectionChanged();
@@ -1392,7 +1392,7 @@ void CardView::setLayoutDirty( bool dirty )
{
if ( d->mLayoutDirty != dirty ) {
d->mLayoutDirty = dirty;
- repaint();
+ tqrepaint();
}
}
@@ -1400,7 +1400,7 @@ void CardView::setDrawCardBorder( bool enabled )
{
if ( enabled != d->mDrawCardBorder ) {
d->mDrawCardBorder = enabled;
- repaint();
+ tqrepaint();
}
}
@@ -1426,7 +1426,7 @@ void CardView::setDrawFieldLabels( bool enabled )
{
if ( enabled != d->mDrawFieldLabels ) {
d->mDrawFieldLabels = enabled;
- repaint();
+ tqrepaint();
}
}
@@ -1462,7 +1462,7 @@ void CardView::tryShowFullText()
CardViewItem *item = itemAt( cpos );
if ( item ) {
// query it for a value to display
- TQPoint ipos = cpos - itemRect( item ).topLeft();
+ TQPoint ipos = cpos - tqitemRect( item ).topLeft();
item->showFullString( ipos, d->mTip );
}
}
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index 5ab75e6ca..a5410419a 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -87,10 +87,10 @@ class CardViewItem
virtual void paintCard( TQPainter *p, TQColorGroup &cg );
/**
- Repaints the card. This is done by sending a repaint event to the
+ Repaints the card. This is done by sending a tqrepaint event to the
view with the clip rect defined as this card.
*/
- virtual void repaintCard();
+ virtual void tqrepaintCard();
/**
Adds a field to the card.
@@ -244,7 +244,7 @@ class CardView : public QScrollView
/**
@return The bounding rect of the given item.
*/
- TQRect itemRect( const CardViewItem *item ) const;
+ TQRect tqitemRect( const CardViewItem *item ) const;
/**
Ensures that the given item is in the viewable area of the widget
@@ -254,7 +254,7 @@ class CardView : public QScrollView
/**
Repaints the given item.
*/
- void repaintItem( const CardViewItem *item );
+ void tqrepaintItem( const CardViewItem *item );
enum SelectionMode { Single, Multi, Extended, NoSelection };
@@ -515,7 +515,7 @@ class CardView : public QScrollView
void drawContents( TQPainter *p, int clipx, int clipy, int clipw, int cliph );
/**
- Sets the layout to dirty and repaints.
+ Sets the tqlayout to dirty and tqrepaints.
*/
void resizeEvent( TQResizeEvent* );
@@ -525,13 +525,13 @@ class CardView : public QScrollView
void contentsWheelEvent( TQWheelEvent* );
/**
- Sets the layout to dirty and calls for a repaint.
+ Sets the tqlayout to dirty and calls for a tqrepaint.
*/
void setLayoutDirty( bool dirty );
/**
Does the math based on the bounding rect of the cards to properly
- lay the cards out on the screen. This is only done if the layout is
+ lay the cards out on the screen. This is only done if the tqlayout is
marked as dirty.
*/
void calcLayout();
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index ed7cfda1f..919e49878 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -94,19 +94,19 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
c = KGlobalSettings::baseColor();
lbColors->insertItem( new ColorListItem( i18n("Background Color"),
config->readColorEntry( "BackgroundColor", &c ) ) );
- c = colorGroup().foreground();
+ c = tqcolorGroup().foreground();
lbColors->insertItem( new ColorListItem( i18n("Text Color"),
config->readColorEntry( "TextColor", &c ) ) );
- c = colorGroup().button();
+ c = tqcolorGroup().button();
lbColors->insertItem( new ColorListItem( i18n("Header, Border & Separator Color"),
config->readColorEntry( "HeaderColor", &c ) ) );
- c = colorGroup().buttonText();
+ c = tqcolorGroup().buttonText();
lbColors->insertItem( new ColorListItem( i18n("Header Text Color"),
config->readColorEntry( "HeaderTextColor", &c ) ) );
- c = colorGroup().highlight();
+ c = tqcolorGroup().highlight();
lbColors->insertItem( new ColorListItem( i18n("Highlight Color"),
config->readColorEntry( "HighlightColor", &c ) ) );
- c = colorGroup().highlightedText();
+ c = tqcolorGroup().highlightedText();
lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"),
config->readColorEntry( "HighlightedTextColor", &c ) ) );
@@ -120,7 +120,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) );
enableFonts();
- // layout
+ // tqlayout
sbMargin->setValue( config->readNumEntry( "ItemMargin", 0 ) );
sbSpacing->setValue( config->readNumEntry( "ItemSpacing", 10 ) );
sbSepWidth->setValue( config->readNumEntry( "SeparatorWidth", 2 ) );
@@ -152,7 +152,7 @@ void CardViewLookNFeelPage::saveSettings( KConfig *config )
config->writeEntry( "TextFont", lTextFont->font() );
config->writeEntry( "HeaderFont", lHeaderFont->font() );
}
- // layout
+ // tqlayout
config->writeEntry( "ItemMargin", sbMargin->value() );
config->writeEntry( "ItemSpacing", sbSpacing->value() );
config->writeEntry( "SeparatorWidth", sbSepWidth->value() );
@@ -196,7 +196,7 @@ void CardViewLookNFeelPage::initGUI()
TQTabWidget *tabs = new TQTabWidget( this );
// Layout
- TQVBox *loTab = new TQVBox( this, "layouttab" );
+ TQVBox *loTab = new TQVBox( this, "tqlayouttab" );
loTab->setSpacing( spacing );
loTab->setMargin( margin );
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index c79ef5244..d65f42d38 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -111,11 +111,11 @@ void LookAndFeelPage::saveSettings( KConfig *config )
void LookAndFeelPage::initGUI()
{
- TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
+ TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
i18n("Row Separator"), this);
- layout->addWidget(group);
+ tqlayout->addWidget(group);
mAlternateButton = new TQRadioButton(i18n("Alternating backgrounds"),
group, "mAlternateButton");
@@ -124,7 +124,7 @@ void LookAndFeelPage::initGUI()
// Background Checkbox/Selector
TQHBoxLayout *backgroundLayout = new TQHBoxLayout();
- layout->addLayout(backgroundLayout);
+ tqlayout->addLayout(backgroundLayout);
mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this,
"mBackgroundBox");
@@ -141,10 +141,10 @@ void LookAndFeelPage::initGUI()
// ToolTip Checkbox
mToolTipBox = new TQCheckBox(i18n("Enable contact tooltips"), this,
"mToolTipBox");
- layout->addWidget(mToolTipBox);
+ tqlayout->addWidget(mToolTipBox);
#if KDE_IS_VERSION(3,2,90)
mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" );
- layout->addWidget( mIMPresenceBox );
+ tqlayout->addWidget( mIMPresenceBox );
#endif
}
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index 58bac86d3..2e3378b4c 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -58,7 +58,7 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
};
/**
- Internal class. It is only defined here for moc
+ Internal class. It is only defined here for tqmoc
*/
class LookAndFeelPage : public QWidget
{
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 0bc7c041d..5b9ecbf11 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -54,10 +54,10 @@ DynamicTip::DynamicTip( ContactListView *parent)
void DynamicTip::maybeTip( const TQPoint &pos )
{
- if (!parentWidget()->inherits( "ContactListView" ))
+ if (!tqparentWidget()->inherits( "ContactListView" ))
return;
- ContactListView *plv = (ContactListView*)parentWidget();
+ ContactListView *plv = (ContactListView*)tqparentWidget();
if (!plv->tooltips())
return;
@@ -72,7 +72,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
return;
TQString s;
- TQRect r = plv->itemRect( lvi );
+ TQRect r = plv->tqitemRect( lvi );
r.moveBy( posVp.x(), posVp.y() );
//kdDebug(5720) << "Tip rec: " << r.x() << "," << r.y() << "," << r.width()
@@ -109,7 +109,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
linew += fm.width( notes[i] );
if ( lastSpace >= a && notes[i] != '\n' )
- if (linew >= parentWidget()->width()) {
+ if (linew >= tqparentWidget()->width()) {
doBreak = true;
if ( lastSpace > a ) {
i = lastSpace;
@@ -222,7 +222,7 @@ void ContactListViewItem::refresh()
}
// Update our addressee, since it may have changed elsewhere
- mAddressee = mDocument->findByUid(mAddressee.uid());
+ mAddressee = mDocument->tqfindByUid(mAddressee.uid());
if (mAddressee.isEmpty())
return;
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 7ba89a0ed..2f0c859c5 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -87,7 +87,7 @@ class AddresseeCardViewItem : public CardViewItem
void refresh()
{
- mAddressee = mDocument->findByUid( mAddressee.uid() );
+ mAddressee = mDocument->tqfindByUid( mAddressee.uid() );
if ( !mAddressee.isEmpty() ) {
clearFields();
@@ -96,7 +96,7 @@ class AddresseeCardViewItem : public CardViewItem
const KABC::Field::List::ConstIterator endIt( mFields.end() );
for ( ; it != endIt; ++it ) {
// insert empty fields or not? not doing so saves a bit of memory and CPU
- // (during geometry calculations), but prevents having equally
+ // (during tqgeometry calculations), but prevents having equally
// wide label columns in all cards, unless CardViewItem/CardView search
// globally for the widest label. (anders)
@@ -149,11 +149,11 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core,
{
mShowEmptyFields = false;
- TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
mCardView = new AddresseeCardView( viewWidget(), "mCardView" );
mCardView->setSelectionMode( CardView::Extended );
- layout->addWidget( mCardView );
+ tqlayout->addWidget( mCardView );
// Connect up the signals
connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 6d02acf73..58b4a3409 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -106,7 +106,7 @@ class AddresseeIconViewItem : public KIconViewItem
void refresh()
{
- mAddressee = mDocument->findByUid( mAddressee.uid() );
+ mAddressee = mDocument->tqfindByUid( mAddressee.uid() );
if ( !mAddressee.isEmpty() )
setText( mAddressee.givenName() + " " + mAddressee.familyName() );
@@ -139,10 +139,10 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core,
TQWidget *parent, const char *name)
: KAddressBookView( core, parent, name )
{
- TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
+ TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
mIconView = new AddresseeIconView( viewWidget(), "mIconView" );
- layout->addWidget( mIconView );
+ tqlayout->addWidget( mIconView );
// Connect up the signals
connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 7f822ae4d..89caa0455 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -210,7 +210,7 @@ void KAddressBookTableView::readConfig( KConfig *config )
if ( config->readBoolEntry( "Background", false ) )
mListView->setBackgroundPixmap( config->readPathEntry( "BackgroundName" ) );
- // Restore the layout of the listview
+ // Restore the tqlayout of the listview
mListView->restoreLayout( config, config->group() );
}
@@ -244,7 +244,7 @@ void KAddressBookTableView::refresh( const TQString &uid )
// Sometimes the background pixmap gets messed up when we add lots
// of items.
- mListView->repaint();
+ mListView->tqrepaint();
if ( currentItem ) {
mListView->setCurrentItem( currentItem );