diff options
Diffstat (limited to 'kaddressbook/views')
-rw-r--r-- | kaddressbook/views/cardview.cpp | 16 | ||||
-rw-r--r-- | kaddressbook/views/cardview.h | 10 | ||||
-rw-r--r-- | kaddressbook/views/configurecardviewdialog.cpp | 18 | ||||
-rw-r--r-- | kaddressbook/views/configuretableviewdialog.cpp | 12 | ||||
-rw-r--r-- | kaddressbook/views/contactlistview.cpp | 14 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbookcardview.cpp | 8 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbookiconview.cpp | 6 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 6 |
8 files changed, 45 insertions, 45 deletions
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 03216b05b..df956398e 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -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() ); } @@ -843,7 +843,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy, calcLayout(); // allow setting costum colors in the viewport pale - TQColorGroup cg = viewport()->palette().active(); + TQColorGroup cg = viewport()->tqpalette().active(); TQRect clipRect( clipx, clipy, clipw, cliph ); TQRect cardRect; @@ -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; @@ -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 ) { @@ -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 0bd70e1de..e3c29e5a4 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -87,7 +87,7 @@ 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(); @@ -245,7 +245,7 @@ class CardView : public TQScrollView /** @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 @@ -516,7 +516,7 @@ class CardView : public TQScrollView 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 repaints. */ void resizeEvent( TQResizeEvent* ); @@ -526,13 +526,13 @@ class CardView : public TQScrollView 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 a2861c712..8cacbfec6 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -22,7 +22,7 @@ */ #include <tqstring.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqvbox.h> @@ -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() ); @@ -313,7 +313,7 @@ void CardViewLookNFeelPage::initGUI() void CardViewLookNFeelPage::updateFontLabel( TQFont fnt, TQLabel *l ) { l->setFont( fnt ); - l->setText( TQString( fnt.family() + " %1" ).arg( fnt.pointSize() ) ); + l->setText( TQString( fnt.family() + " %1" ).tqarg( fnt.pointSize() ) ); } #include "configurecardviewdialog.moc" diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 4e3cba97f..404746dc1 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqvbox.h> @@ -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/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 75d521dad..0807cce64 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -27,7 +27,7 @@ #include <tqdragobject.h> #include <tqcombobox.h> #include <tqpainter.h> -#include <brush.h> +#include <tqbrush.h> #include <tqevent.h> #include <klocale.h> @@ -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() @@ -82,17 +82,17 @@ void DynamicTip::maybeTip( const TQPoint &pos ) if (a.isEmpty()) return; - s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel()) - .arg(a.formattedName()); + s += i18n("label: value", "%1: %2").tqarg(a.formattedNameLabel()) + .tqarg(a.formattedName()); s += '\n'; - s += i18n("label: value", "%1: %2").arg(a.organizationLabel()) - .arg(a.organization()); + s += i18n("label: value", "%1: %2").tqarg(a.organizationLabel()) + .tqarg(a.organization()); TQString notes = a.note().stripWhiteSpace(); if ( !notes.isEmpty() ) { notes += '\n'; - s += '\n' + i18n("label: value", "%1: \n").arg(a.noteLabel()); + s += '\n' + i18n("label: value", "%1: \n").tqarg(a.noteLabel()); TQFontMetrics fm( font() ); // Begin word wrap code based on TQMultiLineEdit code diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index b2eb54305..211b62dd4 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -25,7 +25,7 @@ #include <tqdragobject.h> #include <tqevent.h> #include <tqiconview.h> -#include <layout.h> +#include <tqlayout.h> #include <tqstringlist.h> #include <kabc/addressbook.h> @@ -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 c7907ef2f..b99bca85c 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -23,7 +23,7 @@ #include <tqapplication.h> #include <tqiconview.h> -#include <layout.h> +#include <tqlayout.h> #include <tqstringlist.h> #include <kabc/addressbook.h> @@ -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 25e7f6719..19364d597 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -22,7 +22,7 @@ */ #include <tqapplication.h> -#include <layout.h> +#include <tqlayout.h> #include <tqheader.h> #include <tqvbox.h> #include <tqlistbox.h> @@ -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 ); |