Author: sh-sh-sh Date: Mon Feb 18 18:55:28 2008 New Revision: 44606 URL: http://svn.opensuse.org/viewcvs/yast?rev=44606&view=rev Log: consistent naming Added: trunk/core/libyui/src/ycp-ui/YUIComponentCreator.cc - copied, changed from r44605, trunk/core/libyui/src/ycp-ui/Y2CCUI.cc trunk/core/libyui/src/ycp-ui/YUIComponentCreator.h - copied, changed from r44605, trunk/core/libyui/src/ycp-ui/Y2CCUI.h trunk/core/libyui/src/ycp-ui/YUINamespace.cc - copied, changed from r44604, trunk/core/libyui/src/ycp-ui/Y2UINamespace.cc trunk/core/libyui/src/ycp-ui/YUINamespace.h - copied, changed from r44604, trunk/core/libyui/src/ycp-ui/Y2UINamespace.h Removed: trunk/core/libyui/src/ycp-ui/Y2CCUI.cc trunk/core/libyui/src/ycp-ui/Y2CCUI.h trunk/core/libyui/src/ycp-ui/Y2UINamespace.cc trunk/core/libyui/src/ycp-ui/Y2UINamespace.h Modified: trunk/core/libyui/src/YUI.h trunk/core/libyui/src/ycp-ui/Makefile.am trunk/core/libyui/src/ycp-ui/YCPBuiltinCaller.cc trunk/core/libyui/src/ycp-ui/YCPBuiltinCaller.h trunk/core/libyui/src/ycp-ui/YUIComponent.cc Modified: trunk/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI.h?rev=44606&r1=44605&r2=44606&view=diff ============================================================================== --- trunk/core/libyui/src/YUI.h (original) +++ trunk/core/libyui/src/YUI.h Mon Feb 18 18:55:28 2008 @@ -42,7 +42,7 @@ **/ class YUI { - friend class Y2UIFunction; + friend class YUIFunction; protected: /** Modified: trunk/core/libyui/src/ycp-ui/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ycp-ui/Makefile.am?rev=44606&r1=44605&r2=44606&view=diff ============================================================================== --- trunk/core/libyui/src/ycp-ui/Makefile.am (original) +++ trunk/core/libyui/src/ycp-ui/Makefile.am Mon Feb 18 18:55:28 2008 @@ -10,9 +10,9 @@ plugin_LTLIBRARIES = libpy2UI.la libpy2UI_la_SOURCES = \ - Y2CCUI.cc \ + YUIComponentCreator.cc \ YUIComponent.cc \ - Y2UINamespace.cc \ + YUINamespace.cc \ YCP_UI.cc \ YCP_util.cc \ YCPBuiltinCaller.cc \ @@ -41,7 +41,7 @@ pkgincludedir = $(includedir)/ycp-ui pkginclude_HEADERS = \ - Y2CCUI.h \ + YUIComponentCreator.h \ YUIComponent.h \ \ YCP_UI.h \ @@ -51,7 +51,7 @@ noinst_HEADERS = \ - Y2UINamespace.h \ + YUINamespace.h \ YCP_util.h \ YCPBuiltinCaller.h \ \ @@ -90,7 +90,7 @@ # "foo bar: baz" is wrong # see "info '(automake)Multiple Outputs'" -%BuiltinCalls.h %BuiltinTable.h : Y2%Namespace.h +%BuiltinCalls.h %BuiltinTable.h : Y%Namespace.h ${top_srcdir}/base/tools/devtools/generateYCPWrappers $< $*BuiltinCalls.h $*BuiltinTable.h BUILT_SOURCES = UIBuiltinTable.h UIBuiltinCalls.h Modified: trunk/core/libyui/src/ycp-ui/YCPBuiltinCaller.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ycp-ui/YCPBuiltinCaller.cc?rev=44606&r1=44605&r2=44606&view=diff ============================================================================== --- trunk/core/libyui/src/ycp-ui/YCPBuiltinCaller.cc (original) +++ trunk/core/libyui/src/ycp-ui/YCPBuiltinCaller.cc Mon Feb 18 18:55:28 2008 @@ -18,7 +18,7 @@ #include "YCPBuiltinCaller.h" -#include "Y2UINamespace.h" +#include "YUINamespace.h" void Modified: trunk/core/libyui/src/ycp-ui/YCPBuiltinCaller.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ycp-ui/YCPBuiltinCaller.h?rev=44606&r1=44605&r2=44606&view=diff ============================================================================== --- trunk/core/libyui/src/ycp-ui/YCPBuiltinCaller.h (original) +++ trunk/core/libyui/src/ycp-ui/YCPBuiltinCaller.h Mon Feb 18 18:55:28 2008 @@ -22,7 +22,7 @@ #include "YBuiltinCaller.h" #include "ycp/YCPValue.h" -class Y2UIFunction; +class YUIFunction; /** @@ -41,7 +41,7 @@ /** * Set the built-in function to be called. **/ - void setFunction( Y2UIFunction * function ) { _function = function; } + void setFunction( YUIFunction * function ) { _function = function; } /** * Call the built-in. @@ -57,7 +57,7 @@ private: - Y2UIFunction * _function; + YUIFunction * _function; YCPValue _result; }; Modified: trunk/core/libyui/src/ycp-ui/YUIComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ycp-ui/YUIComponent.cc?rev=44606&r1=44605&r2=44606&view=diff ============================================================================== --- trunk/core/libyui/src/ycp-ui/YUIComponent.cc (original) +++ trunk/core/libyui/src/ycp-ui/YUIComponent.cc Mon Feb 18 18:55:28 2008 @@ -25,7 +25,7 @@ #include #include "YUIComponent.h" -#include "Y2UINamespace.h" +#include "YUINamespace.h" #include "YUI.h" #include "YUILoader.h" @@ -109,7 +109,7 @@ { if (_namespace == NULL) { - _namespace = new Y2UINamespace(this); + _namespace = new YUINamespace(this); y2debug ("Namespace created %p", _namespace); } Copied: trunk/core/libyui/src/ycp-ui/YUIComponentCreator.cc (from r44605, trunk/core/libyui/src/ycp-ui/Y2CCUI.cc) URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ycp-ui/YUIComponentCreator.cc?p2=trunk/core/libyui/src/ycp-ui/YUIComponentCreator.cc&p1=trunk/core/libyui/src/ycp-ui/Y2CCUI.cc&r1=44605&r2=44606&rev=44606&view=diff ============================================================================== --- trunk/core/libyui/src/ycp-ui/Y2CCUI.cc (original) +++ trunk/core/libyui/src/ycp-ui/YUIComponentCreator.cc Mon Feb 18 18:55:28 2008 @@ -10,7 +10,7 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: Y2CCUI.cc + File: YUIComponentCreator.cc Authors: Stanislav Visnovsky Stefan Hundhammer @@ -24,20 +24,23 @@ #include #include -#include "Y2CCUI.h" +#include "YUIComponentCreator.h" #include "YUIComponent.h" using std::string; +#define SUPPORT_GTK_UI 0 + + // Global instances of this class for the Y2ComponentBroker to find. // // The Y2Componentbroker will search for global symbols "g_y2cc" + component_name. -Y2CCUI g_y2ccUI; // UI +YUIComponentCreator g_y2ccUI; // UI -Y2CCUI::Y2CCUI() +YUIComponentCreator::YUIComponentCreator() : Y2ComponentCreator( Y2ComponentBroker::PLUGIN, true ) // force_register { @@ -58,7 +61,7 @@ Y2Component * -Y2CCUI::provideNamespace( const char * cname ) +YUIComponentCreator::provideNamespace( const char * cname ) { string name( cname ); @@ -76,7 +79,7 @@ Y2Component * -Y2CCUI::create( const char * cname ) const +YUIComponentCreator::create( const char * cname ) const { y2debug( "Requested \"%s\"", cname ); string name( cname ); @@ -124,7 +127,7 @@ Y2Component * -Y2CCUI::createInLevel( const char * name, int level, int currentLevel ) const +YUIComponentCreator::createInLevel( const char * name, int level, int currentLevel ) const { return create( name ); } Copied: trunk/core/libyui/src/ycp-ui/YUIComponentCreator.h (from r44605, trunk/core/libyui/src/ycp-ui/Y2CCUI.h) URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ycp-ui/YUIComponentCreator.h?p2=trunk/core/libyui/src/ycp-ui/YUIComponentCreator.h&p1=trunk/core/libyui/src/ycp-ui/Y2CCUI.h&r1=44605&r2=44606&rev=44606&view=diff ============================================================================== --- trunk/core/libyui/src/ycp-ui/Y2CCUI.h (original) +++ trunk/core/libyui/src/ycp-ui/YUIComponentCreator.h Mon Feb 18 18:55:28 2008 @@ -10,22 +10,16 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: Y2CCUI.h + File: YUIComponentCreator.h - Author: Stanislav Visnovsky - Maintainer: Stanislav Visnovsky + Authors: Stanislav Visnovsky + Stefan Hundhammer /-*/ -// -*- c++ -*- -/* - * Component Creator that executes access to UI - * - * Author: Stanislav Visnovsky - */ -#ifndef Y2CCUI_h -#define Y2CCUI_h +#ifndef YUIComponentCreator_h +#define YUIComponentCreator_h #include @@ -35,14 +29,14 @@ /** * Component creator that provides access to the UI **/ -class Y2CCUI : public Y2ComponentCreator +class YUIComponentCreator : public Y2ComponentCreator { public: /** * Constructor. **/ - Y2CCUI(); + YUIComponentCreator(); virtual bool isServerCreator () const { return true; } @@ -80,4 +74,4 @@ }; -#endif // Y2CCUI_h +#endif // YUIComponentCreator_h Copied: trunk/core/libyui/src/ycp-ui/YUINamespace.cc (from r44604, trunk/core/libyui/src/ycp-ui/Y2UINamespace.cc) URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ycp-ui/YUINamespace.cc?p2=trunk/core/libyui/src/ycp-ui/YUINamespace.cc&p1=trunk/core/libyui/src/ycp-ui/Y2UINamespace.cc&r1=44604&r2=44606&rev=44606&view=diff ============================================================================== --- trunk/core/libyui/src/ycp-ui/Y2UINamespace.cc (original) +++ trunk/core/libyui/src/ycp-ui/YUINamespace.cc Mon Feb 18 18:55:28 2008 @@ -10,7 +10,7 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: Y2UINamespace.cc + File: YUINamespace.cc Authors: Klaus Kaempf Stanislav Visnovsky @@ -33,7 +33,7 @@ #include "YCP_UI.h" #include "YUISymbols.h" #include "YUIComponent.h" -#include "Y2UINamespace.h" +#include "YUINamespace.h" #include "YCPBuiltinCaller.h" #include "YMacro.h" @@ -41,7 +41,7 @@ YCPValue -Y2UINamespace::SetLanguage( const YCPString & language ) +YUINamespace::SetLanguage( const YCPString & language ) { if ( YUIComponent::ui() ) YCP_UI::SetLanguage( language ); @@ -51,7 +51,7 @@ YCPValue -Y2UINamespace::SetLanguage( const YCPString & language, const YCPString & encoding ) +YUINamespace::SetLanguage( const YCPString & language, const YCPString & encoding ) { if ( YUIComponent::ui() ) YCP_UI::SetLanguage( language, encoding ); @@ -61,7 +61,7 @@ YCPValue -Y2UINamespace::GetProductName() +YUINamespace::GetProductName() { if ( YUIComponent::ui() ) return YCP_UI::GetProductName(); @@ -71,7 +71,7 @@ YCPValue -Y2UINamespace::SetProductName( const YCPString & name ) +YUINamespace::SetProductName( const YCPString & name ) { if ( YUIComponent::ui() ) YCP_UI::SetProductName( name ); @@ -81,7 +81,7 @@ YCPValue -Y2UINamespace::SetConsoleFont( const YCPString & console_magic, +YUINamespace::SetConsoleFont( const YCPString & console_magic, const YCPString & font, const YCPString & screen_map, const YCPString & unicode_map, @@ -98,7 +98,7 @@ YCPValue -Y2UINamespace::SetKeyboard() +YUINamespace::SetKeyboard() { if ( YUIComponent::ui() ) YCP_UI::SetKeyboard(); @@ -108,7 +108,7 @@ YCPValue -Y2UINamespace::GetLanguage( const YCPBoolean & strip ) +YUINamespace::GetLanguage( const YCPBoolean & strip ) { if ( YUIComponent::ui() ) return YCP_UI::GetLanguage( strip ); @@ -118,7 +118,7 @@ YCPValue -Y2UINamespace::RunInTerminal( const YCPString &module ) +YUINamespace::RunInTerminal( const YCPString &module ) { if ( YUIComponent::ui() ) return YCP_UI::RunInTerminal( module ); @@ -127,7 +127,7 @@ } YCPValue -Y2UINamespace::UserInput() +YUINamespace::UserInput() { if ( YUIComponent::ui() ) return YCP_UI::UserInput(); @@ -137,7 +137,7 @@ YCPValue -Y2UINamespace::PollInput() +YUINamespace::PollInput() { if ( YUIComponent::ui() ) return YCP_UI::PollInput(); @@ -147,7 +147,7 @@ YCPValue -Y2UINamespace::TimeoutUserInput( const YCPInteger& timeout ) +YUINamespace::TimeoutUserInput( const YCPInteger& timeout ) { if ( YUIComponent::ui() ) return YCP_UI::TimeoutUserInput( timeout ); @@ -157,7 +157,7 @@ YCPValue -Y2UINamespace::WaitForEvent() +YUINamespace::WaitForEvent() { if ( YUIComponent::ui() ) return YCP_UI::WaitForEvent(); @@ -167,7 +167,7 @@ YCPValue -Y2UINamespace::WaitForEvent( const YCPInteger & timeout ) +YUINamespace::WaitForEvent( const YCPInteger & timeout ) { if ( YUIComponent::ui() ) return YCP_UI::WaitForEvent( timeout ); @@ -177,7 +177,7 @@ YCPValue -Y2UINamespace::OpenDialog( const YCPTerm & opts, const YCPTerm & dialog_term ) +YUINamespace::OpenDialog( const YCPTerm & opts, const YCPTerm & dialog_term ) { if ( YUIComponent::ui() ) return YCP_UI::OpenDialog( opts, dialog_term ); @@ -187,7 +187,7 @@ YCPValue -Y2UINamespace::OpenDialog( const YCPTerm & dialog_term ) +YUINamespace::OpenDialog( const YCPTerm & dialog_term ) { if ( YUIComponent::ui() ) return YCP_UI::OpenDialog( YCPNull(), dialog_term ); @@ -197,7 +197,7 @@ YCPValue -Y2UINamespace::CloseDialog() +YUINamespace::CloseDialog() { if ( YUIComponent::ui() ) return YCP_UI::CloseDialog(); @@ -207,7 +207,7 @@ YCPValue -Y2UINamespace::ChangeWidget( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & new_value ) +YUINamespace::ChangeWidget( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & new_value ) { if ( YUIComponent::ui() ) return YCP_UI::ChangeWidget( widget_id, property, new_value ); @@ -217,7 +217,7 @@ YCPValue -Y2UINamespace::ChangeWidget( const YCPTerm & widget_id, const YCPSymbol & property, const YCPValue & new_value ) +YUINamespace::ChangeWidget( const YCPTerm & widget_id, const YCPSymbol & property, const YCPValue & new_value ) { if ( YUIComponent::ui() ) return YCP_UI::ChangeWidget( widget_id, property, new_value ); @@ -227,7 +227,7 @@ YCPValue -Y2UINamespace::ChangeWidget( const YCPTerm & widget_id, const YCPTerm & property, const YCPValue & new_value ) +YUINamespace::ChangeWidget( const YCPTerm & widget_id, const YCPTerm & property, const YCPValue & new_value ) { if ( YUIComponent::ui() ) return YCP_UI::ChangeWidget( widget_id, property, new_value ); @@ -237,7 +237,7 @@ YCPValue -Y2UINamespace::QueryWidget( const YCPSymbol & widget_id, const YCPSymbol & property ) +YUINamespace::QueryWidget( const YCPSymbol & widget_id, const YCPSymbol & property ) { if ( YUIComponent::ui() ) return YCP_UI::QueryWidget( widget_id, property ); @@ -247,7 +247,7 @@ YCPValue -Y2UINamespace::QueryWidget( const YCPSymbol & widget_id, const YCPTerm & property ) +YUINamespace::QueryWidget( const YCPSymbol & widget_id, const YCPTerm & property ) { if ( YUIComponent::ui() ) return YCP_UI::QueryWidget( widget_id, property ); @@ -257,7 +257,7 @@ YCPValue -Y2UINamespace::QueryWidget( const YCPTerm & widget_id, const YCPSymbol & property ) +YUINamespace::QueryWidget( const YCPTerm & widget_id, const YCPSymbol & property ) { if ( YUIComponent::ui() ) return YCP_UI::QueryWidget( widget_id, property ); @@ -267,7 +267,7 @@ YCPValue -Y2UINamespace::QueryWidget( const YCPTerm & widget_id, const YCPTerm & property ) +YUINamespace::QueryWidget( const YCPTerm & widget_id, const YCPTerm & property ) { if ( YUIComponent::ui() ) return YCP_UI::QueryWidget( widget_id, property ); @@ -277,7 +277,7 @@ YCPValue -Y2UINamespace::ReplaceWidget( const YCPSymbol & widget_id, const YCPTerm & new_widget ) +YUINamespace::ReplaceWidget( const YCPSymbol & widget_id, const YCPTerm & new_widget ) { if ( YUIComponent::ui() ) return YCP_UI::ReplaceWidget( widget_id, new_widget ); @@ -287,7 +287,7 @@ YCPValue -Y2UINamespace::ReplaceWidget( const YCPTerm & widget_id, const YCPTerm & new_widget ) +YUINamespace::ReplaceWidget( const YCPTerm & widget_id, const YCPTerm & new_widget ) { if ( YUIComponent::ui() ) return YCP_UI::ReplaceWidget( widget_id, new_widget ); @@ -297,7 +297,7 @@ YCPValue -Y2UINamespace::SetFocus( const YCPSymbol & widget_id ) +YUINamespace::SetFocus( const YCPSymbol & widget_id ) { if ( YUIComponent::ui() ) return YCP_UI::SetFocus( widget_id ); @@ -307,7 +307,7 @@ YCPValue -Y2UINamespace::SetFocus( const YCPTerm & widget_id ) +YUINamespace::SetFocus( const YCPTerm & widget_id ) { if ( YUIComponent::ui() ) return YCP_UI::SetFocus( widget_id ); @@ -317,7 +317,7 @@ YCPValue -Y2UINamespace::BusyCursor() +YUINamespace::BusyCursor() { if ( YUIComponent::ui() ) YCP_UI::BusyCursor(); @@ -327,7 +327,7 @@ YCPValue -Y2UINamespace::RedrawScreen() +YUINamespace::RedrawScreen() { if ( YUIComponent::ui() ) YCP_UI::RedrawScreen(); @@ -337,7 +337,7 @@ YCPValue -Y2UINamespace::NormalCursor() +YUINamespace::NormalCursor() { if ( YUIComponent::ui() ) YCP_UI::NormalCursor(); @@ -347,7 +347,7 @@ YCPValue -Y2UINamespace::MakeScreenShot( const YCPString & filename ) +YUINamespace::MakeScreenShot( const YCPString & filename ) { if ( YUIComponent::ui() ) YCP_UI::MakeScreenShot( filename ); @@ -357,7 +357,7 @@ YCPValue -Y2UINamespace::MakeScreenShot() +YUINamespace::MakeScreenShot() { if ( YUIComponent::ui() ) return MakeScreenShot( YCPNull() ); @@ -367,7 +367,7 @@ YCPValue -Y2UINamespace::DumpWidgetTree() +YUINamespace::DumpWidgetTree() { if ( YUIComponent::ui() ) YCP_UI::DumpWidgetTree(); @@ -377,7 +377,7 @@ YCPValue -Y2UINamespace::Beep() +YUINamespace::Beep() { if ( YUIComponent::ui() ) YCP_UI::Beep(); @@ -386,7 +386,7 @@ } YCPValue -Y2UINamespace::RecordMacro( const YCPString & filename ) +YUINamespace::RecordMacro( const YCPString & filename ) { if ( YUIComponent::ui() ) YCP_UI::RecordMacro( filename ); @@ -396,7 +396,7 @@ YCPValue -Y2UINamespace::StopRecordMacro() +YUINamespace::StopRecordMacro() { if ( YUIComponent::ui() ) YCP_UI::StopRecordMacro(); @@ -406,7 +406,7 @@ YCPValue -Y2UINamespace::PlayMacro( const YCPString & filename ) +YUINamespace::PlayMacro( const YCPString & filename ) { if ( YUIComponent::ui() ) YCP_UI::PlayMacro( filename ); @@ -415,7 +415,7 @@ } YCPValue -Y2UINamespace::FakeUserInput() +YUINamespace::FakeUserInput() { if ( YUIComponent::ui() ) YCP_UI::FakeUserInput( YCPVoid() ); @@ -425,7 +425,7 @@ YCPValue -Y2UINamespace::FakeUserInput( const YCPValue & next_input ) +YUINamespace::FakeUserInput( const YCPValue & next_input ) { if ( YUIComponent::ui() ) YCP_UI::FakeUserInput( next_input ); @@ -436,7 +436,7 @@ YCPValue -Y2UINamespace::Glyph( const YCPSymbol & glyphSym ) +YUINamespace::Glyph( const YCPSymbol & glyphSym ) { if ( YUIComponent::ui() ) return YCP_UI::Glyph( glyphSym ); @@ -446,7 +446,7 @@ YCPValue -Y2UINamespace::GetDisplayInfo() +YUINamespace::GetDisplayInfo() { if ( YUIComponent::ui() ) return YCP_UI::GetDisplayInfo(); @@ -456,7 +456,7 @@ YCPValue -Y2UINamespace::RecalcLayout() +YUINamespace::RecalcLayout() { if ( YUIComponent::ui() ) YCP_UI::RecalcLayout(); @@ -466,7 +466,7 @@ YCPValue -Y2UINamespace::PostponeShortcutCheck() +YUINamespace::PostponeShortcutCheck() { if ( YUIComponent::ui() ) YCP_UI::PostponeShortcutCheck(); @@ -475,7 +475,7 @@ } YCPValue -Y2UINamespace::CheckShortcuts() +YUINamespace::CheckShortcuts() { if ( YUIComponent::ui() ) YCP_UI::CheckShortcuts(); @@ -485,7 +485,7 @@ YCPValue -Y2UINamespace::WidgetExists( const YCPSymbol & widget_id ) +YUINamespace::WidgetExists( const YCPSymbol & widget_id ) { if ( YUIComponent::ui() ) return YCP_UI::WidgetExists( widget_id ); @@ -495,7 +495,7 @@ YCPValue -Y2UINamespace::WidgetExists( const YCPTerm & widget_id ) +YUINamespace::WidgetExists( const YCPTerm & widget_id ) { if ( YUIComponent::ui() ) return YCP_UI::WidgetExists( widget_id ); @@ -505,7 +505,7 @@ YCPValue -Y2UINamespace::RunPkgSelection( const YCPValue & widget_id ) +YUINamespace::RunPkgSelection( const YCPValue & widget_id ) { if ( YUIComponent::ui() ) return YCP_UI::RunPkgSelection( widget_id ); @@ -515,7 +515,7 @@ YCPValue -Y2UINamespace::AskForExistingDirectory( const YCPString & startDir, const YCPString & headline ) +YUINamespace::AskForExistingDirectory( const YCPString & startDir, const YCPString & headline ) { if ( YUIComponent::ui() ) return YCP_UI::AskForExistingDirectory( startDir, headline ); @@ -525,7 +525,7 @@ YCPValue -Y2UINamespace::AskForExistingFile( const YCPString & startWith, const YCPString & filter, const YCPString & headline ) +YUINamespace::AskForExistingFile( const YCPString & startWith, const YCPString & filter, const YCPString & headline ) { if ( YUIComponent::ui() ) return YCP_UI::AskForExistingFile( startWith, filter, headline ); @@ -535,7 +535,7 @@ YCPValue -Y2UINamespace::AskForSaveFileName( const YCPString & startWith, const YCPString & filter, const YCPString & headline ) +YUINamespace::AskForSaveFileName( const YCPString & startWith, const YCPString & filter, const YCPString & headline ) { if ( YUIComponent::ui() ) return YCP_UI::AskForSaveFileName( startWith, filter, headline ); @@ -545,7 +545,7 @@ YCPValue -Y2UINamespace::SetFunctionKeys( const YCPMap & new_fkeys ) +YUINamespace::SetFunctionKeys( const YCPMap & new_fkeys ) { if ( YUIComponent::ui() ) YCP_UI::SetFunctionKeys( new_fkeys ); @@ -555,7 +555,7 @@ YCPValue -Y2UINamespace::Recode( const YCPString & from, const YCPString & to, const YCPString & text ) +YUINamespace::Recode( const YCPString & from, const YCPString & to, const YCPString & text ) { if ( YUIComponent::ui() ) return YCP_UI::Recode( from, to, text ); @@ -565,7 +565,7 @@ YCPValue -Y2UINamespace::HasSpecialWidget( const YCPSymbol & widget ) +YUINamespace::HasSpecialWidget( const YCPSymbol & widget ) { if ( YUIComponent::ui() ) return YCP_UI::HasSpecialWidget( widget ); @@ -575,7 +575,7 @@ YCPValue -Y2UINamespace::WizardCommand( const YCPTerm & command ) +YUINamespace::WizardCommand( const YCPTerm & command ) { if ( YUIComponent::ui() ) return YCP_UI::WizardCommand( command ); @@ -585,7 +585,7 @@ YCPValue -Y2UINamespace::CallHandler( void * ptr, int argc, YCPValue argv[] ) +YUINamespace::CallHandler( void * ptr, int argc, YCPValue argv[] ) { if ( YUIComponent::uiComponent() ) { @@ -604,7 +604,7 @@ // -Y2UIFunction::Y2UIFunction (Y2UINamespace * instance, +YUIFunction::YUIFunction (YUINamespace * instance, YUIComponent * comp, unsigned pos, bool play_macro_blocks) : @@ -622,7 +622,7 @@ }; -bool Y2UIFunction::attachParameter (const YCPValue& arg, const int position) +bool YUIFunction::attachParameter (const YCPValue& arg, const int position) { switch (position) { @@ -638,7 +638,7 @@ } -constTypePtr Y2UIFunction::wantedParameterType() const +constTypePtr YUIFunction::wantedParameterType() const { // we do not help them with type conversion // hey but we could, at least for non-overloaded functions @@ -646,7 +646,7 @@ } -bool Y2UIFunction::appendParameter (const YCPValue& arg) +bool YUIFunction::appendParameter (const YCPValue& arg) { if (m_param1.isNull()) { @@ -674,7 +674,7 @@ } -bool Y2UIFunction::finishParameters() +bool YUIFunction::finishParameters() { // Aha, perl could give us any garbage. // Hmm, how do we cope with giving garbage to ycp modules? @@ -686,7 +686,7 @@ } -YCPValue Y2UIFunction::evaluateCall() +YCPValue YUIFunction::evaluateCall() { if ( ! m_comp->ui() ) { @@ -741,7 +741,7 @@ } -YCPValue Y2UIFunction::evaluateCall_int() +YCPValue YUIFunction::evaluateCall_int() { switch (m_position) { @@ -752,7 +752,7 @@ } -bool Y2UIFunction::reset() +bool YUIFunction::reset() { m_param1 = YCPNull(); m_param2 = YCPNull(); @@ -764,7 +764,7 @@ } -string Y2UIFunction::name() const +string YUIFunction::name() const { // FIXME. when is this called at all? return("Y2UI"); @@ -785,13 +785,13 @@ -Y2UIOverloadedFunction::Y2UIOverloadedFunction ( Y2UINamespace * instance, +YUIOverloadedFunction::YUIOverloadedFunction ( YUINamespace * instance, YUIComponent * comp, unsigned pos_offset, vector<SymbolEntryPtr>::iterator candidates_b, vector<SymbolEntryPtr>::iterator candidates_e, bool play_macro_blocks ) - : Y2UIFunction (instance, comp, pos_offset, play_macro_blocks) + : YUIFunction (instance, comp, pos_offset, play_macro_blocks) , m_candidates_b (candidates_b) , m_candidates_e (candidates_e) { @@ -800,7 +800,7 @@ bool -Y2UIOverloadedFunction::finishParameters() +YUIOverloadedFunction::finishParameters() { FunctionTypePtr real_tp = new FunctionType (Type::Unspec); //return type if (!m_param1.isNull()) @@ -855,20 +855,20 @@ } -Y2UINamespace::Y2UINamespace (YUIComponent* comp) +YUINamespace::YUINamespace (YUIComponent* comp) { m_comp = comp; registerFunctions(); } -Y2UINamespace::~Y2UINamespace() +YUINamespace::~YUINamespace() { // NOP } -Y2Function* Y2UINamespace::createFunctionCall( const string name, constFunctionTypePtr type ) +Y2Function* YUINamespace::createFunctionCall( const string name, constFunctionTypePtr type ) { #if VERBOSE_UI_CALLS y2debug ("Creating function call for %s", name.c_str()); @@ -924,7 +924,7 @@ #if VERBOSE_UI_CALLS y2debug ("Found symbol '%s' @%d", p->toString().c_str(), p->position()); #endif - return new Y2UIFunction (this, m_comp, it - b, play_macro_blocks); + return new YUIFunction (this, m_comp, it - b, play_macro_blocks); } } @@ -940,11 +940,11 @@ } y2debug ("overloaded %s, %td@%td", name.c_str(), re - rb, rb - b); - return new Y2UIOverloadedFunction (this, m_comp, rb - b, rb, re, play_macro_blocks); + return new YUIOverloadedFunction (this, m_comp, rb - b, rb, re, play_macro_blocks); } -void Y2UINamespace::registerFunctions() +void YUINamespace::registerFunctions() { #include "UIBuiltinTable.h" } Copied: trunk/core/libyui/src/ycp-ui/YUINamespace.h (from r44604, trunk/core/libyui/src/ycp-ui/Y2UINamespace.h) URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ycp-ui/YUINamespace.h?p2=trunk/core/libyui/src/ycp-ui/YUINamespace.h&p1=trunk/core/libyui/src/ycp-ui/Y2UINamespace.h&r1=44604&r2=44606&rev=44606&view=diff ============================================================================== --- trunk/core/libyui/src/ycp-ui/Y2UINamespace.h (original) +++ trunk/core/libyui/src/ycp-ui/YUINamespace.h Mon Feb 18 18:55:28 2008 @@ -10,7 +10,7 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: Y2UINamespace.h + File: YUINamespace.h Authors: Stanislav Visnovsky Martin Vidner @@ -35,17 +35,17 @@ #include "YUI.h" #include "YUIComponent.h" -class Y2UINamespace; +class YUINamespace; /** * One function call of the UI:: namespace **/ -class Y2UIFunction: public Y2Function +class YUIFunction: public Y2Function { protected: unsigned int m_position; - Y2UINamespace* m_instance; + YUINamespace* m_instance; YUIComponent* m_comp; bool m_play_macro_blocks; YCPValue m_param1; @@ -55,7 +55,7 @@ YCPValue m_param5; public: - Y2UIFunction (Y2UINamespace* instance, YUIComponent* comp, unsigned int pos, bool play_macro_blocks); + YUIFunction (YUINamespace* instance, YUIComponent* comp, unsigned int pos, bool play_macro_blocks); bool attachParameter (const YCPValue& arg, const int position); constTypePtr wantedParameterType () const; @@ -72,7 +72,7 @@ * One function call of the UI:: namespace: * A function where the signature is not known beforehand **/ -class Y2UIOverloadedFunction: public Y2UIFunction +class YUIOverloadedFunction: public YUIFunction { /** * A range of SymbolEntries with a matching name. @@ -81,7 +81,7 @@ vector<SymbolEntryPtr>::iterator m_candidates_e; public: - Y2UIOverloadedFunction( Y2UINamespace * instance, + YUIOverloadedFunction( YUINamespace * instance, YUIComponent * comp, unsigned pos_offset, vector<SymbolEntryPtr>::iterator candidates_b, @@ -95,7 +95,7 @@ }; -class Y2UINamespace: public Y2Namespace +class YUINamespace: public Y2Namespace { private: void registerFunctions(); @@ -108,12 +108,12 @@ /** * Constructor. */ - Y2UINamespace (YUIComponent* comp); + YUINamespace (YUIComponent* comp); /** * Destructor. */ - virtual ~Y2UINamespace(); + virtual ~YUINamespace(); virtual const string name() const { return "UI"; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org