Mercurial > hg > easyhg-kdiff3
changeset 111:44fa471eb3c4
Update for Qt5
| author | Chris Cannam |
|---|---|
| date | Fri, 27 May 2016 14:16:02 +0100 |
| parents | 3d87e427431d |
| children | 0180c7f92563 |
| files | kdiff3/src-QT4/fileaccess.cpp kdiff3/src-QT4/kdiff3.pro kdiff3/src-QT4/kreplacements/kreplacements.cpp |
| diffstat | 3 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/kdiff3/src-QT4/fileaccess.cpp Wed Apr 13 15:15:50 2011 +0000 +++ b/kdiff3/src-QT4/fileaccess.cpp Fri May 27 14:16:02 2016 +0100 @@ -501,7 +501,7 @@ break; } } - return QDir::convertSeparators(fileName+".2"); + return QDir::toNativeSeparators(fileName+".2"); #else // using KDE @@ -1050,7 +1050,7 @@ ++pos1; } } - delete buf; + delete[] buf; } } }
--- a/kdiff3/src-QT4/kdiff3.pro Wed Apr 13 15:15:50 2011 +0000 +++ b/kdiff3/src-QT4/kdiff3.pro Fri May 27 14:16:02 2016 +0100 @@ -1,4 +1,5 @@ TEMPLATE = app +QT += widgets printsupport # When unresolved items remain during linking: Try adding "shared" in the CONFIG. CONFIG += qt warn_on thread precompile_header !os2:PRECOMPILED_HEADER = stable.h
--- a/kdiff3/src-QT4/kreplacements/kreplacements.cpp Wed Apr 13 15:15:50 2011 +0000 +++ b/kdiff3/src-QT4/kreplacements/kreplacements.cpp Fri May 27 14:16:02 2016 +0100 @@ -1211,9 +1211,9 @@ { KParts::Factory* f = dynamic_cast<KParts::Factory*>(this); if (f!=0) - return f->createPartObject( (QWidget*)pParent, name.toAscii(), - pParent, name.toAscii(), - classname.toAscii(), QStringList() ); + return f->createPartObject( (QWidget*)pParent, name.toLatin1(), + pParent, name.toLatin1(), + classname.toLatin1(), QStringList() ); else return 0; }