3 files changed, 8 insertions, 3 deletions
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp index 17653bd..f8f2d1e 100644 --- a/noncore/settings/networksettings2/networksettings2/netnode.cpp +++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp @@ -179,19 +179,20 @@ NodeCollection::NodeCollection( QTextStream & TS ) : } else if( A == "number" ) { setNumber( N.toLong() ); } else if( A == "node" ) { ANetNodeInstance * NNI = NSResources->findNodeInstance( N ); + Log(( "Find node %s : %p\n", N.latin1(), NNI )); if( NNI && ! InError ) { - append( NSResources->findNodeInstance( N ) ); + append( NNI ); } else { // could not find a node type -> collection invalid InError = 1; } } } while( 1 ); Log(( "Profile number %s : %d nodes\n", - N.latin1(), count() )); + Name.latin1(), count() )); } NodeCollection::~NodeCollection( void ) { diff --git a/noncore/settings/networksettings2/networksettings2/resources.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp index 8b3b4fe..50fb15a 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.cpp +++ b/noncore/settings/networksettings2/networksettings2/resources.cpp @@ -140,8 +140,9 @@ void TheNSResources::findAvailableNetNodes(const QString &path){ if( fi->fileName().contains(".so")){ /* if loaded install translation */ if( loadNetNode(path + "/" + fi->fileName()) ) { + Log(( "Loading plugin %s\n", fi->fileName().latin1())); QTranslator *trans = new QTranslator(qApp); QString fn = QPEApplication::qpeDir()+ "/i18n/"+lang+"/"+ fi->fileName().left( fi->fileName().find(".") )+ @@ -150,8 +151,10 @@ void TheNSResources::findAvailableNetNodes(const QString &path){ if( trans->load( fn ) ) qApp->installTranslator( trans ); else delete trans; + } else { + Log(( "Error loading plugin %s\n", fi->fileName().latin1())); } } ++it; } diff --git a/noncore/settings/networksettings2/networksettings2/resources.h b/noncore/settings/networksettings2/networksettings2/resources.h index 634cd39..5d90286 100644 --- a/noncore/settings/networksettings2/networksettings2/resources.h +++ b/noncore/settings/networksettings2/networksettings2/resources.h @@ -79,8 +79,9 @@ public : bool KDI ); ANetNodeInstance * createNodeInstance( const QString & S ) { ANetNodeInstance * NNI = 0; + printf( "Find node type %s\n", S.latin1() ); NetNode_t * NNT = AllNodeTypes[S]; if( ! NNT ) { return 0; } @@ -95,9 +96,9 @@ public : { AllNodes.insert( I->name(), I ); } void removeNodeInstance( const QString & N ) { AllNodes.remove( N );} ANetNodeInstance * findNodeInstance( const QString & S ) - { return (AllNodes.find(S)!=0) ? AllNodes[S] : 0; } + { return AllNodes[S]; } const QString & netNode2Name( const char * Type ); const QString & netNode2Description( const char * Type ); |