[Scummvm-cvs-logs] SF.net SVN: scummvm:[48643] scummvm/trunk/engines/kyra/kyra_v1.h

[lordhoto at users.sourceforge.net]

Revision: 48643
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48643&view=rev
Author:   lordhoto
Date:     2010-04-12 19:50:40 +0000 (Mon, 12 Apr 2010)

Log Message:
-----------
Revert "Fix use of "friend" keyword in KYRA for strict C++ compilers."

Actually g++ is just fine in this case :-). The thing I missed here
was that I declared the "offending" classes as friends in subclasses
of KyraEngine_v1, thus those friends were allowed to access the
protected elements of KyraEngine_v1 too.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v1.h

Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h	2010-04-12 19:40:54 UTC (rev 48642)
+++ scummvm/trunk/engines/kyra/kyra_v1.h	2010-04-12 19:50:40 UTC (rev 48643)
@@ -177,9 +177,6 @@
 friend class Debugger;
 friend class ::KyraMetaEngine;
 friend class GUI;
-friend class GUI_LoL;
-friend class GUI_LoK;
-friend class GUI_v2;
 friend class SoundMidiPC;    // For _eventMan
 public:
 	KyraEngine_v1(OSystem *system, const GameFlags &flags);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.