diff options
Diffstat (limited to 'src/directorymergewindow.cpp')
| -rw-r--r-- | src/directorymergewindow.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index f232f61..4d2481d 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -676,7 +676,7 @@ bool DirectoryMergeWindow::init TQDir::setCurrent(origCurrentDirectory); // Try to improve the view a little bit. - TQWidget* pParent = tqparentWidget(); + TQWidget* pParent = parentWidget(); TQSplitter* pSplitter = static_cast<TQSplitter*>(pParent); if (pSplitter!=0) { @@ -1274,7 +1274,7 @@ void DirectoryMergeWindow::prepareListView( ProgressProxy& pp ) new DirMergeItem( dirMfi.m_pDMI, filePart, &mfi ); mfi.m_pParent = &dirMfi; - if ( !bEqual ) // Set all tqparents to "not equal" + if ( !bEqual ) // Set all parents to "not equal" { MergeFileInfos* p = mfi.m_pParent; while(p!=0) @@ -2484,8 +2484,8 @@ bool DirectoryMergeWindow::mergeFLD( const TQString& nameA,const TQString& nameB int pos=nameDest.tqfindRev('/'); if ( pos>0 ) { - TQString tqparentName = nameDest.left(pos); - bool bSuccess = makeDir(tqparentName, true /*quiet*/); + TQString parentName = nameDest.left(pos); + bool bSuccess = makeDir(parentName, true /*quiet*/); if (!bSuccess) return false; } @@ -2557,8 +2557,8 @@ bool DirectoryMergeWindow::copyFLD( const TQString& srcName, const TQString& des int pos=destName.tqfindRev('/'); if ( pos>0 ) { - TQString tqparentName = destName.left(pos); - bool bSuccess = makeDir(tqparentName, true /*quiet*/); + TQString parentName = destName.left(pos); + bool bSuccess = makeDir(parentName, true /*quiet*/); if (!bSuccess) return false; } @@ -2631,8 +2631,8 @@ bool DirectoryMergeWindow::makeDir( const TQString& name, bool bQuiet ) int pos=name.tqfindRev('/'); if ( pos>0 ) { - TQString tqparentName = name.left(pos); - bool bSuccess = makeDir(tqparentName,true); + TQString parentName = name.left(pos); + bool bSuccess = makeDir(parentName,true); if (!bSuccess) return false; } |