From 7716a5e605907a009e19f429cec4e6b5f346bd71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:36 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kompare/komparepart/kompare_part.cpp | 8 ++++---- kompare/komparepart/kompare_part.h | 10 +++++----- kompare/komparepart/komparelistview.cpp | 4 ++-- kompare/komparepart/komparelistview.h | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'kompare/komparepart') diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 097eb5db..e2e2956c 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -162,16 +162,16 @@ void KomparePart::setupActions() { // create our actions - m_saveAll = new KAction( i18n("Save &All"), "save_all", 0, + m_saveAll = new TDEAction( i18n("Save &All"), "save_all", 0, this, TQT_SLOT(saveAll()), actionCollection(), "file_save_all" ); - m_saveDiff = new KAction( i18n("Save .&diff..."), 0, + m_saveDiff = new TDEAction( i18n("Save .&diff..."), 0, this, TQT_SLOT(saveDiff()), actionCollection(), "file_save_diff" ); - m_swap = new KAction( i18n( "Swap Source with Destination" ), 0, + m_swap = new TDEAction( i18n( "Swap Source with Destination" ), 0, this, TQT_SLOT(slotSwap()), actionCollection(), "file_swap" ); - m_diffStats = new KAction( i18n( "Show Statistics" ), 0, + m_diffStats = new TDEAction( i18n( "Show Statistics" ), 0, this, TQT_SLOT(slotShowDiffstats()), actionCollection(), "file_diffstats" ); diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h index f853fa36..e0cb7d61 100644 --- a/kompare/komparepart/kompare_part.h +++ b/kompare/komparepart/kompare_part.h @@ -32,7 +32,7 @@ class TQWidget; class KTempFile; -class KToggleAction; +class TDEToggleAction; class KURL; namespace Diff2 { @@ -211,10 +211,10 @@ private: KompareSplitter* m_splitter; - KAction* m_saveAll; - KAction* m_saveDiff; - KAction* m_swap; - KAction* m_diffStats; + TDEAction* m_saveAll; + TDEAction* m_saveDiff; + TDEAction* m_swap; + TDEAction* m_diffStats; KTempFile* m_tempDiff; diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index 30e65d87..77158e9f 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -99,7 +99,7 @@ void KompareListViewFrame::slotSetModel( const DiffModel* model ) KompareListView::KompareListView( bool isSource, ViewSettings* settings, TQWidget* parent, const char* name ) : - KListView( parent, name ), + TDEListView( parent, name ), m_isSource( isSource ), m_settings( settings ), m_scrollId( -1 ), @@ -415,7 +415,7 @@ void KompareListView::wheelEvent( TQWheelEvent* e ) void KompareListView::resizeEvent( TQResizeEvent* e ) { - KListView::resizeEvent(e); + TDEListView::resizeEvent(e); emit resized(); kdDebug() << "resizeEvent " << endl; } diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h index cf557c19..6124d184 100644 --- a/kompare/komparepart/komparelistview.h +++ b/kompare/komparepart/komparelistview.h @@ -43,7 +43,7 @@ class KompareListViewItem; class KompareListViewDiffItem; class KompareListViewLineContainerItem; -class KompareListView : public KListView +class KompareListView : public TDEListView { Q_OBJECT -- cgit v1.2.1