Index: src/ch/AppHelper.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -rffb46a396ce20cda2e04020cf01c118ae81642b5
--- src/ch/AppHelper.h	(.../AppHelper.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/AppHelper.h	(.../AppHelper.h)	(revision ffb46a396ce20cda2e04020cf01c118ae81642b5)
@@ -1,42 +1,67 @@
-#ifndef __APPHELPER_H__
-#define __APPHELPER_H__
-
-class CAppHelper
-{
-public:
-	CAppHelper();
-	~CAppHelper();
-
-	void SetAutorun(bool bState);		// changes state of "run with system" option
-	PTSTR ExpandPath(PTSTR pszString);	// expands path string - ie. <windows> into c:\windows
-
-	bool IsFirstInstance() const { return m_bFirstInstance; };
-
-	PCTSTR GetAppName() const { return m_pszAppName; };
-	PCTSTR GetAppNameVer() const { return m_pszAppNameVer; };
-	PCTSTR GetAppVersion() const { return m_pszAppVersion; };
-
-	PCTSTR GetProgramPath() const { return m_pszProgramPath; };
-	PCTSTR GetProgramName() const { return m_pszProgramName; };
-
-protected:
-	void InitProtection();		// optional call - protects from running multiple instance
-	void RetrievePaths();							// reads program's path and name
-	void RetrieveAppInfo();							// reads app name and version from VERSION resource
-	UINT GetFolderLocation(int iFolder, PTSTR pszBuffer);
-
-protected:
-	HANDLE m_hMutex;
-	bool m_bFirstInstance;		// tells if it is first instance(true) or second(or third, ...)
-	TCHAR *m_pszMutexName;		// name of the protection mutex
-
-	// program placement
-	TCHAR* m_pszProgramPath;	// path from which this program was run
-	TCHAR* m_pszProgramName;	// name of this program (ie. CH.exe)
-
-	TCHAR* m_pszAppName;		// app-name string of this app
-	TCHAR* m_pszAppNameVer;		// extended app-name-with small version
-	TCHAR* m_pszAppVersion;		// app-version string of this app (VERSION based)
-};
-
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
+#ifndef __APPHELPER_H__
+#define __APPHELPER_H__
+
+#include <boost/optional.hpp>
+#include "TPathProcessor.h"
+
+class CAppHelper
+{
+public:
+	CAppHelper();
+	virtual ~CAppHelper();
+
+	bool SetAutorun(bool bState);		// changes state of "run with system" option
+
+	bool IsFirstInstance() const { return m_bFirstInstance; };
+
+	PCTSTR GetAppName() const { return m_pszAppName; };
+	PCTSTR GetAppNameVer() const { return m_pszAppNameVer; };
+	PCTSTR GetAppVersion() const { return m_pszAppVersion; };
+
+	PCTSTR GetProgramName() const { return m_pszProgramName; };
+
+	bool GetProgramDataPath(CString& rStrPath);
+	CString ExpandPath(CString strPath);
+	CString GetProgramPath() const;
+
+	bool IsInPortableMode();
+
+protected:
+	void InitProtection();		// optional call - protects from running multiple instance
+	void RetrievePaths();							// reads program's path and name
+	void RetrieveAppInfo();							// reads app name and version from VERSION resource
+
+protected:
+	HANDLE m_hMutex;
+	bool m_bFirstInstance;		// tells if it is first instance(true) or second(or third, ...)
+
+	// program placement
+	TPathProcessor m_pathProcessor;
+	TCHAR* m_pszProgramName;	// name of this program (ie. CH.exe)
+
+	TCHAR* m_pszAppName;		// app-name string of this app
+	TCHAR* m_pszAppNameVer;		// extended app-name-with small version
+	TCHAR* m_pszAppVersion;		// app-version string of this app (VERSION based)
+
+	boost::optional<bool> m_optPortableMode;
+};
+
 #endif
\ No newline at end of file