Opie::XYZ::Private -> Opie::XYZ::Internal

5 files changed, 6 insertions, 6 deletions

diff --git a/libopie2/opienet/odebugmapper.cpp b/libopie2/opienet/odebugmapper.cpp
index f679afb..0de1247 100644
--- a/libopie2/opienet/odebugmapper.cpp
+++ b/libopie2/opienet/odebugmapper.cpp
@@ -11,7 +11,7 @@ using namespace Opie::Core;
 
 namespace Opie {
 namespace Net  {
-namespace Private {
+namespace Internal {
 
 DebugMapper::DebugMapper()
 {
diff --git a/libopie2/opienet/odebugmapper.h b/libopie2/opienet/odebugmapper.h
index f47db47..79fb42e 100644
--- a/libopie2/opienet/odebugmapper.h
+++ b/libopie2/opienet/odebugmapper.h
@@ -11,7 +11,7 @@
 
 namespace Opie {
 namespace Net  {
-namespace Private {
+namespace Internal {
 
 typedef QIntDict<QString> IntStringMap;
 
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index 7794334..c185805 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -190,7 +190,7 @@ void OPrivateIOCTL::setParameter( int num, u_int32_t value )
 
 
 
-namespace Private {
+namespace Internal {
 /*======================================================================================
  * assorted functions
  *======================================================================================*/
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h
index ca6815d..4a09426 100644
--- a/libopie2/opienet/onetutils.h
+++ b/libopie2/opienet/onetutils.h
@@ -132,7 +132,7 @@ class OPrivateIOCTL : public QObject
  * Miscellaneous
  *======================================================================================*/
 
-namespace Private {
+namespace Internal {
 void dumpBytes( const unsigned char* data, int num );
 QString modeToString( int );
 int stringToMode( const QString& );
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 26a6c81..b6c9876 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -60,7 +60,7 @@
 

 

 using namespace Opie::Core;

-using namespace Opie::Net::Private;

+using namespace Opie::Net::Internal;

 DebugMapper* debugmapper = new DebugMapper();

 #endif

 

@@ -103,7 +103,7 @@ void ONetwork::synchronize()
         s >> str;

         str.truncate( str.find( ':' ) );

         odebug << "ONetwork: found interface '" << str << "'" << oendl;

-        ONetworkInterface* iface;

+        ONetworkInterface* iface = 0;

         if ( isWirelessInterface( str ) )

         {

             iface = new OWirelessNetworkInterface( this, (const char*) str );