Mercurial > hg > easyhg-kdiff3

changeset 112:0180c7f92563

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build fixes
author Chris Cannam
date Fri, 07 Dec 2018 13:40:01 +0000
parents 44fa471eb3c4
children 7bca1f1340f6
files .hgignore kdiff3/src-QT4/ccInstHelper.cpp kdiff3/src-QT4/fileaccess.cpp kdiff3/src-QT4/kreplacements/ShellContextMenu.cpp kdiff3/src-QT4/kreplacements/kreplacements.cpp
diffstat 5 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Fri Dec 07 13:40:01 2018 +0000
@@ -0,0 +1,5 @@
+syntax: glob
+build_win32
+moc_*
+*.obj
+stable.h.cpp
--- a/kdiff3/src-QT4/ccInstHelper.cpp	Fri May 27 14:16:02 2016 +0100
+++ b/kdiff3/src-QT4/ccInstHelper.cpp	Fri Dec 07 13:40:01 2018 +0000
@@ -17,7 +17,7 @@
 #endif
 
 struct ReplacementItem
-{ char* fileType; char* operationType; };
+{ const char* fileType; const char* operationType; };
 
 ReplacementItem g_replacementTable[] = {
    {"text_file_delta",   "xcompare"},
--- a/kdiff3/src-QT4/fileaccess.cpp	Fri May 27 14:16:02 2016 +0100
+++ b/kdiff3/src-QT4/fileaccess.cpp	Fri Dec 07 13:40:01 2018 +0000
@@ -1264,6 +1264,10 @@
          WIN32_FIND_DATA findData;
          WIN32_FIND_DATAA& findDataA=*(WIN32_FIND_DATAA*)&findData;  // Needed for Win95
 
+#ifndef QT_WA_INLINE
+#define QT_WA_INLINE(unicode, ansi) (unicode)
+#endif
+         
          Qt::HANDLE searchHandle = QT_WA_INLINE(
                  FindFirstFile( (TCHAR*)pattern.utf16(), &findData ),
                  FindFirstFileA( pattern.toLocal8Bit(), &findDataA )
--- a/kdiff3/src-QT4/kreplacements/ShellContextMenu.cpp	Fri May 27 14:16:02 2016 +0100
+++ b/kdiff3/src-QT4/kreplacements/ShellContextMenu.cpp	Fri Dec 07 13:40:01 2018 +0000
@@ -148,7 +148,7 @@
 
 UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QMenu* pMenu )
 {
-        HWND hWnd = pParentWidget->winId();
+        HWND hWnd = (HWND)pParentWidget->winId();
         int iMenuType = 0;	// to know which version of IContextMenu is supported
 	LPCONTEXTMENU pContextMenu;	// common pointer to IContextMenu and higher version interface
    
@@ -187,7 +187,7 @@
 	else
 		OldWndProc = NULL;
 
-	UINT idCommand = TrackPopupMenu (m_hMenu,TPM_RETURNCMD | TPM_LEFTALIGN, pt.x(), pt.y(), 0, pParentWidget->winId(), 0);
+	UINT idCommand = TrackPopupMenu (m_hMenu,TPM_RETURNCMD | TPM_LEFTALIGN, pt.x(), pt.y(), 0, (HWND)pParentWidget->winId(), 0);
 
 	if (OldWndProc) // unsubclass
 		SetWindowLong (hWnd, GWL_WNDPROC, (DWORD) OldWndProc);
--- a/kdiff3/src-QT4/kreplacements/kreplacements.cpp	Fri May 27 14:16:02 2016 +0100
+++ b/kdiff3/src-QT4/kreplacements/kreplacements.cpp	Fri Dec 07 13:40:01 2018 +0000
@@ -80,7 +80,7 @@
 
 #ifndef Q_OS_OS2
       char buf[256];
-      HINSTANCE hi = FindExecutableA( helpFile.fileName().toAscii(), helpFile.absolutePath().toAscii(), buf );
+      HINSTANCE hi = FindExecutableA( helpFile.fileName().toLocal8Bit(), helpFile.absolutePath().toLocal8Bit(), buf );
       if ( int(hi)<=32 )
       {
 #endif