From fd5d099065a748cac49e20a13481f85666c53c71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:12 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kaddressbook/views/colorlistbox.cpp | 2 +- kaddressbook/views/colorlistbox.h | 2 +- kaddressbook/views/configurecardviewdialog.cpp | 4 ++-- kaddressbook/views/contactlistview.cpp | 14 +++++++------- kaddressbook/views/contactlistview.h | 4 ++-- kaddressbook/views/kaddressbooktableview.cpp | 6 +++--- kaddressbook/views/kaddressbooktableview.h | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kaddressbook/views') diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp index a003246f4..54ad38b34 100644 --- a/kaddressbook/views/colorlistbox.cpp +++ b/kaddressbook/views/colorlistbox.cpp @@ -26,7 +26,7 @@ #include "colorlistbox.h" ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) - :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) + :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); setAcceptDrops( true); diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h index 63495e93b..18c307aca 100644 --- a/kaddressbook/views/colorlistbox.h +++ b/kaddressbook/views/colorlistbox.h @@ -23,7 +23,7 @@ #include -class ColorListBox : public KListBox +class ColorListBox : public TDEListBox { Q_OBJECT diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index b1e6233ed..4cfbf9586 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -167,14 +167,14 @@ void CardViewLookNFeelPage::saveSettings( TDEConfig *config ) void CardViewLookNFeelPage::setTextFont() { TQFont f( lTextFont->font() ); - if ( KFontDialog::getFont( f, false, this ) == TQDialog::Accepted ) + if ( TDEFontDialog::getFont( f, false, this ) == TQDialog::Accepted ) updateFontLabel( f, lTextFont ); } void CardViewLookNFeelPage::setHeaderFont() { TQFont f( lHeaderFont->font() ); - if ( KFontDialog::getFont( f,false, this ) == TQDialog::Accepted ) + if ( TDEFontDialog::getFont( f,false, this ) == TQDialog::Accepted ) updateFontLabel( f, lHeaderFont ); } diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 25c66ac45..a0aec1e90 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -151,7 +151,7 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy ) - : KListViewItem(parent), mAddressee(a), mFields( fields ), + : TDEListViewItem(parent), mAddressee(a), mFields( fields ), parentListView( parent ), mDocument(doc), mIMProxy( proxy ) { if ( mIMProxy ) @@ -196,7 +196,7 @@ void ContactListViewItem::paintCell(TQPainter * p, int width, int align) { - KListViewItem::paintCell(p, cg, column, width, align); + TDEListViewItem::paintCell(p, cg, column, width, align); if ( !p ) return; @@ -260,7 +260,7 @@ ContactListView::ContactListView(KAddressBookTableView *view, KABC::AddressBook* /* doc */, TQWidget *parent, const char *name ) - : KListView( parent, name ), + : TDEListView( parent, name ), pabWidget( view ), oldColumn( 0 ) { @@ -275,7 +275,7 @@ ContactListView::ContactListView(KAddressBookTableView *view, viewport()->setAcceptDrops( true ); setAllColumnsShowFocus( true ); setShowSortIndicator(true); - setSelectionModeExt( KListView::Extended ); + setSelectionModeExt( TDEListView::Extended ); setDropVisualizer(false); connect(this, TQT_SIGNAL(dropped(TQDropEvent*)), @@ -300,14 +300,14 @@ void ContactListView::paintEmptyArea( TQPainter * p, const TQRect & rect ) else { // Do a normal paint - KListView::paintEmptyArea(p, rect); + TDEListView::paintEmptyArea(p, rect); } } void ContactListView::contentsMousePressEvent(TQMouseEvent* e) { presspos = e->pos(); - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); } @@ -318,7 +318,7 @@ void ContactListView::contentsMouseMoveEvent( TQMouseEvent *e ) emit startAddresseeDrag(); } else - KListView::contentsMouseMoveEvent( e ); + TDEListView::contentsMouseMoveEvent( e ); } bool ContactListView::acceptDrag(TQDropEvent *e) const diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index 2da52d235..adfbc2dc8 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -52,7 +52,7 @@ class DynamicTip : public TQToolTip private: }; -class ContactListViewItem : public KListViewItem +class ContactListViewItem : public TDEListViewItem { public: @@ -82,7 +82,7 @@ private: ///////////////////////////////////////////// // ContactListView -class ContactListView : public KListView +class ContactListView : public TDEListView { Q_OBJECT diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 4c39c13ba..f0c4c594d 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -147,8 +147,8 @@ void KAddressBookTableView::reconstructListView() this, TQT_SIGNAL( startDrag() ) ); connect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mListView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( KListView*, TQListViewItem*, const TQPoint& ) ) ); + 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() ) ); @@ -347,7 +347,7 @@ void KAddressBookTableView::addresseeExecuted( TQListViewItem *item ) } } -void KAddressBookTableView::rmbClicked( KListView*, TQListViewItem*, const TQPoint &point ) +void KAddressBookTableView::rmbClicked( TDEListView*, TQListViewItem*, const TQPoint &point ) { popup( point ); } diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h index 4ebdfd938..acbfb08d4 100644 --- a/kaddressbook/views/kaddressbooktableview.h +++ b/kaddressbook/views/kaddressbooktableview.h @@ -50,7 +50,7 @@ class ContactListView; namespace KABC { class AddressBook; } /** - * This class is the table view for kaddressbook. This view is a KListView + * This class is the table view for kaddressbook. This view is a TDEListView * with multiple columns for the selected fields. * * @short Table View @@ -100,7 +100,7 @@ friend class ContactListView; /** RBM menu called. */ - void rmbClicked( KListView*, TQListViewItem*, const TQPoint& ); + void rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ); /** * Called to update the presence of a single item -- cgit v1.2.1