summaryrefslogtreecommitdiffstats
path: root/kaddressbook/views
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook/views')
-rw-r--r--kaddressbook/views/cardview.cpp16
-rw-r--r--kaddressbook/views/cardview.h2
-rw-r--r--kaddressbook/views/colorlistbox.cpp2
-rw-r--r--kaddressbook/views/colorlistbox.h2
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp12
-rw-r--r--kaddressbook/views/configurecardviewdialog.h2
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp6
-rw-r--r--kaddressbook/views/configuretableviewdialog.h2
-rw-r--r--kaddressbook/views/contactlistview.cpp6
-rw-r--r--kaddressbook/views/contactlistview.h2
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp56
-rw-r--r--kaddressbook/views/kaddressbookcardview.h4
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp36
-rw-r--r--kaddressbook/views/kaddressbookiconview.h4
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp56
-rw-r--r--kaddressbook/views/kaddressbooktableview.h2
16 files changed, 105 insertions, 105 deletions
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 9b1ef52a..749dc13f 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg )
// if we are the current item and the view has focus, draw focus rect
if ( mView->currentItem() == this && mView->hasFocus() ) {
- mView->style().tqdrawPrimitive( TQStyle::PE_FocusRect, p,
+ mView->style().drawPrimitive( TQStyle::PE_FocusRect, p,
TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg,
TQStyle::Style_FocusAtBorder,
TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) );
@@ -587,10 +587,10 @@ CardView::CardView( TQWidget *parent, const char *name )
viewport()->setMouseTracking( true );
viewport()->setFocusProxy( this );
- viewport()->setFocusPolicy(TQ_WheelFocus );
+ viewport()->setFocusPolicy(TQWidget::WheelFocus );
viewport()->setBackgroundMode( PaletteBase );
- connect( d->mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryShowFullText() ) );
+ connect( d->mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryShowFullText() ) );
setBackgroundMode( PaletteBackground, PaletteBase );
@@ -1022,7 +1022,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
emit clicked( item );
// The RMB click
- if ( e->button() & Qt::RightButton ) {
+ if ( e->button() & TQt::RightButton ) {
// clear previous selection
bool blocked = signalsBlocked();
blockSignals( true );
@@ -1056,7 +1056,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
item->repaintCard();
emit selectionChanged();
} else if ( d->mSelectionMode == CardView::Extended ) {
- if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
+ if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
if ( item == other )
return;
@@ -1083,11 +1083,11 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
}
emit selectionChanged();
- } else if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ControlButton) ) {
+ } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) {
item->setSelected( !item->isSelected() );
item->repaintCard();
emit selectionChanged();
- } else if ( e->button() & Qt::LeftButton ) {
+ } else if ( e->button() & TQt::LeftButton ) {
bool b = signalsBlocked();
blockSignals( true );
selectAll( false );
@@ -1158,7 +1158,7 @@ void CardView::contentsMouseMoveEvent( TQMouseEvent *e )
return;
}
- if ( d->mLastClickOnItem && (e->state() & Qt::LeftButton) &&
+ if ( d->mLastClickOnItem && (e->state() & TQt::LeftButton) &&
((e->pos() - d->mLastClickPos).manhattanLength() > 4)) {
startDrag();
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index d064e03d..92c7f8f2 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -195,7 +195,7 @@ class CardView : public TQScrollView
{
friend class CardViewItem;
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp
index 54ad38b3..a72a644b 100644
--- a/kaddressbook/views/colorlistbox.cpp
+++ b/kaddressbook/views/colorlistbox.cpp
@@ -28,7 +28,7 @@
ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
:TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1)
{
- connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
+ connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) );
setAcceptDrops( true);
}
diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h
index 62b7e5a8..f860bf82 100644
--- a/kaddressbook/views/colorlistbox.h
+++ b/kaddressbook/views/colorlistbox.h
@@ -25,7 +25,7 @@
class ColorListBox : public TDEListBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 2fe22f8c..cbe70109 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -201,7 +201,7 @@ void CardViewLookNFeelPage::initGUI()
loTab->setSpacing( spacing );
loTab->setMargin( margin );
- TQGroupBox *gbGeneral = new TQGroupBox( 1, Qt::Horizontal, i18n("General"), loTab );
+ TQGroupBox *gbGeneral = new TQGroupBox( 1, TQt::Horizontal, i18n("General"), loTab );
cbDrawSeps = new TQCheckBox( i18n("Draw &separators"), gbGeneral );
@@ -215,7 +215,7 @@ void CardViewLookNFeelPage::initGUI()
sbSpacing = new TQSpinBox( 0, 100, 1, hbPadding );
lSpacing->setBuddy( sbSpacing );
- TQGroupBox *gbCards = new TQGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
+ TQGroupBox *gbCards = new TQGroupBox( 1, TQt::Horizontal, i18n("Cards"), loTab );
TQHBox *hbMargin = new TQHBox( gbCards );
TQLabel *lMargin = new TQLabel( i18n("&Margin:"), hbMargin );
@@ -246,7 +246,7 @@ void CardViewLookNFeelPage::initGUI()
colorTab->setSpacing( spacing );
colorTab->setMargin( spacing );
cbEnableCustomColors = new TQCheckBox( i18n("&Enable custom colors"), colorTab );
- connect( cbEnableCustomColors, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableColors()) );
+ connect( cbEnableCustomColors, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableColors()) );
lbColors = new ColorListBox( colorTab );
tabs->addTab( colorTab, i18n("&Colors") );
@@ -265,7 +265,7 @@ void CardViewLookNFeelPage::initGUI()
fntTab->setMargin( spacing );
cbEnableCustomFonts = new TQCheckBox( i18n("&Enable custom fonts"), fntTab );
- connect( cbEnableCustomFonts, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableFonts()) );
+ connect( cbEnableCustomFonts, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableFonts()) );
vbFonts = new TQWidget( fntTab );
TQGridLayout *gFnts = new TQGridLayout( vbFonts, 2, 3 );
@@ -277,14 +277,14 @@ void CardViewLookNFeelPage::initGUI()
lTextFont->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
btnFont = new KPushButton( i18n("Choose..."), vbFonts );
lTFnt->setBuddy( btnFont );
- connect( btnFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTextFont()) );
+ connect( btnFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setTextFont()) );
TQLabel *lHFnt = new TQLabel( i18n("&Header font:"), vbFonts );
lHeaderFont = new TQLabel( vbFonts );
lHeaderFont->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
btnHeaderFont = new KPushButton( i18n("Choose..."), vbFonts );
lHFnt->setBuddy( btnHeaderFont );
- connect( btnHeaderFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHeaderFont()) );
+ connect( btnHeaderFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setHeaderFont()) );
fntTab->setStretchFactor( new TQWidget( fntTab ), 1 );
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index afb938a6..c57594cb 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -79,7 +79,7 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
class CardViewLookNFeelPage : public TQVBox {
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 1bd70c29..eb508b3d 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -113,7 +113,7 @@ void LookAndFeelPage::initGUI()
{
TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
- TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
+ TQButtonGroup *group = new TQButtonGroup(1, TQt::Horizontal,
i18n("Row Separator"), this);
layout->addWidget(group);
@@ -128,8 +128,8 @@ void LookAndFeelPage::initGUI()
mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this,
"mBackgroundBox");
- connect(mBackgroundBox, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(enableBackgroundToggled(bool)));
+ connect(mBackgroundBox, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(enableBackgroundToggled(bool)));
backgroundLayout->addWidget(mBackgroundBox);
mBackgroundName = new KURLRequester(this, "mBackgroundName");
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index fc38d0da..fdc644be 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -62,7 +62,7 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
*/
class LookAndFeelPage : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 3a01974b..b23f415c 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -278,8 +278,8 @@ ContactListView::ContactListView(KAddressBookTableView *view,
setSelectionModeExt( TDEListView::Extended );
setDropVisualizer(false);
- connect(this, TQT_SIGNAL(dropped(TQDropEvent*)),
- this, TQT_SLOT(itemDropped(TQDropEvent*)));
+ connect(this, TQ_SIGNAL(dropped(TQDropEvent*)),
+ this, TQ_SLOT(itemDropped(TQDropEvent*)));
new DynamicTip( this );
}
@@ -314,7 +314,7 @@ void ContactListView::contentsMousePressEvent(TQMouseEvent* e)
// To initiate a drag operation
void ContactListView::contentsMouseMoveEvent( TQMouseEvent *e )
{
- if ((e->state() & Qt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
+ if ((e->state() & TQt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
emit startAddresseeDrag();
}
else
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 138830b6..a2d70aa2 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -84,7 +84,7 @@ private:
class ContactListView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 9c6b55e1..a61ba3a9 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -156,16 +156,16 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core,
layout->addWidget( mCardView );
// Connect up the signals
- connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
- connect( mCardView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( addresseeSelected() ) );
- connect( mCardView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ),
- this, TQT_SIGNAL( dropped( TQDropEvent* ) ) );
- connect( mCardView, TQT_SIGNAL( startAddresseeDrag() ),
- this, TQT_SIGNAL( startDrag() ) );
- connect( mCardView, TQT_SIGNAL( contextMenuRequested( CardViewItem*, const TQPoint& ) ),
- this, TQT_SLOT( rmbClicked( CardViewItem*, const TQPoint& ) ) );
+ connect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) );
+ connect( mCardView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( addresseeSelected() ) );
+ connect( mCardView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ),
+ this, TQ_SIGNAL( dropped( TQDropEvent* ) ) );
+ connect( mCardView, TQ_SIGNAL( startAddresseeDrag() ),
+ this, TQ_SIGNAL( startDrag() ) );
+ connect( mCardView, TQ_SIGNAL( contextMenuRequested( CardViewItem*, const TQPoint& ) ),
+ this, TQ_SLOT( rmbClicked( CardViewItem*, const TQPoint& ) ) );
}
KAddressBookCardView::~KAddressBookCardView()
@@ -185,18 +185,18 @@ void KAddressBookCardView::readConfig( TDEConfig *config )
// costum colors?
if ( config->readBoolEntry( "EnableCustomColors", false ) ) {
TQPalette p( mCardView->palette() );
- TQColor c = p.color( TQPalette::Normal, TQColorGroup::Base );
- p.setColor( TQPalette::Normal, TQColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
- c = p.color( TQPalette::Normal, TQColorGroup::Text );
- p.setColor( TQPalette::Normal, TQColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
- c = p.color( TQPalette::Normal, TQColorGroup::Button );
- p.setColor( TQPalette::Normal, TQColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
- c = p.color( TQPalette::Normal, TQColorGroup::ButtonText );
- p.setColor( TQPalette::Normal, TQColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
- c = p.color( TQPalette::Normal, TQColorGroup::Highlight );
- p.setColor( TQPalette::Normal, TQColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
- c = p.color( TQPalette::Normal, TQColorGroup::HighlightedText );
- p.setColor( TQPalette::Normal, TQColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
+ TQColor c = p.color( TQPalette::Active, TQColorGroup::Base );
+ p.setColor( TQPalette::Active, TQColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
+ c = p.color( TQPalette::Active, TQColorGroup::Text );
+ p.setColor( TQPalette::Active, TQColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
+ c = p.color( TQPalette::Active, TQColorGroup::Button );
+ p.setColor( TQPalette::Active, TQColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
+ c = p.color( TQPalette::Active, TQColorGroup::ButtonText );
+ p.setColor( TQPalette::Active, TQColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
+ c = p.color( TQPalette::Active, TQColorGroup::Highlight );
+ p.setColor( TQPalette::Active, TQColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
+ c = p.color( TQPalette::Active, TQColorGroup::HighlightedText );
+ p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
mCardView->viewport()->setPalette( p );
} else {
// needed if turned off during a session.
@@ -227,15 +227,15 @@ void KAddressBookCardView::readConfig( TDEConfig *config )
mCardView->setItemSpacing( config->readNumEntry( "ItemSpacing", 10 ) );
mCardView->setSeparatorWidth( config->readNumEntry( "SeparatorWidth", 2 ) );
- disconnect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
+ disconnect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) );
if ( KABPrefs::instance()->honorSingleClick() )
- connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
+ connect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) );
else
- connect( mCardView, TQT_SIGNAL( doubleClicked( CardViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) );
+ connect( mCardView, TQ_SIGNAL( doubleClicked( CardViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) );
}
void KAddressBookCardView::writeConfig( TDEConfig *config )
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 15c77a7c..447614ad 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -42,7 +42,7 @@ class AddresseeCardView;
*/
class KAddressBookCardView : public KAddressBookView
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -77,7 +77,7 @@ class KAddressBookCardView : public KAddressBookView
class AddresseeCardView : public CardView
{
- Q_OBJECT
+ TQ_OBJECT
public:
AddresseeCardView( TQWidget *parent, const char *name = 0 );
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 3021f692..66aff6d1 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -70,8 +70,8 @@ AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name )
setSorting( true, true );
setMode( TDEIconView::Select );
- connect( this, TQT_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ),
- this, TQT_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) );
+ connect( this, TQ_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ),
+ this, TQ_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) );
}
AddresseeIconView::~AddresseeIconView()
@@ -145,16 +145,16 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core,
layout->addWidget( mIconView );
// Connect up the signals
- connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
- connect( mIconView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( addresseeSelected() ) );
- connect( mIconView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ),
- this, TQT_SIGNAL( dropped( TQDropEvent* ) ) );
- connect( mIconView, TQT_SIGNAL( startAddresseeDrag() ),
- this, TQT_SIGNAL( startDrag() ) );
- connect( mIconView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
- this, TQT_SLOT( rmbClicked( TQIconViewItem*, const TQPoint& ) ) );
+ connect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
+ connect( mIconView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( addresseeSelected() ) );
+ connect( mIconView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ),
+ this, TQ_SIGNAL( dropped( TQDropEvent* ) ) );
+ connect( mIconView, TQ_SIGNAL( startAddresseeDrag() ),
+ this, TQ_SIGNAL( startDrag() ) );
+ connect( mIconView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
+ this, TQ_SLOT( rmbClicked( TQIconViewItem*, const TQPoint& ) ) );
}
KAddressBookIconView::~KAddressBookIconView()
@@ -171,15 +171,15 @@ void KAddressBookIconView::readConfig( TDEConfig *config )
{
KAddressBookView::readConfig( config );
- disconnect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
+ disconnect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
if ( KABPrefs::instance()->honorSingleClick() )
- connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
+ connect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
else
- connect( mIconView, TQT_SIGNAL( doubleClicked( TQIconViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
+ connect( mIconView, TQ_SIGNAL( doubleClicked( TQIconViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) );
}
TQStringList KAddressBookIconView::selectedUids()
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index feb9edf3..d4d7bf93 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -41,7 +41,7 @@ namespace TDEABC { class AddressBook; }
*/
class KAddressBookIconView : public KAddressBookView
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -75,7 +75,7 @@ class KAddressBookIconView : public KAddressBookView
class AddresseeIconView : public TDEIconView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index ad39eb64..6b633303 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -103,16 +103,16 @@ KAddressBookTableView::~KAddressBookTableView()
void KAddressBookTableView::reconstructListView()
{
if ( mListView ) {
- disconnect( mListView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( addresseeSelected() ) );
- disconnect( mListView, TQT_SIGNAL( executed( TQListViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) );
- disconnect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) );
- disconnect( mListView, TQT_SIGNAL( startAddresseeDrag() ),
- this, TQT_SIGNAL( startDrag() ) );
- disconnect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ),
- this, TQT_SIGNAL( dropped( TQDropEvent* ) ) );
+ disconnect( mListView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( addresseeSelected() ) );
+ disconnect( mListView, TQ_SIGNAL( executed( TQListViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) );
+ disconnect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) );
+ disconnect( mListView, TQ_SIGNAL( startAddresseeDrag() ),
+ this, TQ_SIGNAL( startDrag() ) );
+ disconnect( mListView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ),
+ this, TQ_SIGNAL( dropped( TQDropEvent* ) ) );
delete mListView;
}
@@ -141,23 +141,23 @@ void KAddressBookTableView::reconstructListView()
mListView->setFullWidth( true );
- connect( mListView, TQT_SIGNAL( selectionChanged() ),
- this, TQT_SLOT( addresseeSelected() ) );
- connect( mListView, TQT_SIGNAL( startAddresseeDrag() ),
- this, TQT_SIGNAL( startDrag() ) );
- connect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ),
- this, TQT_SIGNAL( dropped( TQDropEvent* ) ) );
- connect( mListView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ),
- this, TQT_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) );
- connect( mListView->header(), TQT_SIGNAL( clicked( int ) ),
- this, TQT_SIGNAL( sortFieldChanged() ) );
+ connect( mListView, TQ_SIGNAL( selectionChanged() ),
+ this, TQ_SLOT( addresseeSelected() ) );
+ connect( mListView, TQ_SIGNAL( startAddresseeDrag() ),
+ this, TQ_SIGNAL( startDrag() ) );
+ connect( mListView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ),
+ this, TQ_SIGNAL( dropped( TQDropEvent* ) ) );
+ connect( mListView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ),
+ this, TQ_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) );
+ connect( mListView->header(), TQ_SIGNAL( clicked( int ) ),
+ this, TQ_SIGNAL( sortFieldChanged() ) );
if ( KABPrefs::instance()->honorSingleClick() )
- connect( mListView, TQT_SIGNAL( executed( TQListViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) );
+ connect( mListView, TQ_SIGNAL( executed( TQListViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) );
else
- connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ),
- this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) );
+ connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ),
+ this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) );
refresh();
@@ -187,13 +187,13 @@ void KAddressBookTableView::readConfig( TDEConfig *config )
if ( config->readBoolEntry( "InstantMessagingPresence", false ) ) {
if ( !mIMProxy ) {
mIMProxy = KIMProxy::instance( kapp->dcopClient() );
- connect( mIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
- this, TQT_SLOT( updatePresence( const TQString& ) ) );
+ connect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
+ this, TQ_SLOT( updatePresence( const TQString& ) ) );
}
} else {
if ( mIMProxy ) {
- disconnect( mIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
- this, TQT_SLOT( updatePresence( const TQString& ) ) );
+ disconnect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
+ this, TQ_SLOT( updatePresence( const TQString& ) ) );
mIMProxy = 0;
}
}
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index 7d258d2a..432a2164 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -61,7 +61,7 @@ class KAddressBookTableView : public KAddressBookView
{
friend class ContactListView;
- Q_OBJECT
+ TQ_OBJECT
public: