From f537c21b68e08f649b1b297bce8f3904603137e0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:11:21 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- tdm/kfrontend/kgreeter.cpp | 16 ++++++++-------- tdm/kfrontend/kgreeter.h | 2 +- tdm/kfrontend/themer/tdmitem.cpp | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tdm/kfrontend') diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index c2fb0c6f5..809f309ad 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -92,10 +92,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1" #define FIFO_SAK_FILE "/tmp/tdesocket-global/tdm/tdmctl-sak-%1" -class UserListView : public KListView { +class UserListView : public TDEListView { public: UserListView( bool _them, TQWidget *parent = 0, const char *name = 0 ) - : KListView( parent, name ) + : TDEListView( parent, name ) , themed(_them), cachedSizeHint( -1, 0 ) { setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ); @@ -127,7 +127,7 @@ public: virtual TQSize sizeHint() const { if (themed) - return KListView::sizeHint(); + return TDEListView::sizeHint(); if (!cachedSizeHint.isValid()) { constPolish(); @@ -146,11 +146,11 @@ public: virtual void paintEmptyArea ( TQPainter * p, const TQRect & rect ) { if (!themed) - return KListView::paintEmptyArea(p, rect ); + return TDEListView::paintEmptyArea(p, rect ); // FIXME: This must be configurable, so disable // painting of list background for now. - return KListView::paintEmptyArea(p, rect ); + return TDEListView::paintEmptyArea(p, rect ); const TQPixmap *pm = TQT_TQPIXMAP_CONST(paletteBackgroundPixmap()); if (!pm || pm->isNull()) @@ -337,11 +337,11 @@ void KGreeter::readFacesList() } } -class UserListViewItem : public KListViewItem { +class UserListViewItem : public TDEListViewItem { public: UserListViewItem( UserListView *parent, const TQString &text, const TQPixmap &pixmap, const TQString &username ) - : KListViewItem( parent ) + : TDEListViewItem( parent ) , login( username ) { setPixmap( 0, pixmap ); @@ -355,7 +355,7 @@ class UserListViewItem : public KListViewItem { if (((UserListView*)listView())->themed) TQListViewItem::paintCell(p, cg, column, width, alignment); else - KListViewItem::paintCell(p, cg, column, width, alignment); + TDEListViewItem::paintCell(p, cg, column, width, alignment); } TQString login; diff --git a/tdm/kfrontend/kgreeter.h b/tdm/kfrontend/kgreeter.h index 78a6ded8c..951ea7d3a 100644 --- a/tdm/kfrontend/kgreeter.h +++ b/tdm/kfrontend/kgreeter.h @@ -34,7 +34,7 @@ class UserListView; class KdmThemer; class KdmItem; -class KListView; +class TDEListView; class KSimpleConfig; class TQLabel; diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp index fb695462c..13969c4bf 100644 --- a/tdm/kfrontend/themer/tdmitem.cpp +++ b/tdm/kfrontend/themer/tdmitem.cpp @@ -290,12 +290,12 @@ KdmItem::paint( TQPainter *p, const TQRect &rect ) return; if (myWidget || (myLayoutItem && myLayoutItem->widget())) { - // KListView because it's missing a Q_OBJECT' + // TDEListView because it's missing a Q_OBJECT' // FIXME: This is a nice idea in theory, but in practice it is // very confusing for the user not to see the empty list box // delineated from the rest of the greeter. // Maybe set a darker version of the background instead of an exact copy? - if ( myWidget && myWidget->isA( "KListView" ) ) { + if ( myWidget && myWidget->isA( "TDEListView" ) ) { if ((_compositor.isEmpty()) || (!argb_visual_available)) { // Software blend only (no compositing support) TQPixmap copy( myWidget->size() ); -- cgit v1.2.3