diff options
Diffstat (limited to 'src/directorymergewindow.cpp')
| -rw-r--r-- | src/directorymergewindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index c020d0e..f3f9500 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -268,7 +268,7 @@ static int s_UnsolvedCol = 6; // Nr of unsolved conflicts (for 3 input files) static int s_SolvedCol = 7; // Nr of auto-solvable conflicts (for 3 input files) static int s_NonWhiteCol = 8; // Nr of nonwhite deltas (for 2 input files) static int s_WhiteCol = 9; // Nr of white deltas (for 2 input files) -DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader ) +DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader ) : TQListView( pParent ) { connect( TQT_TQOBJECT(this), TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onDoubleClick(TQListViewItem*))); @@ -1197,7 +1197,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp ) { #include "xpm/file.xpm" #include "xpm/folder.xpm" - s_pm_dir = new TQPixmap( m_pIconLoader->loadIcon("folder", KIcon::Small ) ); + s_pm_dir = new TQPixmap( m_pIconLoader->loadIcon("folder", TDEIcon::Small ) ); if (s_pm_dir->size()!=TQSize(16,16)) { delete s_pm_dir; |