From a99b922856c17c262c78506b1466192415656453 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Fri, 14 Feb 2014 23:32:36 +0100
Subject: [PATCH] Fixed a few types.

---
 src/thread_encode.cpp |  2 +-
 src/version.h         |  2 +-
 src/win_addJob.cpp    | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/thread_encode.cpp b/src/thread_encode.cpp
index 4697194..bc798e2 100644
--- a/src/thread_encode.cpp
+++ b/src/thread_encode.cpp
@@ -233,7 +233,7 @@ void EncodeThread::encode(void)
 	//Print system info
 	log(tr("\n--- SYSTEMINFO ---\n"));
 	log(tr("Binary Path: %1").arg(QDir::toNativeSeparators(m_sysinfo->getAppPath())));
-	log(tr("Avisynth 2x: %1").arg(m_sysinfo->hasAVSSupport() ? tr("YES") : tr("NO")));
+	log(tr("Avisynth OK: %1").arg(m_sysinfo->hasAVSSupport() ? tr("Yes") : tr("No")));
 	log(tr("VapourSynth: %1").arg(m_sysinfo->hasVPSSupport() ? QDir::toNativeSeparators(m_sysinfo->getVPSPath()) : tr("N/A")));
 
 	//Print encoder settings
diff --git a/src/version.h b/src/version.h
index f4000ea..af0b810 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 3
 #define VER_X264_PATCH 1
-#define VER_X264_BUILD 769
+#define VER_X264_BUILD 770
 
 #define VER_X264_MINIMUM_REV 2380
 #define VER_X264_CURRENT_API 142
diff --git a/src/win_addJob.cpp b/src/win_addJob.cpp
index fbf03f2..6ec3a6f 100644
--- a/src/win_addJob.cpp
+++ b/src/win_addJob.cpp
@@ -306,8 +306,8 @@ AddJobDialog::~AddJobDialog(void)
 		{
 			continue;
 		}
-		OptionsModel *item = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(i).value<void*>());
-		ui->cbxTemplate->setItemData(i, QVariant::fromValue<void*>(NULL));
+		const OptionsModel *item = reinterpret_cast<const OptionsModel*>(ui->cbxTemplate->itemData(i).value<const void*>());
+		ui->cbxTemplate->setItemData(i, QVariant::fromValue<const void*>(NULL));
 		X264_DELETE(item);
 	}
 
@@ -623,7 +623,7 @@ void AddJobDialog::saveTemplateButtonClicked(void)
 		{
 			continue;
 		}
-		OptionsModel* test = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(i).value<void*>());
+		const OptionsModel* test = reinterpret_cast<const OptionsModel*>(ui->cbxTemplate->itemData(i).value<const void*>());
 		if(test != NULL)
 		{
 			if(options->equals(test))
@@ -684,15 +684,15 @@ void AddJobDialog::saveTemplateButtonClicked(void)
 		if(ui->cbxTemplate->itemText(i).compare(name, Qt::CaseInsensitive) == 0)
 		{
 			index = -1; //Do not append new template
-			OptionsModel *oldItem = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(i).value<void*>());
-			ui->cbxTemplate->setItemData(i, QVariant::fromValue<void*>(options));
+			const OptionsModel *oldItem = reinterpret_cast<const OptionsModel*>(ui->cbxTemplate->itemData(i).value<const void*>());
+			ui->cbxTemplate->setItemData(i, QVariant::fromValue<const void*>(options));
 			ui->cbxTemplate->setCurrentIndex(i);
 			X264_DELETE(oldItem);
 		}
 	}
 	if(index >= 0)
 	{
-		ui->cbxTemplate->insertItem(index, name, QVariant::fromValue<void*>(options));
+		ui->cbxTemplate->insertItem(index, name, QVariant::fromValue<const void*>(options));
 		ui->cbxTemplate->setCurrentIndex(index);
 	}
 	ui->cbxTemplate->blockSignals(false);
@@ -719,7 +719,7 @@ void AddJobDialog::deleteTemplateButtonClicked(void)
 
 
 	OptionsModel::deleteTemplate(name);
-	OptionsModel *item = reinterpret_cast<OptionsModel*>(ui->cbxTemplate->itemData(index).value<void*>());
+	const OptionsModel *item = reinterpret_cast<const OptionsModel*>(ui->cbxTemplate->itemData(index).value<const void*>());
 	ui->cbxTemplate->removeItem(index);
 	X264_DELETE(item);
 }