[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Prevent name conflicts


  M +2 -2      extensionmgr.cpp   1.5
  M +2 -2      ksteventmonitor_i.cpp   1.8


--- kdeextragear-2/kst/kst/extensionmgr.cpp  #1.4:1.5
@@ -31,9 +31,9 @@
 #include <qstringlist.h>
 
-KStaticDeleter<ExtensionMgr> sd;
+KStaticDeleter<ExtensionMgr> sdExtension;
 
 ExtensionMgr *ExtensionMgr::self() {
   if (!_self) {
-    _self = sd.setObject(_self, new ExtensionMgr);
+    _self = sdExtension.setObject(_self, new ExtensionMgr);
   }
 

--- kdeextragear-2/kst/kst/ksteventmonitor_i.cpp  #1.7:1.8
@@ -40,9 +40,9 @@
 
 KstEventMonitorI* KstEventMonitorI::_inst = 0L;
-static KStaticDeleter<KstEventMonitorI> _hsInst;
+static KStaticDeleter<KstEventMonitorI> _eventInst;
 
 KstEventMonitorI* KstEventMonitorI::globalInstance() {
   if (!_inst) {
-    _inst = _hsInst.setObject(new KstEventMonitorI);
+    _inst = _eventInst.setObject(new KstEventMonitorI);
   }