[Kst] kdeextragear-2/kst/kst/libkstkmdi

[Andrew Walker]

CVS commit by arwalker: 

Avoids conflict between not_close_xpm defined here and in kdockwidget.cpp.


  M +2 -2      kmdidockcontainer.cpp   1.2


--- kdeextragear-2/kst/kst/libkstkmdi/kmdidockcontainer.cpp  #1.1:1.2
@@ -36,5 +36,5 @@
 #include <klocale.h>
 
-static const char* const not_close_xpm[]={
+static const char* const not_close_xpm_other[]={
 "5 5 2 1",
 "# c black",
@@ -185,5 +185,5 @@ void KMdiDockContainer::insertWidget (KD
 
       btn->setToggleButton( true );
-      btn->setPixmap( const_cast< const char** >(not_close_xpm) );
+      btn->setPixmap( const_cast< const char** >(not_close_xpm_other) );
       hdr->addButton(btn);
       m_overlapButtons.insert(w,btn);