summaryrefslogtreecommitdiff
Unidiff
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
@@ -180,8 +180,9 @@ NodeCollection::NodeCollection( QTextStream & TS ) :
180 setNumber( N.toLong() ); 180 setNumber( N.toLong() );
181 } else if( A == "node" ) { 181 } else if( A == "node" ) {
182 ANetNodeInstance * NNI = NSResources->findNodeInstance( N ); 182 ANetNodeInstance * NNI = NSResources->findNodeInstance( N );
183 Log(( "Find node %s : %p\n", N.latin1(), NNI ));
183 if( NNI && ! InError ) { 184 if( NNI && ! InError ) {
184 append( NSResources->findNodeInstance( N ) ); 185 append( NNI );
185 } else { 186 } else {
186 // could not find a node type -> collection invalid 187 // could not find a node type -> collection invalid
187 InError = 1; 188 InError = 1;
@@ -190,7 +191,7 @@ NodeCollection::NodeCollection( QTextStream & TS ) :
190 } while( 1 ); 191 } while( 1 );
191 192
192 Log(( "Profile number %s : %d nodes\n", 193 Log(( "Profile number %s : %d nodes\n",
193 N.latin1(), count() )); 194 Name.latin1(), count() ));
194} 195}
195 196
196 197
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
@@ -141,6 +141,7 @@ void TheNSResources::findAvailableNetNodes(const QString &path){
141 if( fi->fileName().contains(".so")){ 141 if( fi->fileName().contains(".so")){
142 /* if loaded install translation */ 142 /* if loaded install translation */
143 if( loadNetNode(path + "/" + fi->fileName()) ) { 143 if( loadNetNode(path + "/" + fi->fileName()) ) {
144 Log(( "Loading plugin %s\n", fi->fileName().latin1()));
144 QTranslator *trans = new QTranslator(qApp); 145 QTranslator *trans = new QTranslator(qApp);
145 QString fn = QPEApplication::qpeDir()+ 146 QString fn = QPEApplication::qpeDir()+
146 "/i18n/"+lang+"/"+ 147 "/i18n/"+lang+"/"+
@@ -151,6 +152,8 @@ void TheNSResources::findAvailableNetNodes(const QString &path){
151 qApp->installTranslator( trans ); 152 qApp->installTranslator( trans );
152 else 153 else
153 delete trans; 154 delete trans;
155 } else {
156 Log(( "Error loading plugin %s\n", fi->fileName().latin1()));
154 } 157 }
155 } 158 }
156 ++it; 159 ++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
@@ -80,6 +80,7 @@ public :
80 80
81 ANetNodeInstance * createNodeInstance( const QString & S ) 81 ANetNodeInstance * createNodeInstance( const QString & S )
82 { ANetNodeInstance * NNI = 0; 82 { ANetNodeInstance * NNI = 0;
83 printf( "Find node type %s\n", S.latin1() );
83 NetNode_t * NNT = AllNodeTypes[S]; 84 NetNode_t * NNT = AllNodeTypes[S];
84 if( ! NNT ) { 85 if( ! NNT ) {
85 return 0; 86 return 0;
@@ -96,7 +97,7 @@ public :
96 void removeNodeInstance( const QString & N ) 97 void removeNodeInstance( const QString & N )
97 { AllNodes.remove( N );} 98 { AllNodes.remove( N );}
98 ANetNodeInstance * findNodeInstance( const QString & S ) 99 ANetNodeInstance * findNodeInstance( const QString & S )
99 { return (AllNodes.find(S)!=0) ? AllNodes[S] : 0; } 100 { return AllNodes[S]; }
100 101
101 const QString & netNode2Name( const char * Type ); 102 const QString & netNode2Name( const char * Type );
102 const QString & netNode2Description( const char * Type ); 103 const QString & netNode2Description( const char * Type );