summaryrefslogtreecommitdiff
authorwimpie <wimpie>2005-01-04 04:13:29 (UTC)
committer wimpie <wimpie>2005-01-04 04:13:29 (UTC)
commit12e7c838d741d37c7a526e21ac43562ec5b64c6e (patch) (side-by-side diff)
tree3fe816a5dd68bc11a73dbb4b4144a41323041f21
parenta268c0ab03aed309a1a8f65350ef894c81142785 (diff)
downloadopie-12e7c838d741d37c7a526e21ac43562ec5b64c6e.zip
opie-12e7c838d741d37c7a526e21ac43562ec5b64c6e.tar.gz
opie-12e7c838d741d37c7a526e21ac43562ec5b64c6e.tar.bz2
Some more logging
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings2/networksettings2/netnode.cpp5
-rw-r--r--noncore/settings/networksettings2/networksettings2/resources.cpp3
-rw-r--r--noncore/settings/networksettings2/networksettings2/resources.h3
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
@@ -177,23 +177,24 @@ NodeCollection::NodeCollection( QTextStream & TS ) :
if( A == "name" ) {
Name = N;
} 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
@@ -138,22 +138,25 @@ void TheNSResources::findAvailableNetNodes(const QString &path){
while ( (fi=it.current()) ) {
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(".") )+
".qm";
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
@@ -77,12 +77,13 @@ public :
void addSystemFile( const QString & ID,
const QString & P,
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;
}
NNI = NNT->NetNode->createInstance();
NNI->initialize();
@@ -93,13 +94,13 @@ public :
{ return AllNodes; }
void addNodeInstance( ANetNodeInstance * I )
{ 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 );
void addConnection( NodeCollection * NC );
void removeConnection( const QString & N );