Attachment 623502 Details for Bug 844070 – removes gcc warnings about conversions from const char* to char*

[patch] removes gcc warnings about conversions from const char* to char*

alsamixer-dockapp-const.patch (text/plain), 2.56 KB, created by Martin Gieseking on 2012-10-08 15:13:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Gieseking

Created: 2012-10-08 15:13:03 UTC

Size: 2.56 KB

patch

obsolete

>diff --git a/Mixer.cc b/Mixer.cc
>--- a/Mixer.cc
>+++ b/Mixer.cc
>@@ -66,10 +66,10 @@
>    Atom       deleteWindow;
>    Xpm*       image;
>    char*      displayName = NULL;
>-   char*      card = "default";
>+   const char* card = "default";
> 
>    mError = 0;
>-   mInstanceName = INSTANCENAME;
>+   mInstanceName = const_cast<char*>(INSTANCENAME);
>    mVolumeSource[0] = -1;
>    mVolumeSource[1] = -1;
>    mVolumeSource[2] = -1;
>@@ -231,7 +231,7 @@
> 
>    // Set classhint
>    classHint.res_name =  mInstanceName;
>-   classHint.res_class = CLASSNAME;
>+   classHint.res_class = const_cast<char*>(CLASSNAME);
>    XSetClassHint(mDisplay, mAppWin, &classHint);
> 
>    // Create delete atom
>diff --git a/Xpm.cc b/Xpm.cc
>--- a/Xpm.cc
>+++ b/Xpm.cc
>@@ -30,14 +30,14 @@
> 
> using namespace std;
> 
>-Xpm::Xpm(Display* display, Window root, char** data) 
>+Xpm::Xpm(Display* display, Window root, const char** data) 
> {
>    int error;
> 
>    mDisplay = display;
> 
>    mAttributes.valuemask = 0;
>-   error = XpmCreatePixmapFromData(mDisplay, root, data, &mImage, &mMask, &mAttributes);
>+   error = XpmCreatePixmapFromData(mDisplay, root, const_cast<char**>(data), &mImage, &mMask, &mAttributes);
> 
>    switch (error) {
>    case XpmColorError:
>diff --git a/Xpm.h b/Xpm.h
>--- a/Xpm.h
>+++ b/Xpm.h
>@@ -28,7 +28,7 @@
> class Xpm 
> {
> public:
>-   Xpm(Display* display, Window root, char** data);
>+   Xpm(Display* display, Window root, const char** data);
>    virtual ~Xpm();
>    void setWindowPixmap(Window win);
>    void setWindowPixmapShaped(Window win);
>diff --git a/skins/default/button.xpm b/skins/default/button.xpm
>--- a/skins/default/button.xpm
>+++ b/skins/default/button.xpm
>@@ -1,5 +1,5 @@
> /* XPM */
>-static char * button_xpm[] = {
>+static const char * button_xpm[] = {
> "16 9 17 1",
> " 	c None",
> ".	c #B7BAC7",
>diff --git a/skins/default/main.xpm b/skins/default/main.xpm
>--- a/skins/default/main.xpm
>+++ b/skins/default/main.xpm
>@@ -1,5 +1,5 @@
> /* XPM */
>-static char * main_xpm[] = {
>+static const char * main_xpm[] = {
> "64 64 194 2",
> "  	c None",
> ". 	c #000000",
>diff --git a/skins/default/mutebutton.xpm b/skins/default/mutebutton.xpm
>--- a/skins/default/mutebutton.xpm
>+++ b/skins/default/mutebutton.xpm
>@@ -1,5 +1,5 @@
> /* XPM */
>-static char * mutebutton_xpm[] = {
>+static const char * mutebutton_xpm[] = {
> "16 9 18 1",
> " 	c None",
> ".	c #B7BAC7",
>diff --git a/skins/default/redlight.xpm b/skins/default/redlight.xpm
>--- a/skins/default/redlight.xpm
>+++ b/skins/default/redlight.xpm
>@@ -1,5 +1,5 @@
> /* XPM */
>-static char * redlight_xpm[] = {
>+static const char * redlight_xpm[] = {
> "3 2 2 1",
> " 	c None",
> ".	c #FF0000",

Actions: View | Diff

Attachments on bug 844070: 623502