[PATCH] second try, kmdi does not compile with --enable-final

[Luciano Montanaro]

The problem is that the pixmaps are included in both kmdichildfrm.cpp and 
kmdimainfrm.cpp.

This patch is a possible fix for it. 

Luciano


? kmdi.patch
Index: kmdi_pixmaps.h
===================================================================
RCS file: kmdi_pixmaps.h
diff -N kmdi_pixmaps.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kmdi_pixmaps.h	27 May 2003 14:05:59 -0000
@@ -0,0 +1,20 @@
+#ifndef KMDI_PIXMAPS_H
+#define KMDI_PIXMAPS_H
+#include "win_undockbutton.xpm"
+#include "win_minbutton.xpm"
+#include "win_restorebutton.xpm"
+#include "win_closebutton.xpm"
+#include "kde_undockbutton.xpm"
+#include "kde_minbutton.xpm"
+#include "kde_restorebutton.xpm"
+#include "kde_closebutton.xpm"
+#include "kde2_undockbutton.xpm"
+#include "kde2_minbutton.xpm"
+#include "kde2_restorebutton.xpm"
+#include "kde2_closebutton.xpm"
+#include "kde2laptop_undockbutton.xpm"
+#include "kde2laptop_minbutton.xpm"
+#include "kde2laptop_restorebutton.xpm"
+#include "kde2laptop_closebutton.xpm"
+#include "kde2laptop_closebutton_menu.xpm"
+#endif
Index: kmdichildfrm.cpp
===================================================================
RCS file: /home/kde/kdelibs/kmdi/kmdichildfrm.cpp,v
retrieving revision 1.3
diff -p -u -r1.3 kmdichildfrm.cpp
--- kmdichildfrm.cpp	24 May 2003 22:57:21 -0000	1.3
+++ kmdichildfrm.cpp	27 May 2003 14:05:59 -0000
@@ -59,27 +59,12 @@
 #define KMDI_RESIZE_BOTTOMRIGHT (8|4)
 
 #include "filenew.xpm"
-#include "win_closebutton.xpm"
-#include "win_minbutton.xpm"
 #include "win_maxbutton.xpm"
-#include "win_restorebutton.xpm"
-#include "win_undockbutton.xpm"
-#include "kde_closebutton.xpm"
-#include "kde_minbutton.xpm"
 #include "kde_maxbutton.xpm"
-#include "kde_restorebutton.xpm"
-#include "kde_undockbutton.xpm"
-#include "kde2_closebutton.xpm"
-#include "kde2_minbutton.xpm"
 #include "kde2_maxbutton.xpm"
-#include "kde2_restorebutton.xpm"
-#include "kde2_undockbutton.xpm"
-#include "kde2laptop_closebutton.xpm"
-#include "kde2laptop_minbutton.xpm"
 #include "kde2laptop_maxbutton.xpm"
-#include "kde2laptop_restorebutton.xpm"
-#include "kde2laptop_undockbutton.xpm"
 
+#include "kmdi_pixmaps.h"
 
 KMdiWin32IconButton::KMdiWin32IconButton( QWidget* parent, const char* name)
   : QLabel( parent, name)
Index: kmdimainfrm.cpp
===================================================================
RCS file: /home/kde/kdelibs/kmdi/kmdimainfrm.cpp,v
retrieving revision 1.3
diff -p -u -r1.3 kmdimainfrm.cpp
--- kmdimainfrm.cpp	24 May 2003 22:57:21 -0000	1.3
+++ kmdimainfrm.cpp	27 May 2003 14:06:01 -0000
@@ -56,23 +56,7 @@
 #include "kmdichildarea.h"
 #include "kmdichildview.h"
 
-#include "win_undockbutton.xpm"
-#include "win_minbutton.xpm"
-#include "win_restorebutton.xpm"
-#include "win_closebutton.xpm"
-#include "kde_undockbutton.xpm"
-#include "kde_minbutton.xpm"
-#include "kde_restorebutton.xpm"
-#include "kde_closebutton.xpm"
-#include "kde2_undockbutton.xpm"
-#include "kde2_minbutton.xpm"
-#include "kde2_restorebutton.xpm"
-#include "kde2_closebutton.xpm"
-#include "kde2laptop_undockbutton.xpm"
-#include "kde2laptop_minbutton.xpm"
-#include "kde2laptop_restorebutton.xpm"
-#include "kde2laptop_closebutton.xpm"
-#include "kde2laptop_closebutton_menu.xpm"
+#include "kmdi_pixmaps.h"
 
 #ifndef NO_KDE
 #include <X11/X.h>


-- 
Luciano Montanaro// My public GPG key can be  /"\ ASCII RIBBON
               \X/ found at wwwkeys.pgp.net   \ /   CAMPAIGN
                                               X  AGAINST HTML 
                                              / \     MAIL