diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-04 14:02:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-04 14:02:36 -0600 |
| commit | c125e4cd2946b1fd0651c27fd998b58bab7152a1 (patch) | |
| tree | a215683b59f6028db5718dbc0c33792cc85c49b1 /src/directorymergewindow.h | |
| parent | 533c3127e1498430584d456034fe2558101d99cb (diff) | |
| download | kdiff3-c125e4cd2946b1fd0651c27fd998b58bab7152a1.tar.gz kdiff3-c125e4cd2946b1fd0651c27fd998b58bab7152a1.zip | |
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'src/directorymergewindow.h')
| -rw-r--r-- | src/directorymergewindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h index 88ee923..05d1217 100644 --- a/src/directorymergewindow.h +++ b/src/directorymergewindow.h @@ -29,7 +29,7 @@ #include "diff.h" //TotalDiffStatus class OptionDialog; -class KIconLoader; +class TDEIconLoader; class StatusInfo; class DirectoryMergeInfo; class OneDirectoryInfo; @@ -119,7 +119,7 @@ class DirectoryMergeWindow : public TQListView Q_OBJECT public: - DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader ); + DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader ); ~DirectoryMergeWindow(); void setDirectoryMergeInfo(DirectoryMergeInfo* p){ m_pDirectoryMergeInfo=p; } bool init( @@ -257,7 +257,7 @@ protected: bool m_bScanning; // true while in init() OptionDialog* m_pOptions; - KIconLoader* m_pIconLoader; + TDEIconLoader* m_pIconLoader; DirectoryMergeInfo* m_pDirectoryMergeInfo; StatusInfo* m_pStatusInfo; |