[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/kdecore/network
From:       Thiago Macieira <thiago.macieira () kdemail ! net>
Date:       2004-12-05 17:25:52
Message-ID: 20041205172552.334F21B9CD () office ! kde ! org
[Download RAW message or body]

CVS commit by thiago: 

Backport of the fix that went in HEAD for stricter compilers than g++.


  M +2 -2      kresolvermanager.cpp   1.28.2.3
  M +51 -51    ksocketdevice.cpp   1.18.2.3


--- kdelibs/kdecore/network/kresolvermanager.cpp  #1.28.2.2:1.28.2.3
@@ -198,4 +198,6 @@ public:
 } resInit;
 
+} // anonymous namespace
+
 /*
  * parameters
@@ -768,4 +770,2 @@ void KResolverManager::dequeue(KResolver
   dequeueNew(obj);
 }
-
-} // anonymous namespace

--- kdelibs/kdecore/network/ksocketdevice.cpp  #1.18.2.2:1.18.2.3
@@ -805,12 +805,13 @@ namespace
     { return obj == 0; }
   };
+}
 
-  static KSocketDeviceFactoryBase* defaultImplFactory;
-  static QMutex defaultImplFactoryMutex;
-  typedef QMap<int, KSocketDeviceFactoryBase* > factoryMap;
-  static factoryMap factories;
+static KSocketDeviceFactoryBase* defaultImplFactory;
+static QMutex defaultImplFactoryMutex;
+typedef QMap<int, KSocketDeviceFactoryBase* > factoryMap;
+static factoryMap factories;
  
-  KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent)
-  {
+KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent)
+{
     KSocketDevice* device = dynamic_cast<KSocketDevice*>(parent);
     if (device != 0L)
@@ -824,8 +825,8 @@ namespace
     // the really default
     return new KSocketDevice(parent);
-  }
+}
 
-  KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent, int capabilities)
-  {
+KSocketDevice* KSocketDevice::createDefault(KSocketBase* parent, int capabilities)
+{
     KSocketDevice* device = dynamic_cast<KSocketDevice*>(parent);
     if (device != 0L)
@@ -840,22 +841,21 @@ namespace
 
     return 0L;                  // no default
-  }
+}
 
-  KSocketDeviceFactoryBase*
-  KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory)
-  {
+KSocketDeviceFactoryBase*
+KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory)
+{
     QMutexLocker locker(&defaultImplFactoryMutex);
     KSocketDeviceFactoryBase* old = defaultImplFactory;
     defaultImplFactory = factory;
     return old;
-  }
+}
 
-  void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities)
-  {
+void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities)
+{
     QMutexLocker locker(&defaultImplFactoryMutex);
     if (factories.contains(capabilities))
       delete factories[capabilities];
     factories.insert(capabilities, factory);
-  }
-
 }
+


[prev in list] [next in list] [prev in thread] [next in thread]