diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 15:14:36 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 15:14:36 -0600 |
commit | 7716a5e605907a009e19f429cec4e6b5f346bd71 (patch) | |
tree | 16cf4a5d7a24db774f988022d514adefc75015c0 /kompare/komparenavtreepart | |
parent | 0117fbed932653a04aeef16b2ed7edee858959ac (diff) | |
download | tdesdk-7716a5e605907a009e19f429cec4e6b5f346bd71.tar.gz tdesdk-7716a5e605907a009e19f429cec4e6b5f346bd71.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kompare/komparenavtreepart')
-rw-r--r-- | kompare/komparenavtreepart/komparenavtreepart.cpp | 22 | ||||
-rw-r--r-- | kompare/komparenavtreepart/komparenavtreepart.h | 32 |
2 files changed, 27 insertions, 27 deletions
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index fe231bb2..31146762 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -57,24 +57,24 @@ KompareNavTreePart::KompareNavTreePart( TQWidget* parent, const char* name ) setWidget( m_splitter ); - m_srcDirTree = new KListView( m_splitter ); + m_srcDirTree = new TDEListView( m_splitter ); m_srcDirTree->addColumn( i18n("Source Folder") ); m_srcDirTree->setRootIsDecorated( false ); m_srcDirTree->setSorting( 0, true ); - m_destDirTree = new KListView( m_splitter ); + m_destDirTree = new TDEListView( m_splitter ); m_destDirTree->addColumn( i18n("Destination Folder") ); m_destDirTree->setRootIsDecorated( false ); m_destDirTree->setSorting( 0, true ); - m_fileList = new KListView( m_splitter ); + m_fileList = new TDEListView( m_splitter ); m_fileList->addColumn( i18n("Source File") ); m_fileList->addColumn( i18n("Destination File") ); m_fileList->setAllColumnsShowFocus( true ); m_fileList->setRootIsDecorated( false ); m_fileList->setSorting( 0, true ); - m_changesList = new KListView( m_splitter ); + m_changesList = new TDEListView( m_splitter ); m_changesList->addColumn( i18n("Source Line") ); m_changesList->addColumn( i18n("Destination Line") ); m_changesList->addColumn( i18n("Difference") ); @@ -453,7 +453,7 @@ void KChangeLVI::setDifferenceText() setText( 2, text ); } -KChangeLVI::KChangeLVI( KListView* parent, Difference* diff ) : KListViewItem( parent ) +KChangeLVI::KChangeLVI( TDEListView* parent, Difference* diff ) : TDEListViewItem( parent ) { m_difference = diff; @@ -487,7 +487,7 @@ KChangeLVI::~KChangeLVI() { } -KFileLVI::KFileLVI( KListView* parent, DiffModel* model ) : KListViewItem( parent ) +KFileLVI::KFileLVI( TDEListView* parent, DiffModel* model ) : TDEListViewItem( parent ) { m_model = model; @@ -498,7 +498,7 @@ KFileLVI::KFileLVI( KListView* parent, DiffModel* model ) : KListViewItem( paren setSelectable( true ); } -void KFileLVI::fillChangesList( KListView* changesList, TQPtrDict<KChangeLVI>* diffToChangeItemDict ) +void KFileLVI::fillChangesList( TDEListView* changesList, TQPtrDict<KChangeLVI>* diffToChangeItemDict ) { changesList->clear(); diffToChangeItemDict->clear(); @@ -519,9 +519,9 @@ KFileLVI::~KFileLVI() { } -KDirLVI::KDirLVI( KListView* parent, TQString& dir ) : KListViewItem( parent ) +KDirLVI::KDirLVI( TDEListView* parent, TQString& dir ) : TDEListViewItem( parent ) { -// kdDebug(8105) << "KDirLVI (KListView) constructor called with dir = " << dir << endl; +// kdDebug(8105) << "KDirLVI (TDEListView) constructor called with dir = " << dir << endl; m_rootItem = true; m_dirName = dir; setPixmap( 0, SmallIcon( "folder" ) ); @@ -533,7 +533,7 @@ KDirLVI::KDirLVI( KListView* parent, TQString& dir ) : KListViewItem( parent ) setText( 0, m_dirName ); } -KDirLVI::KDirLVI( KDirLVI* parent, TQString& dir ) : KListViewItem( parent ) +KDirLVI::KDirLVI( KDirLVI* parent, TQString& dir ) : TDEListViewItem( parent ) { // kdDebug(8105) << "KDirLVI (KDirLVI) constructor called with dir = " << dir << endl; m_rootItem = false; @@ -592,7 +592,7 @@ KDirLVI* KDirLVI::findChild( TQString dir ) return 0L; } -void KDirLVI::fillFileList( KListView* fileList, TQPtrDict<KFileLVI>* modelToFileItemDict ) +void KDirLVI::fillFileList( TDEListView* fileList, TQPtrDict<KFileLVI>* modelToFileItemDict ) { fileList->clear(); diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h index f535f676..b7df27b4 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.h +++ b/kompare/komparenavtreepart/komparenavtreepart.h @@ -33,7 +33,7 @@ class KompareModelList; class KomparePart; -class KListView; +class TDEListView; namespace Diff2 { class DiffModel; @@ -88,10 +88,10 @@ private: TQString compareFromEndAndReturnSame( const TQString& string1, const TQString& string2 ); void addDirToTreeView( enum Kompare::Target, const TQString& filename ); - KListViewItem* findDirInDirTree( const KListViewItem* parent, const TQString& dir ); + TDEListViewItem* findDirInDirTree( const TDEListViewItem* parent, const TQString& dir ); -// KListViewItem* firstItem(); -// KListViewItem* lastItem(); +// TDEListViewItem* firstItem(); +// TDEListViewItem* lastItem(); private: TQSplitter* m_splitter; @@ -102,10 +102,10 @@ private: TQPtrDict<KDirLVI> m_modelToSrcDirItemDict; TQPtrDict<KDirLVI> m_modelToDestDirItemDict; - KListView* m_srcDirTree; - KListView* m_destDirTree; - KListView* m_fileList; - KListView* m_changesList; + TDEListView* m_srcDirTree; + TDEListView* m_destDirTree; + TDEListView* m_fileList; + TDEListView* m_changesList; KDirLVI* m_srcRootItem; KDirLVI* m_destRootItem; @@ -122,10 +122,10 @@ private: // These 3 classes are need to store the models into a tree so it is easier // to extract the info we need for the navigation widgets -class KChangeLVI : public KListViewItem +class KChangeLVI : public TDEListViewItem { public: - KChangeLVI( KListView* parent, Diff2::Difference* diff ); + KChangeLVI( TDEListView* parent, Diff2::Difference* diff ); ~KChangeLVI(); public: Diff2::Difference* difference() { return m_difference; }; @@ -136,30 +136,30 @@ private: Diff2::Difference* m_difference; }; -class KFileLVI : public KListViewItem +class KFileLVI : public TDEListViewItem { public: - KFileLVI( KListView* parent, Diff2::DiffModel* model ); + KFileLVI( TDEListView* parent, Diff2::DiffModel* model ); ~KFileLVI(); public: Diff2::DiffModel* model() { return m_model; }; - void fillChangesList( KListView* changesList, TQPtrDict<KChangeLVI>* diffToChangeItemDict ); + void fillChangesList( TDEListView* changesList, TQPtrDict<KChangeLVI>* diffToChangeItemDict ); private: Diff2::DiffModel* m_model; }; -class KDirLVI : public KListViewItem +class KDirLVI : public TDEListViewItem { public: KDirLVI( KDirLVI* parent, TQString& dir ); - KDirLVI( KListView* parent, TQString& dir ); + KDirLVI( TDEListView* parent, TQString& dir ); ~KDirLVI(); public: void addModel( TQString& dir, Diff2::DiffModel* model, TQPtrDict<KDirLVI>* modelToDirItemDict ); TQString& dirName() { return m_dirName; }; TQString fullPath( TQString& path ); KDirLVI* setSelected( TQString dir ); - void fillFileList( KListView* fileList, TQPtrDict<KFileLVI>* modelToFileItemDict ); + void fillFileList( TDEListView* fileList, TQPtrDict<KFileLVI>* modelToFileItemDict ); bool isRootItem() { return m_rootItem; }; private: KDirLVI* findChild( TQString dir ); |