Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47341 - in /trunk/ncurses-pkg: ./ package/ src/
  • From: gs@xxxxxxxxxxxxxxxx
  • Date: Wed, 07 May 2008 09:20:56 -0000
  • Message-id: <20080507092056.6DD4229B2B@xxxxxxxxxxxxxxxx>
Author: gs
Date: Wed May 7 11:20:55 2008
New Revision: 47341

URL: http://svn.opensuse.org/viewcvs/yast?rev=47341&view=rev
Log:
internal changes: remove remainings of old style logging,
rearrange inclusion of header files

Modified:
trunk/ncurses-pkg/VERSION
trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes
trunk/ncurses-pkg/src/NCPackageSelector.cc
trunk/ncurses-pkg/src/NCPackageSelector.h
trunk/ncurses-pkg/src/NCPkgFilterRepo.cc
trunk/ncurses-pkg/src/NCPkgFilterRepo.h
trunk/ncurses-pkg/src/NCPkgMenuAction.cc
trunk/ncurses-pkg/src/NCPkgMenuAction.h
trunk/ncurses-pkg/src/NCPkgMenuDeps.cc
trunk/ncurses-pkg/src/NCPkgMenuDeps.h
trunk/ncurses-pkg/src/NCPkgMenuExtras.cc
trunk/ncurses-pkg/src/NCPkgMenuExtras.h
trunk/ncurses-pkg/src/NCPkgMenuView.cc
trunk/ncurses-pkg/src/NCPkgMenuView.h
trunk/ncurses-pkg/src/NCPkgPackageDetails.cc
trunk/ncurses-pkg/src/NCPkgPackageDetails.h
trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h
trunk/ncurses-pkg/src/NCPkgSelMapper.cc
trunk/ncurses-pkg/src/NCPkgTable.cc

Modified: trunk/ncurses-pkg/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/VERSION (original)
+++ trunk/ncurses-pkg/VERSION Wed May 7 11:20:55 2008
@@ -1 +1 @@
-2.16.9
+2.16.10

Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original)
+++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Wed May 7 11:20:55 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed May 7 11:04:00 CEST 2008 - gs@xxxxxxx
+
+- internal changes: remove remainings of old style logging,
+ rearrange inclusion of header files
+- 2.16.10
+
+-------------------------------------------------------------------
Tue May 6 15:39:05 CEST 2008 - gs@xxxxxxx

- YOU: filter name for satisfied patches is 'Unneeded' (like qt),

Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.cc?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPackageSelector.cc (original)
+++ trunk/ncurses-pkg/src/NCPackageSelector.cc Wed May 7 11:20:55 2008
@@ -33,7 +33,11 @@
#include "NCPkgFilterRepo.h"
#include "NCPkgPopupDeps.h"
#include "NCPkgPopupDiskspace.h"
-//#include "NCPkgPopupTable.h"
+#include "NCPkgMenuDeps.h"
+#include "NCPkgMenuView.h"
+#include "NCPkgMenuExtras.h"
+#include "NCPkgMenuHelp.h"
+#include "NCPkgMenuAction.h"
#include "NCPkgPopupDescr.h"
#include "NCPackageSelector.h"
#include "NCLayoutBox.h"
@@ -58,7 +62,6 @@
typedef zypp::Patch::Contents ZyppPatchContents;
typedef zypp::Patch::Contents::Selectable_iterator
ZyppPatchContentsIterator;

-#include <ycp/Parser.h>
#include "YEvent.h"

using namespace std;
@@ -554,9 +557,9 @@
}
else // No ZyppPkg - some other kind of object
{
- y2debug( "Found unknown atom of kind %s: %s",
- (*it)->kind().asString().c_str(),
- (*it)->name().c_str() );
+ yuiDebug() << "Found unknown atom of kind %s: %s" <<
+ (*it)->kind().asString().c_str() <<
+ (*it)->name().c_str() << endl;

}
}
@@ -637,7 +640,7 @@
break;
}
default:
- y2warning( "Unknown patch filter" );
+ yuiWarning() << "Unknown patch filter" << endl;
}

if ( displayPatch )
@@ -1151,7 +1154,7 @@

