← Back to branch summary

~unity-team/nux/nux.remove-deprecated

« back to all changes in this revision

Viewing changes to NuxCore/Plugin/NPluginManager.cpp

  • Committer: Tarmac
  • Author(s): Jay Taoko, Michi Henning
  • Date: 2012-10-11 18:57:49 UTC
  • mfrom: (686.3.4 nux.nstring-removal)
  • Revision ID: tarmac-20121011185749-v8y4evu36vue3rfx
* Removal of nux::NString in favor of std::string.
* The branch has a lot of changes due to the enablement of -Werror. All the warnings have been fixed.
* -Werror is disabled when building with --enable-debug.

[Test] The changes are covered by existing tests.. Fixes: https://bugs.launchpad.net/bugs/1065293. Approved by Jay Taoko.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NuxCore/Plugin/NPluginManager.cpp
63
63
        if (! (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
64
64
        {
65
65
          NFileName FilePath = Path + NUX_PATH_SEPARATOR_STRING + fd.cFileName;
66
 
          dllHandle = LoadLibrary (FilePath.GetTCharPtr() );
 
66
          dllHandle = LoadLibrary (FilePath.c_str() );
67
67
 
68
68
          if (dllHandle != NULL)
69
69
          {
73
73
            if (funcHandle != NULL)
74
74
            {
75
75
              NPlugin *curPlugin = new NPlugin();
76
 
              curPlugin->SetFileName (FilePath.GetTCharPtr() );
 
76
              curPlugin->SetFileName (FilePath.c_str() );
77
77
 
78
78
              PLUGIN_TEXTFUNC textFunc;
79
79
              textFunc = reinterpret_cast<PLUGIN_TEXTFUNC> (GetProcAddress (dllHandle, "getPluginType") );