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/ChangeLog | 2 +- kompare/kompare_shell.cpp | 8 +++--- kompare/kompare_shell.h | 4 +-- kompare/komparenavtreepart/komparenavtreepart.cpp | 22 ++++++++-------- kompare/komparenavtreepart/komparenavtreepart.h | 32 +++++++++++------------ kompare/komparepart/kompare_part.cpp | 8 +++--- kompare/komparepart/kompare_part.h | 10 +++---- kompare/komparepart/komparelistview.cpp | 4 +-- kompare/komparepart/komparelistview.h | 2 +- kompare/libdialogpages/viewpage.cpp | 2 +- kompare/libdialogpages/viewpage.h | 4 +-- kompare/libdiff2/komparemodellist.cpp | 16 ++++++------ kompare/libdiff2/komparemodellist.h | 20 +++++++------- 13 files changed, 67 insertions(+), 67 deletions(-) (limited to 'kompare') diff --git a/kompare/ChangeLog b/kompare/ChangeLog index 2781e875..52cfd307 100644 --- a/kompare/ChangeLog +++ b/kompare/ChangeLog @@ -129,7 +129,7 @@ Sep 27, 2003 : Otto Bruggeman Sep 27, 2003 : Otto Bruggeman * Moved the apply and navigation actions into the komparemodellist - * Fixed Ingo's problem with the next and prev difference KActions + * Fixed Ingo's problem with the next and prev difference TDEActions Sep 26, 2003 : Otto Bruggeman * Added a struct Info in the Kompare namespace. This one contains all the info about what kompare is doing diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index dd4fda2a..6ec2a171 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -228,12 +228,12 @@ void KompareShell::blend( const KURL& url1, const KURL& diff ) void KompareShell::setupActions() { - KAction* open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + TDEAction* open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); open->setText( i18n( "&Open Diff..." ) ); - new KAction( i18n("&Compare Files..."), "fileopen", TQt::CTRL + TQt::Key_C, + new TDEAction( i18n("&Compare Files..."), "fileopen", TQt::CTRL + TQt::Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotFileCompareFiles()), actionCollection(), "file_compare_files" ); - new KAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B, + new TDEAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotFileBlendURLAndDiff()), actionCollection(), "file_blend_url" ); KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection() ); @@ -242,7 +242,7 @@ void KompareShell::setupActions() createStandardStatusBarAction(); #endif setStandardToolBarMenuEnabled(true); - m_showTextView = new KToggleAction( i18n("Show T&ext View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTextView()), + m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTextView()), actionCollection(), "options_show_text_view" ); m_showTextView->setCheckedState(i18n("Hide T&ext View")); diff --git a/kompare/kompare_shell.h b/kompare/kompare_shell.h index 5b7a5abe..84f8887f 100644 --- a/kompare/kompare_shell.h +++ b/kompare/kompare_shell.h @@ -25,7 +25,7 @@ #include "kompare.h" -class KToggleAction; +class TDEToggleAction; class KSqueezedTextLabel; class KomparePart; @@ -140,7 +140,7 @@ private: KDockWidget* m_mainViewDock; KDockWidget* m_navTreeDock; - KToggleAction* m_showTextView; + TDEToggleAction* m_showTextView; enum Kompare::Mode m_mode; // This is the statusbarwidget for displaying the general stuff 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* diffToChangeItemDict ) +void KFileLVI::fillChangesList( TDEListView* changesList, TQPtrDict* 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* modelToFileItemDict ) +void KDirLVI::fillFileList( TDEListView* fileList, TQPtrDict* 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 m_modelToSrcDirItemDict; TQPtrDict 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* diffToChangeItemDict ); + void fillChangesList( TDEListView* changesList, TQPtrDict* 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* modelToDirItemDict ); TQString& dirName() { return m_dirName; }; TQString fullPath( TQString& path ); KDirLVI* setSelected( TQString dir ); - void fillFileList( KListView* fileList, TQPtrDict* modelToFileItemDict ); + void fillFileList( TDEListView* fileList, TQPtrDict* modelToFileItemDict ); bool isRootItem() { return m_rootItem; }; private: KDirLVI* findChild( TQString dir ); 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 diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp index 19f5b057..9150b392 100644 --- a/kompare/libdialogpages/viewpage.cpp +++ b/kompare/libdialogpages/viewpage.cpp @@ -106,7 +106,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent ) gb->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "Font:" ), gb ); - m_fontCombo = new KFontCombo( gb, "fontcombo" ); + m_fontCombo = new TDEFontCombo( gb, "fontcombo" ); label->setBuddy( m_fontCombo ); label = new TQLabel( i18n( "Size:" ), gb ); diff --git a/kompare/libdialogpages/viewpage.h b/kompare/libdialogpages/viewpage.h index 774b9c45..0630d321 100644 --- a/kompare/libdialogpages/viewpage.h +++ b/kompare/libdialogpages/viewpage.h @@ -26,7 +26,7 @@ class TQCheckBox; class TQSpinBox; class KColorButton; -class KFontCombo; +class TDEFontCombo; class ViewSettings; @@ -58,7 +58,7 @@ public: // snol == scroll number of lines TQSpinBox* m_snolSpinBox; TQSpinBox* m_tabSpinBox; - KFontCombo* m_fontCombo; + TDEFontCombo* m_fontCombo; TQSpinBox* m_fontSizeSpinBox; }; diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index c6cf587c..8e667800 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -58,28 +58,28 @@ KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare:: m_info( info ), m_textCodec( 0 ) { - m_applyDifference = new KAction( i18n("&Apply Difference"), "1rightarrow", TQt::Key_Space, + m_applyDifference = new TDEAction( i18n("&Apply Difference"), "1rightarrow", TQt::Key_Space, this, TQT_SLOT(slotActionApplyDifference()), (( KomparePart* )parent)->actionCollection(), "difference_apply" ); - m_unApplyDifference = new KAction( i18n("Un&apply Difference"), "1leftarrow", TQt::Key_BackSpace, + m_unApplyDifference = new TDEAction( i18n("Un&apply Difference"), "1leftarrow", TQt::Key_BackSpace, this, TQT_SLOT(slotActionUnApplyDifference()), (( KomparePart* )parent)->actionCollection(), "difference_unapply" ); - m_applyAll = new KAction( i18n("App&ly All"), "2rightarrow", TQt::CTRL + TQt::Key_A, + m_applyAll = new TDEAction( i18n("App&ly All"), "2rightarrow", TQt::CTRL + TQt::Key_A, this, TQT_SLOT(slotActionApplyAllDifferences()), (( KomparePart* )parent)->actionCollection(), "difference_applyall" ); - m_unapplyAll = new KAction( i18n("&Unapply All"), "2leftarrow", TQt::CTRL + TQt::Key_U, + m_unapplyAll = new TDEAction( i18n("&Unapply All"), "2leftarrow", TQt::CTRL + TQt::Key_U, this, TQT_SLOT(slotActionUnapplyAllDifferences()), (( KomparePart* )parent)->actionCollection(), "difference_unapplyall" ); - m_previousFile = new KAction( i18n("P&revious File"), "2uparrow", TQt::CTRL + TQt::Key_PageUp, + m_previousFile = new TDEAction( i18n("P&revious File"), "2uparrow", TQt::CTRL + TQt::Key_PageUp, this, TQT_SLOT(slotPreviousModel()), (( KomparePart* )parent)->actionCollection(), "difference_previousfile" ); - m_nextFile = new KAction( i18n("N&ext File"), "2downarrow", TQt::CTRL + TQt::Key_PageDown, + m_nextFile = new TDEAction( i18n("N&ext File"), "2downarrow", TQt::CTRL + TQt::Key_PageDown, this, TQT_SLOT(slotNextModel()), (( KomparePart* )parent)->actionCollection(), "difference_nextfile" ); - m_previousDifference = new KAction( i18n("&Previous Difference"), "1uparrow", TQt::CTRL + TQt::Key_Up, + m_previousDifference = new TDEAction( i18n("&Previous Difference"), "1uparrow", TQt::CTRL + TQt::Key_Up, this, TQT_SLOT(slotPreviousDifference()), (( KomparePart* )parent)->actionCollection(), "difference_previous" ); - m_nextDifference = new KAction( i18n("&Next Difference"), "1downarrow", TQt::CTRL + TQt::Key_Down, + m_nextDifference = new TDEAction( i18n("&Next Difference"), "1downarrow", TQt::CTRL + TQt::Key_Down, this, TQT_SLOT(slotNextDifference()), (( KomparePart* )parent)->actionCollection(), "difference_next" ); m_previousDifference->setEnabled( false ); diff --git a/kompare/libdiff2/komparemodellist.h b/kompare/libdiff2/komparemodellist.h index 3d5a83ff..ce70c4d6 100644 --- a/kompare/libdiff2/komparemodellist.h +++ b/kompare/libdiff2/komparemodellist.h @@ -28,7 +28,7 @@ class TQFile; -class KAction; +class TDEAction; class KDirWatch; class KTempFile; @@ -194,16 +194,16 @@ private: struct Kompare::Info& m_info; - KAction* m_applyDifference; - KAction* m_unApplyDifference; - KAction* m_applyAll; - KAction* m_unapplyAll; - KAction* m_previousFile; - KAction* m_nextFile; - KAction* m_previousDifference; - KAction* m_nextDifference; + TDEAction* m_applyDifference; + TDEAction* m_unApplyDifference; + TDEAction* m_applyAll; + TDEAction* m_unapplyAll; + TDEAction* m_previousFile; + TDEAction* m_nextFile; + TDEAction* m_previousDifference; + TDEAction* m_nextDifference; - KAction* m_save; + TDEAction* m_save; TQString m_encoding; TQTextCodec* m_textCodec; -- cgit v1.2.1