[patch] proposed patch to allow building with gcc 4.3

knapster2-0.5-gcc43.patch (text/plain), 9.57 KB, created by Gene Seto on 2009-01-27 01:09:10 UTC

diff -rupN knapster2-0.5b/knapster2/chat.xpm knapster2-0.5/knapster2/chat.xpm
--- knapster2-0.5b/knapster2/chat.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/chat.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * chat_xpm[] = {
+static const char * chat_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/discover.xpm knapster2-0.5/knapster2/discover.xpm
--- knapster2-0.5b/knapster2/discover.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/discover.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * discover_xpm[] = {
+static const char * discover_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/home.xpm knapster2-0.5/knapster2/home.xpm
--- knapster2-0.5b/knapster2/home.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/home.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * home_xpm[] = {
+static const char * home_xpm[] = {
 "16 16 17 1",
 " 	c None",
 ".	c #2F1510",
diff -rupN knapster2-0.5b/knapster2/hotlist.xpm knapster2-0.5/knapster2/hotlist.xpm
--- knapster2-0.5b/knapster2/hotlist.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/hotlist.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * hotlist_xpm[] = {
+static const char * hotlist_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #FF0000",
diff -rupN knapster2-0.5b/knapster2/knap_listview.cpp knapster2-0.5/knapster2/knap_listview.cpp
--- knapster2-0.5b/knapster2/knap_listview.cpp	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/knap_listview.cpp	2009-01-26 01:45:44.000000000 -0400
@@ -27,7 +27,8 @@
 #include <qheader.h>
 #include <qstring.h>
 
-#include <iostream.h>
+#include <iostream>
+#include <cstdlib>
 //#include <stdlib.h>
 
 static int stricmp(const char *s1, const char *s2)
diff -rupN knapster2-0.5b/knapster2/knapster2.xpm knapster2-0.5/knapster2/knapster2.xpm
--- knapster2-0.5b/knapster2/knapster2.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/knapster2.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char*knapster[]={
+static const char*knapster[]={
 "32 31 60 1",
 "j c #3266fb",
 "D c #162364",
diff -rupN knapster2-0.5b/knapster2/mini-knapster2.xpm knapster2-0.5/knapster2/mini-knapster2.xpm
--- knapster2-0.5b/knapster2/mini-knapster2.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/mini-knapster2.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char*mini_knapster2_xpm[]={
+static const char*mini_knapster2_xpm[]={
 "16 16 33 1",
 "d c #3266fb",
 "r c #02cbcc",
diff -rupN knapster2-0.5b/knapster2/mp3.xpm knapster2-0.5/knapster2/mp3.xpm
--- knapster2-0.5b/knapster2/mp3.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/mp3.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * mp3_xpm[] = {
+static const char * mp3_xpm[] = {
 "16 16 6 1",
 " 	c None",
 ".	c #808080",
diff -rupN knapster2-0.5b/knapster2/nextbtn.xpm knapster2-0.5/knapster2/nextbtn.xpm
--- knapster2-0.5b/knapster2/nextbtn.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/nextbtn.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * nextbtn_xpm[] = {
+static const char * nextbtn_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/pausebtn.xpm knapster2-0.5/knapster2/pausebtn.xpm
--- knapster2-0.5b/knapster2/pausebtn.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/pausebtn.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * pausebtn_xpm[] = {
+static const char * pausebtn_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/playbtn.xpm knapster2-0.5/knapster2/playbtn.xpm
--- knapster2-0.5b/knapster2/playbtn.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/playbtn.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * playbtn_xpm[] = {
+static const char * playbtn_xpm[] = {
 "16 16 34 1",
 " 	c None",
 ".	c #010000",
diff -rupN knapster2-0.5b/knapster2/prefs_color.xpm knapster2-0.5/knapster2/prefs_color.xpm
--- knapster2-0.5b/knapster2/prefs_color.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/prefs_color.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * prefs_color_xpm[] = {
+static const char * prefs_color_xpm[] = {
 "48 48 128 2",
 "  	c None",
 ". 	c #000000",
diff -rupN knapster2-0.5b/knapster2/prefs_connect.xpm knapster2-0.5/knapster2/prefs_connect.xpm
--- knapster2-0.5b/knapster2/prefs_connect.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/prefs_connect.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * prefs_connect_xpm[] = {
+static const char * prefs_connect_xpm[] = {
 "48 48 206 2",
 "  	c None",
 ". 	c #000000",
diff -rupN knapster2-0.5b/knapster2/prefs_library.xpm knapster2-0.5/knapster2/prefs_library.xpm
--- knapster2-0.5b/knapster2/prefs_library.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/prefs_library.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * prefs_library_xpm[] = {
+static const char * prefs_library_xpm[] = {
 "48 48 5 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/prefs_misc.xpm knapster2-0.5/knapster2/prefs_misc.xpm
--- knapster2-0.5b/knapster2/prefs_misc.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/prefs_misc.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * prefs_misc_xpm[] = {
+static const char * prefs_misc_xpm[] = {
 "48 48 246 2",
 "  	c None",
 ". 	c #020200",
diff -rupN knapster2-0.5b/knapster2/prefs_uploads.xpm knapster2-0.5/knapster2/prefs_uploads.xpm
--- knapster2-0.5b/knapster2/prefs_uploads.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/prefs_uploads.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * prefs_uploads_xpm[] = {
+static const char * prefs_uploads_xpm[] = {
 "48 48 128 2",
 "  	c None",
 ". 	c #2E2E2E",
diff -rupN knapster2-0.5b/knapster2/prefs_user.xpm knapster2-0.5/knapster2/prefs_user.xpm
--- knapster2-0.5b/knapster2/prefs_user.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/prefs_user.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * prefs_user_xpm[] = {
+static const char * prefs_user_xpm[] = {
 "48 48 30 1",
 " 	c None",
 ".	c #AEAEAE",
diff -rupN knapster2-0.5b/knapster2/prevbtn.xpm knapster2-0.5/knapster2/prevbtn.xpm
--- knapster2-0.5b/knapster2/prevbtn.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/prevbtn.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * prevbtn_xpm[] = {
+static const char * prevbtn_xpm[] = {
 "16 16 5 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/search.xpm knapster2-0.5/knapster2/search.xpm
--- knapster2-0.5b/knapster2/search.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/search.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * search_xpm[] = {
+static const char * search_xpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/speedaverage.xpm knapster2-0.5/knapster2/speedaverage.xpm
--- knapster2-0.5b/knapster2/speedaverage.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/speedaverage.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * speedaverage_xpm[] = {
+static const char * speedaverage_xpm[] = {
 "16 16 7 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/speedbad.xpm knapster2-0.5/knapster2/speedbad.xpm
--- knapster2-0.5b/knapster2/speedbad.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/speedbad.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * speedbad_xpm[] = {
+static const char * speedbad_xpm[] = {
 "16 16 7 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/speedgood.xpm knapster2-0.5/knapster2/speedgood.xpm
--- knapster2-0.5b/knapster2/speedgood.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/speedgood.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * speedgood_xpm[] = {
+static const char * speedgood_xpm[] = {
 "16 16 7 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/speedvgood.xpm knapster2-0.5/knapster2/speedvgood.xpm
--- knapster2-0.5b/knapster2/speedvgood.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/speedvgood.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * speedvgood_xpm[] = {
+static const char * speedvgood_xpm[] = {
 "16 16 7 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/stopbtn.xpm knapster2-0.5/knapster2/stopbtn.xpm
--- knapster2-0.5b/knapster2/stopbtn.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/stopbtn.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * stopbtn_xpm[] = {
+static const char * stopbtn_xpm[] = {
 "16 16 3 1",
 " 	c None",
 ".	c #000000",
diff -rupN knapster2-0.5b/knapster2/transfer.xpm knapster2-0.5/knapster2/transfer.xpm
--- knapster2-0.5b/knapster2/transfer.xpm	2009-01-26 01:45:00.000000000 -0400
+++ knapster2-0.5/knapster2/transfer.xpm	2009-01-26 01:51:51.000000000 -0400
@@ -1,5 +1,5 @@
 /* XPM */
-static char * transfer_xpm[] = {
+static const char * transfer_xpm[] = {
 "16 16 4 1",
 " 	c None",
 ".	c #000000",