diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:36 -0600 |
| commit | 7716a5e605907a009e19f429cec4e6b5f346bd71 (patch) | |
| tree | 16cf4a5d7a24db774f988022d514adefc75015c0 /kompare/libdiff2 | |
| 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/libdiff2')
| -rw-r--r-- | kompare/libdiff2/komparemodellist.cpp | 16 | ||||
| -rw-r--r-- | kompare/libdiff2/komparemodellist.h | 20 |
2 files changed, 18 insertions, 18 deletions
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; |