From f7aa064edc20eafbc738271c5b53238fa4ad8361 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 6 Jun 2013 08:11:28 +0200
Subject: Remove dead code

---
 ftnoir_protocol_sc/ftnoir_protocol_sc.cpp        | 45 ------------------------
 ftnoir_protocol_sc/ftnoir_protocol_sc.h          |  3 --
 ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp |  5 ---
 3 files changed, 53 deletions(-)

(limited to 'ftnoir_protocol_sc')

diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
index a4648a74..ba4c9012 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
@@ -153,53 +153,8 @@ PDWORD_PTR MsgResult = 0;
 //
 bool FTNoIR_Protocol::checkServerInstallationOK()
 {   
-    // Code to activate the context for the SimConnect DLL
-    ACTCTXA act;
-	HANDLE hctx;
-	ULONG_PTR ulCookie;
-
-    memset(&act, 0, sizeof(act));
-
 	qDebug() << "SCCheckClientDLL says: Starting Function";
 
-	try {
-#if 0
-		act.cbSize = sizeof(act);
-		act.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID;
-        char full_path[2048];
-        QByteArray foo = QCoreApplication::applicationDirPath().toLatin1();
-        strcpy(full_path, foo.constData());
-        strcat(full_path, "/opentrack-proto-simconnect.dll");
-
-        act.lpSource = full_path;
-        act.lpResourceName = MAKEINTRESOURCEA(101);
-
-        hctx = CreateActCtxA (&act);
-
-		if (hctx != INVALID_HANDLE_VALUE) { 
-			if (!ActivateActCtx(hctx, &ulCookie)) { 
-				ReleaseActCtx(hctx);
-				qDebug() << "SCCheckClientDLL says: Error activating SimConnect manifest";
-			}
-		}
-		else {
-			qDebug() << "SCCheckClientDLL says: Error INVALID_HANDLE: " << GetLastError();
-			return false;
-		}
-		//
-		// Just try to load the DLL. Let Windows handle the PATH's and such trivialities...
-		//
-		//
-		// Deactivate the context again: the function-references should stay in-tact...
-		//
-		DeactivateActCtx(0, ulCookie);
-		ReleaseActCtx(hctx);
-#endif
-	} catch(...) {
-		qDebug() << "SCCheckClientDLL says: Error loading SimConnect DLL";
-		return false;
-	}
-
     const char* simconnect_paths[] = {
         "SimConnect.DLL",
         "C:\\Windows\\WinSxS\\x86_microsoft.flightsimulator.simconnect_67c7c14424d61b5b_10.0.60905.0_none_dd92b94d8a196297\\SimConnect.DLL",
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.h b/ftnoir_protocol_sc/ftnoir_protocol_sc.h
index f069aa9c..62210d32 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc.h
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.h
@@ -83,7 +83,6 @@ class FTNoIR_Protocol : public IProtocol
 public:
 	FTNoIR_Protocol();
 	~FTNoIR_Protocol();
-    void Initialize() {}
     bool checkServerInstallationOK();
     void sendHeadposeToGame( double *headpose, double *rawheadpose );
     QString getGameName() {
@@ -136,8 +135,6 @@ public:
 	explicit SCControls();
     virtual ~SCControls();
 	void showEvent ( QShowEvent * event );
-
-	void Release();											// Member functions which are accessible from outside the DLL
     void Initialize(QWidget *parent);
 	void registerProtocol(IProtocol *protocol) {
 		theProtocol = (FTNoIR_Protocol *) protocol;			// Accept the pointer to the Protocol
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
index 38ca9605..bbc56e54 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
@@ -64,11 +64,6 @@ SCControls::~SCControls() {
 	qDebug() << "~SCControls() says: started";
 }
 
-void SCControls::Release()
-{
-    delete this;
-}
-
 //
 // Initialize tracker-client-dialog
 //
-- 
cgit v1.2.3