summaryrefslogtreecommitdiffstats
path: root/kaddressbook/views
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 /kaddressbook/views
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 'kaddressbook/views')
-rw-r--r--kaddressbook/views/cardview.cpp16
-rw-r--r--kaddressbook/views/cardview.h10
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp18
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp12
-rw-r--r--kaddressbook/views/contactlistview.cpp14
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp8
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp6
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp6
8 files changed, 45 insertions, 45 deletions
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index df956398e..03216b05b 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::tqitemRect( const CardViewItem *item ) const
+TQRect CardView::itemRect( 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()->tqpalette().active();
+ TQColorGroup cg = viewport()->palette().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 tqlayout all the
+ // Start in the upper left corner and layout 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(
- tqitemRect(d->mCurrentItem).center() ) );
+ itemRect(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;
- tqrepaint();
+ repaint();
}
}
@@ -1400,7 +1400,7 @@ void CardView::setDrawCardBorder( bool enabled )
{
if ( enabled != d->mDrawCardBorder ) {
d->mDrawCardBorder = enabled;
- tqrepaint();
+ repaint();
}
}
@@ -1426,7 +1426,7 @@ void CardView::setDrawFieldLabels( bool enabled )
{
if ( enabled != d->mDrawFieldLabels ) {
d->mDrawFieldLabels = enabled;
- tqrepaint();
+ repaint();
}
}
@@ -1462,7 +1462,7 @@ void CardView::tryShowFullText()
CardViewItem *item = itemAt( cpos );
if ( item ) {
// query it for a value to display
- TQPoint ipos = cpos - tqitemRect( item ).topLeft();
+ TQPoint ipos = cpos - itemRect( item ).topLeft();
item->showFullString( ipos, d->mTip );
}
}
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index e3c29e5a4..0bd70e1de 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 tqrepaint event to the
+ Repaints the card. This is done by sending a repaint 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 tqitemRect( const CardViewItem *item ) const;
+ TQRect itemRect( 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 tqlayout to dirty and repaints.
+ Sets the layout to dirty and repaints.
*/
void resizeEvent( TQResizeEvent* );
@@ -526,13 +526,13 @@ class CardView : public TQScrollView
void contentsWheelEvent( TQWheelEvent* );
/**
- Sets the tqlayout to dirty and calls for a tqrepaint.
+ Sets the layout to dirty and calls for a repaint.
*/
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 tqlayout is
+ lay the cards out on the screen. This is only done if the layout is
marked as dirty.
*/
void calcLayout();
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 8cacbfec6..a2861c712 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -22,7 +22,7 @@
*/
#include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.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 = tqcolorGroup().foreground();
+ c = colorGroup().foreground();
lbColors->insertItem( new ColorListItem( i18n("Text Color"),
config->readColorEntry( "TextColor", &c ) ) );
- c = tqcolorGroup().button();
+ c = colorGroup().button();
lbColors->insertItem( new ColorListItem( i18n("Header, Border & Separator Color"),
config->readColorEntry( "HeaderColor", &c ) ) );
- c = tqcolorGroup().buttonText();
+ c = colorGroup().buttonText();
lbColors->insertItem( new ColorListItem( i18n("Header Text Color"),
config->readColorEntry( "HeaderTextColor", &c ) ) );
- c = tqcolorGroup().highlight();
+ c = colorGroup().highlight();
lbColors->insertItem( new ColorListItem( i18n("Highlight Color"),
config->readColorEntry( "HighlightColor", &c ) ) );
- c = tqcolorGroup().highlightedText();
+ c = colorGroup().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();
- // tqlayout
+ // layout
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() );
}
- // tqlayout
+ // layout
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" ).tqarg( fnt.pointSize() ) );
+ l->setText( TQString( fnt.family() + " %1" ).arg( fnt.pointSize() ) );
}
#include "configurecardviewdialog.moc"
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 404746dc1..4e3cba97f 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqcheckbox.h>
#include <tqvbox.h>
@@ -111,11 +111,11 @@ void LookAndFeelPage::saveSettings( KConfig *config )
void LookAndFeelPage::initGUI()
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
i18n("Row Separator"), this);
- tqlayout->addWidget(group);
+ layout->addWidget(group);
mAlternateButton = new TQRadioButton(i18n("Alternating backgrounds"),
group, "mAlternateButton");
@@ -124,7 +124,7 @@ void LookAndFeelPage::initGUI()
// Background Checkbox/Selector
TQHBoxLayout *backgroundLayout = new TQHBoxLayout();
- tqlayout->addLayout(backgroundLayout);
+ layout->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");
- tqlayout->addWidget(mToolTipBox);
+ layout->addWidget(mToolTipBox);
#if KDE_IS_VERSION(3,2,90)
mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" );
- tqlayout->addWidget( mIMPresenceBox );
+ layout->addWidget( mIMPresenceBox );
#endif
}
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 0807cce64..75d521dad 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 <tqbrush.h>
+#include <brush.h>
#include <tqevent.h>
#include <klocale.h>
@@ -72,7 +72,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
return;
TQString s;
- TQRect r = plv->tqitemRect( lvi );
+ TQRect r = plv->itemRect( 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").tqarg(a.formattedNameLabel())
- .tqarg(a.formattedName());
+ s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel())
+ .arg(a.formattedName());
s += '\n';
- s += i18n("label: value", "%1: %2").tqarg(a.organizationLabel())
- .tqarg(a.organization());
+ s += i18n("label: value", "%1: %2").arg(a.organizationLabel())
+ .arg(a.organization());
TQString notes = a.note().stripWhiteSpace();
if ( !notes.isEmpty() ) {
notes += '\n';
- s += '\n' + i18n("label: value", "%1: \n").tqarg(a.noteLabel());
+ s += '\n' + i18n("label: value", "%1: \n").arg(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 211b62dd4..b2eb54305 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 <tqlayout.h>
+#include <layout.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 tqgeometry calculations), but prevents having equally
+ // (during geometry 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 *tqlayout = new TQVBoxLayout( viewWidget() );
+ TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
mCardView = new AddresseeCardView( viewWidget(), "mCardView" );
mCardView->setSelectionMode( CardView::Extended );
- tqlayout->addWidget( mCardView );
+ layout->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 b99bca85c..c7907ef2f 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -23,7 +23,7 @@
#include <tqapplication.h>
#include <tqiconview.h>
-#include <tqlayout.h>
+#include <layout.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 *tqlayout = new TQVBoxLayout( viewWidget() );
+ TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
mIconView = new AddresseeIconView( viewWidget(), "mIconView" );
- tqlayout->addWidget( mIconView );
+ layout->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 19364d597..25e7f6719 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -22,7 +22,7 @@
*/
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.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 tqlayout of the listview
+ // Restore the layout 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->tqrepaint();
+ mListView->repaint();
if ( currentItem ) {
mListView->setCurrentItem( currentItem );