--- a/secureswitools/swisistools/source/sisxlibrary/utility.h Wed Sep 15 12:20:42 2010 +0300
+++ b/secureswitools/swisistools/source/sisxlibrary/utility.h Wed Oct 13 14:40:19 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of the License "Eclipse Public License v1.0"
@@ -32,13 +32,11 @@
#include <string>
#include "basetype.h"
#include "fieldroot.h"
-#include "../common/toolsconf.h"
#define FreeMemory(x) {if((x) != NULL) {free(x); (x)=NULL;}}
// Constants
const std::wstring KSisDirectorySeparator( L"/" );
-const std::wstring KSisInitialNetworkPathSlashes( L"//" );
typedef struct {
wchar_t* iName;
@@ -64,7 +62,7 @@
int SearchSortedUCTable (const SIdentifierTable aTable [], const std::wstring& aIdentifier);
TUint32 IdentifyUCKeyword (const SKeyword aKeyword [], std::wstring aIdentifier, const std::wstring& aContext);
-DllExport std::string wstring2string (const std::wstring& aWide);
+std::string wstring2string (const std::wstring& aWide);
std::wstring string2wstring (const std::string& aNarrow);
bool ValidateFileName (std::wstring& aName, const bool aMustExist);
bool ValidateFileName (std::wstring& aName, const bool aMustExist, const std::wstring& aDefaultExtension);