Author: aschnell Date: Thu Jan 15 14:39:24 2009 New Revision: 54644 URL: http://svn.opensuse.org/viewcvs/yast?rev=54644&view=rev Log: - backup Modified: branches/tmp/aschnell/graph/libyui/src/YGraph.cc branches/tmp/aschnell/graph/libyui/src/YGraph.h branches/tmp/aschnell/graph/qt-graph/src/YQGraph.h branches/tmp/aschnell/graph/qt-graph/src/YQGraphPlugin.cc branches/tmp/aschnell/graph/qt-graph/src/YQGraphPlugin.h branches/tmp/aschnell/graph/qt-graph/src/YQGraphPluginImpl.cc branches/tmp/aschnell/graph/qt-graph/src/YQGraphPluginImpl.h branches/tmp/aschnell/graph/qt/src/YQGraphPluginIf.h branches/tmp/aschnell/graph/qt/src/YQGraphPluginStub.cc Modified: branches/tmp/aschnell/graph/libyui/src/YGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/graph/libyui/src/YGraph.cc?rev=54644&r1=54643&r2=54644&view=diff ============================================================================== --- branches/tmp/aschnell/graph/libyui/src/YGraph.cc (original) +++ branches/tmp/aschnell/graph/libyui/src/YGraph.cc Thu Jan 15 14:39:24 2009 @@ -104,7 +104,6 @@ { /* * @property string Filename name of the file describing the graph - * @property string Value alias for Filename * @property string Layout layout-algorithm used from the graph */ propSet.add( YProperty( YUIProperty_Filename, YStringProperty ) ); @@ -121,8 +120,7 @@ { propertySet().check( propertyName, val.type() ); // throws exceptions if not found or type mismatch - if ( propertyName == YUIProperty_Value ) setFilename( val.stringVal() ); - else if ( propertyName == YUIProperty_Filename ) setFilename( val.stringVal() ); + if ( propertyName == YUIProperty_Filename ) setFilename( val.stringVal() ); else if ( propertyName == YUIProperty_Layout ) setLayoutAlgorithm( val.stringVal() ); else { @@ -138,8 +136,7 @@ { propertySet().check( propertyName ); // throws exceptions if not found - if ( propertyName == YUIProperty_Value ) return YPropertyValue( filename() ); - else if ( propertyName == YUIProperty_Filename ) return YPropertyValue( filename() ); + if ( propertyName == YUIProperty_Filename ) return YPropertyValue( filename() ); else if ( propertyName == YUIProperty_Layout ) return YPropertyValue( layoutAlgorithm() ); else { Modified: branches/tmp/aschnell/graph/libyui/src/YGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/graph/libyui/src/YGraph.h?rev=54644&r1=54643&r2=54644&view=diff ============================================================================== --- branches/tmp/aschnell/graph/libyui/src/YGraph.h (original) +++ branches/tmp/aschnell/graph/libyui/src/YGraph.h Thu Jan 15 14:39:24 2009 @@ -92,26 +92,13 @@ string filename() const; /** - * Set the filename that describes the graph and rebuild the graph. + * Set the filename that describes the graph and render the graph. * Derived classes can reimplent this, but they should call this base * class method in the new implementation. Most derived classes only need - * to implement rebuildGraph(). + * to implement renderGraph(). **/ virtual void setFilename( const string & filename ); - - virtual void setGraph( graph_t * graph ); - - /** - * Alias for filename() - **/ - string value() const { return filename(); } - - /** - * Alias for SetFilename() - **/ - void setValue( const string & val ) { setFilename( val ); } - /** * Return the layout-algorithm used for the graph. **/ @@ -124,14 +111,24 @@ **/ virtual void setLayoutAlgorithm( const string & filename ); + /** + * Render the graph. Derived classes can reimplent this, but they should + * call this base class method in the new implementation. Most derived + * classes only need to implement renderGraph(). + **/ + virtual void setGraph( graph_t * graph ); + protected: /** - * Build the graph from the internally stored filename. - * Derived classes are required to implement this. + * Render the graph from the filename. Derived classes are required to + * implement this. **/ virtual void renderGraph( const string & filename ) = 0; + /** + * Render the graph. Derived classes are required to implement this. + **/ virtual void renderGraph( graph_t * graph ) = 0; private: Modified: branches/tmp/aschnell/graph/qt-graph/src/YQGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/graph/qt-graph/src/YQGraph.h?rev=54644&r1=54643&r2=54644&view=diff ============================================================================== --- branches/tmp/aschnell/graph/qt-graph/src/YQGraph.h (original) +++ branches/tmp/aschnell/graph/qt-graph/src/YQGraph.h Thu Jan 15 14:39:24 2009 @@ -7,7 +7,7 @@ | |_|\__,_|____/ |_| |_____| | | | | core system | -| (c) SuSE Linux AG | +| (c) SuSE Linux GmbH | \----------------------------------------------------------------------/ File: YQGraph.h Modified: branches/tmp/aschnell/graph/qt-graph/src/YQGraphPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/graph/qt-graph/src/YQGraphPlugin.cc?rev=54644&r1=54643&r2=54644&view=diff ============================================================================== --- branches/tmp/aschnell/graph/qt-graph/src/YQGraphPlugin.cc (original) +++ branches/tmp/aschnell/graph/qt-graph/src/YQGraphPlugin.cc Thu Jan 15 14:39:24 2009 @@ -7,7 +7,7 @@ | |_|\__,_|____/ |_| |_____| | | | | core system | -| (c) SuSE Linux AG | +| (c) SuSE Linux GmbH | \----------------------------------------------------------------------/ File: YQGraphPlugin.cc Modified: branches/tmp/aschnell/graph/qt-graph/src/YQGraphPlugin.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/graph/qt-graph/src/YQGraphPlugin.h?rev=54644&r1=54643&r2=54644&view=diff ============================================================================== --- branches/tmp/aschnell/graph/qt-graph/src/YQGraphPlugin.h (original) +++ branches/tmp/aschnell/graph/qt-graph/src/YQGraphPlugin.h Thu Jan 15 14:39:24 2009 @@ -7,7 +7,7 @@ | |_|\__,_|____/ |_| |_____| | | | | core system | -| (c) SuSE Linux AG | +| (c) SuSE Linux GmbH | \----------------------------------------------------------------------/ File: YQGraphPlugin.h Modified: branches/tmp/aschnell/graph/qt-graph/src/YQGraphPluginImpl.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/graph/qt-graph/src/YQGraphPluginImpl.cc?rev=54644&r1=54643&r2=54644&view=diff ============================================================================== --- branches/tmp/aschnell/graph/qt-graph/src/YQGraphPluginImpl.cc (original) +++ branches/tmp/aschnell/graph/qt-graph/src/YQGraphPluginImpl.cc Thu Jan 15 14:39:24 2009 @@ -7,7 +7,7 @@ | |_|\__,_|____/ |_| |_____| | | | | core system | -| (c) SuSE Linux AG | +| (c) SuSE Linux GmbH | \----------------------------------------------------------------------/ File: YQGraphPluginImpl.cc Modified: branches/tmp/aschnell/graph/qt-graph/src/YQGraphPluginImpl.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/graph/qt-graph/src/YQGraphPluginImpl.h?rev=54644&r1=54643&r2=54644&view=diff ============================================================================== --- branches/tmp/aschnell/graph/qt-graph/src/YQGraphPluginImpl.h (original) +++ branches/tmp/aschnell/graph/qt-graph/src/YQGraphPluginImpl.h Thu Jan 15 14:39:24 2009 @@ -7,7 +7,7 @@ | |_|\__,_|____/ |_| |_____| | | | | core system | -| (c) SuSE Linux AG | +| (c) SuSE Linux GmbH | \----------------------------------------------------------------------/ File: YQGraphPluginImpl.h Modified: branches/tmp/aschnell/graph/qt/src/YQGraphPluginIf.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/graph/qt/src/YQGraphPluginIf.h?rev=54644&r1=54643&r2=54644&view=diff ============================================================================== --- branches/tmp/aschnell/graph/qt/src/YQGraphPluginIf.h (original) +++ branches/tmp/aschnell/graph/qt/src/YQGraphPluginIf.h Thu Jan 15 14:39:24 2009 @@ -7,7 +7,7 @@ | |_|\__,_|____/ |_| |_____| | | | | core system | -| (c) SuSE Linux AG | +| (c) SuSE Linux GmbH | \----------------------------------------------------------------------/ File: YQGraphPluginIf.h Modified: branches/tmp/aschnell/graph/qt/src/YQGraphPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/graph/qt/src/YQGraphPluginStub.cc?rev=54644&r1=54643&r2=54644&view=diff ============================================================================== --- branches/tmp/aschnell/graph/qt/src/YQGraphPluginStub.cc (original) +++ branches/tmp/aschnell/graph/qt/src/YQGraphPluginStub.cc Thu Jan 15 14:39:24 2009 @@ -7,7 +7,7 @@ | |_|\__,_|____/ |_| |_____| | | | | core system | -| (c) SuSE Linux AG | +| (c) SuSE Linux GmbH | \----------------------------------------------------------------------/ File: YQGraphPluginStub.cc -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org