bool NCPackageSelector::showPendingLicenseAgreements( ZyppPoolIterator begin,
ZyppPoolIterator end )
{
- y2milestone( "Showing all pending license agreements" );
+ yuiMilestone() << "Showing all pending license agreements" << endl;

bool allConfirmed = true;

@@ -1172,7 +1175,8 @@

if ( ! licenseText.empty() )
{
- y2milestone( "Package/Patch %s has a license
agreement", sel->name().c_str() );
+ yuiMilestone() << "Package/Patch %s has a license
agreement"
+ << sel->name().c_str() << endl;

if( ! sel->hasLicenceConfirmed() )
{
@@ -1180,7 +1184,8 @@
}
else
{
- y2milestone( "Package/Patch %s's license is
already confirmed", sel->name().c_str() );
+ yuiMilestone() << "Package/Patch %s's license is
already confirmed"
+ << sel->name().c_str() << endl;
}
}
}

Modified: trunk/ncurses-pkg/src/NCPackageSelector.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelector.h?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPackageSelector.h (original)
+++ trunk/ncurses-pkg/src/NCPackageSelector.h Wed May 7 11:20:55 2008
@@ -42,11 +42,6 @@
#include "NCPkgFilterSearch.h"
#include "NCPkgTable.h"
#include "NCEmpty.h"
-#include "NCPkgMenuDeps.h"
-#include "NCPkgMenuView.h"
-#include "NCPkgMenuExtras.h"
-#include "NCPkgMenuHelp.h"
-#include "NCPkgMenuAction.h"
#include "NCPkgMenuFilter.h"
#include "NCPkgPackageDetails.h"
#include "NCPkgPopupDeps.h"
@@ -68,6 +63,7 @@
class NCPkgMenuDeps;
class NCPkgMenuAction;
class NCPkgMenuView;
+class NCPkgMenuHelp;
class NCPkgSearchSettings;
class NCPkgPackageDetails;
class NCPkgFilterMain;

Modified: trunk/ncurses-pkg/src/NCPkgFilterRepo.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterRepo.cc?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgFilterRepo.cc (original)
+++ trunk/ncurses-pkg/src/NCPkgFilterRepo.cc Wed May 7 11:20:55 2008
@@ -23,7 +23,7 @@
#include "YDialog.h"
#include "NCLayoutBox.h"
#include "NCSpacing.h"
-#include "NCPkgStrings.h"
+#include "NCPackageSelector.h"

#include "NCZypp.h"


Modified: trunk/ncurses-pkg/src/NCPkgFilterRepo.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterRepo.h?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgFilterRepo.h (original)
+++ trunk/ncurses-pkg/src/NCPkgFilterRepo.h Wed May 7 11:20:55 2008
@@ -30,7 +30,6 @@
#include "NCPushButton.h"
#include "NCTable.h"
#include "NCTablePad.h"
-#include "NCPackageSelector.h"
#include "NCZypp.h"

class NCTable;

Modified: trunk/ncurses-pkg/src/NCPkgMenuAction.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuAction.cc?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgMenuAction.cc (original)
+++ trunk/ncurses-pkg/src/NCPkgMenuAction.cc Wed May 7 11:20:55 2008
@@ -18,6 +18,7 @@
#include <YUILog.h>

#include "NCPkgMenuAction.h"
+#include "NCPackageSelector.h"


/*
@@ -41,16 +42,16 @@
if ( !pkg->isYouMode() )
{
// Please note: add an appropriate number of whitespaces to get a well
- // formated menu (the [ ]s should be in one column)
+ // formated menu (the [ ]s should be in one column) and use unique
hotkeys until end:
// begin: Actions menu, toggle the status of a package, e.g. change
from installed to delete
- toggleItem = new YMenuItem( _( "Toggle [SPACE]" ) );
- installItem = new YMenuItem( _( "Install [+]" ) );
- deleteItem = new YMenuItem( _( "Delete [-]" ) );
- updateItem = new YMenuItem( _( "Update [>]" ) );
- tabooItem = new YMenuItem( _( "Taboo [!]" ) );
- lockItem = new YMenuItem( _( "Lock [*]" ) );
+ toggleItem = new YMenuItem( _( "&Toggle [SPACE]" ) );
+ installItem = new YMenuItem( _( "&Install [+]" ) );
+ deleteItem = new YMenuItem( _( "&Delete [-]" ) );
+ updateItem = new YMenuItem( _( "&Update [>]" ) );
+ tabooItem = new YMenuItem( _( "T&aboo [!]" ) );
+ lockItem = new YMenuItem( _( "&Lock [*]" ) );
// end: Actions menu, set status of all packages (title of a submenu)
- allItem = new YMenuItem( _( "All Listed Packages" ) );
+ allItem = new YMenuItem( _( "&All Listed Packages" ) );

items.push_back( toggleItem );
items.push_back( installItem );
@@ -61,21 +62,21 @@
items.push_back( allItem );

// begin: submenu items actions concerning all packages
- installAllItem = new YMenuItem( allItem, _( "Install All" ) );
- deleteAllItem = new YMenuItem( allItem, _( "Delete All" ) );
- keepAllItem = new YMenuItem( allItem, _( "Keep All" ) );
- updateAllItem = new YMenuItem( allItem, _( "Update All
Unconditionally") );
+ installAllItem = new YMenuItem( allItem, _( "&Install All" ) );
+ deleteAllItem = new YMenuItem( allItem, _( "&Delete All" ) );
+ keepAllItem = new YMenuItem( allItem, _( "&Keep All" ) );
+ updateAllItem = new YMenuItem( allItem, _( "U&pdate All
Unconditionally") );
// end: submenu items: actions concerning all packages
- updateNewerItem = new YMenuItem( allItem, _( "Update If Newer Version
Available" ) );
+ updateNewerItem = new YMenuItem( allItem, _( "&Update If Newer Version
Available" ) );

addItems( items );
}
- else
+ else // YOU mode
{
- toggleItem = new YMenuItem( _( "Toggle [SPACE]" ) );
- installItem = new YMenuItem( _( "Install [+]" ) );
- deleteItem = new YMenuItem( _( "Delete [-]" ) );
- updateItem = new YMenuItem( _( "Update [>]" ) );
+ toggleItem = new YMenuItem( _( "&Toggle [SPACE]" ) );
+ installItem = new YMenuItem( _( "&Install [+]" ) );
+ deleteItem = new YMenuItem( _( "&Delete [-]" ) );
+ updateItem = new YMenuItem( _( "&Update [>]" ) );

items.push_back( toggleItem );
items.push_back( installItem );

Modified: trunk/ncurses-pkg/src/NCPkgMenuAction.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuAction.h?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgMenuAction.h (original)
+++ trunk/ncurses-pkg/src/NCPkgMenuAction.h Wed May 7 11:20:55 2008
@@ -23,10 +23,11 @@
#include "NCurses.h"
#include "NCi18n.h"
#include "NCMenuButton.h"
-#include "NCPackageSelector.h"
#include "NCPopupInfo.h"
#include "NCZypp.h"

+class NCPackageSelector;
+
class NCPkgMenuAction : public NCMenuButton {

NCPkgMenuAction & operator=( const NCPkgMenuAction & );

Modified: trunk/ncurses-pkg/src/NCPkgMenuDeps.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuDeps.cc?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgMenuDeps.cc (original)
+++ trunk/ncurses-pkg/src/NCPkgMenuDeps.cc Wed May 7 11:20:55 2008
@@ -18,7 +18,7 @@
#include <YUILog.h>

#include "NCPkgMenuDeps.h"
-
+#include "NCPackageSelector.h"

/*
Textdomain "ncurses-pkg"

Modified: trunk/ncurses-pkg/src/NCPkgMenuDeps.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuDeps.h?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgMenuDeps.h (original)
+++ trunk/ncurses-pkg/src/NCPkgMenuDeps.h Wed May 7 11:20:55 2008
@@ -23,11 +23,11 @@
#include "NCurses.h"
#include "NCi18n.h"
#include "NCMenuButton.h"
-#include "NCPackageSelector.h"
#include "NCPopupInfo.h"
#include "NCPkgPopupTable.h"
#include "NCZypp.h"

+class NCPackageSelector;

class NCPkgMenuDeps : public NCMenuButton {


Modified: trunk/ncurses-pkg/src/NCPkgMenuExtras.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuExtras.cc?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgMenuExtras.cc (original)
+++ trunk/ncurses-pkg/src/NCPkgMenuExtras.cc Wed May 7 11:20:55 2008
@@ -18,6 +18,8 @@
#include <YUILog.h>

#include "NCPkgMenuExtras.h"
+#include "NCPackageSelector.h"
+#include "NCPopupInfo.h"

#include <boost/bind.hpp>
#include <fstream>

Modified: trunk/ncurses-pkg/src/NCPkgMenuExtras.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuExtras.h?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgMenuExtras.h (original)
+++ trunk/ncurses-pkg/src/NCPkgMenuExtras.h Wed May 7 11:20:55 2008
@@ -23,10 +23,14 @@
#include "NCurses.h"
#include "NCi18n.h"
#include "NCMenuButton.h"
-#include "NCPackageSelector.h"
+//#include "NCPackageSelector.h"
#include "NCPkgStrings.h"
#include "NCPkgPopupDiskspace.h"

+
+class NCPackageSelector;
+
+
class NCPkgMenuExtras : public NCMenuButton {

NCPkgMenuExtras & operator=( const NCPkgMenuExtras & );

Modified: trunk/ncurses-pkg/src/NCPkgMenuView.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuView.cc?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgMenuView.cc (original)
+++ trunk/ncurses-pkg/src/NCPkgMenuView.cc Wed May 7 11:20:55 2008
@@ -18,6 +18,7 @@
#include <YUILog.h>

#include "NCPkgMenuView.h"
+#include "NCPackageSelector.h"


/*

Modified: trunk/ncurses-pkg/src/NCPkgMenuView.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuView.h?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgMenuView.h (original)
+++ trunk/ncurses-pkg/src/NCPkgMenuView.h Wed May 7 11:20:55 2008
@@ -25,9 +25,10 @@
#include "NCurses.h"
#include "NCi18n.h"
#include "NCMenuButton.h"
-#include "NCPackageSelector.h"
#include "NCZypp.h"

+class NCPackageSelector;
+
class NCPkgMenuView : public NCMenuButton {

NCPkgMenuView & operator=( const NCPkgMenuView & );

Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDetails.cc?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original)
+++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Wed May 7 11:20:55 2008
@@ -18,6 +18,8 @@

#include "NCPkgTable.h"
#include "NCPkgPackageDetails.h"
+#include "NCPackageSelector.h"
+

/*
Textdomain "ncurses-pkg"

Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDetails.h?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgPackageDetails.h (original)
+++ trunk/ncurses-pkg/src/NCPkgPackageDetails.h Wed May 7 11:20:55 2008
@@ -18,9 +18,11 @@
#define NCPkgPackageDetails_h

#include "NCRichText.h"
-#include "NCPackageSelector.h"
#include "NCZypp.h"

+class NCPackageSelector;
+
+
class NCPkgPackageDetails : public NCRichText {



Modified: trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h (original)
+++ trunk/ncurses-pkg/src/NCPkgPopupDiskspace.h Wed May 7 11:20:55 2008
@@ -26,6 +26,9 @@

#include <FSize.h>
#include "NCPopup.h"
+#include "NCLabel.h"
+
+#include "NCZypp.h"

typedef zypp::DiskUsageCounter::MountPoint ZyppPartitionDu;
typedef zypp::DiskUsageCounter::MountPointSet ZyppDuSet;

Modified: trunk/ncurses-pkg/src/NCPkgSelMapper.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgSelMapper.cc?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgSelMapper.cc (original)
+++ trunk/ncurses-pkg/src/NCPkgSelMapper.cc Wed May 7 11:20:55 2008
@@ -17,8 +17,8 @@
/-*/


-#define y2log_component "ncurses-pkg"
-#include <ycp/y2log.h>
+#define YUILogComponent "ncurses-pkg"
+#include "YUILog.h"

#include "NCPkgSelMapper.h"

@@ -39,7 +39,7 @@
{
if ( --_refCount == 0 )
{
- y2debug( "Destroying pkg -> selectable cache" );
+ yuiDebug() << "Destroying pkg -> selectable cache" << endl;
_cache.clear();
}
}
@@ -48,7 +48,7 @@
void NCPkgSelMapper::rebuildCache()
{
_cache.clear();
- y2debug( "Building pkg -> selectable cache" );
+ yuiDebug() << "Building pkg -> selectable cache" << endl;

for ( ZyppPoolIterator sel_it = zyppPkgBegin();
sel_it != zyppPkgEnd();
@@ -80,7 +80,7 @@
}
}

- y2debug( "Building pkg -> selectable cache done" );
+ yuiDebug() << "Building pkg -> selectable cache done" << endl;
}


@@ -95,7 +95,7 @@
if ( it != NCPkgSelMapper::_cache.end() )
sel = it->second;
else
- y2warning( "No selectable found for package %s", pkg->name().c_str() );
+ yuiWarning() << "No selectable found for package %s" <<
pkg->name().c_str() << endl;

return sel;
}

Modified: trunk/ncurses-pkg/src/NCPkgTable.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?rev=47341&r1=47340&r2=47341&view=diff
==============================================================================
--- trunk/ncurses-pkg/src/NCPkgTable.cc (original)
+++ trunk/ncurses-pkg/src/NCPkgTable.cc Wed May 7 11:20:55 2008
@@ -163,7 +163,7 @@
Items[0] = new NCPkgTableTag( objPtr, slbPtr, stat );

for ( unsigned i = 1; i < elements.size()+1; ++i ) {
- // use YCPString to enforce recoding from 'utf8'
+ // NCTableCol has NCstring argument to enforce 'utf8' encoding
Items[i] = new NCTableCol( elements[i-1] );
}
myPad()->Append( Items );

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages