use long instead of int where pointers are casted

diff --git a/lib/driver/rc.cpp b/lib/driver/rc.cpp
index 43c1f2b2e6aaf5d66a50193131f647835b218875..d943352a1588bb1e2d5117ff50e1efbb42ff5231 100644 (file)
--- a/lib/driver/rc.cpp
+++ b/lib/driver/rc.cpp
@@ -102,7 +102,7 @@ void eRCInputEventDriver::keyPressed(int)
                        break;
                if (enabled && !input->islocked())
                        for (std::list<eRCDevice*>::iterator i(listeners.begin()); i!=listeners.end(); ++i)
                        break;
                if (enabled && !input->islocked())
                        for (std::list<eRCDevice*>::iterator i(listeners.begin()); i!=listeners.end(); ++i)

-                               (*i)->handleCode((int)&ev);
+                               (*i)->handleCode((long)&ev);

        }
 }
 
        }
 }
 

diff --git a/lib/driver/rc.h b/lib/driver/rc.h
index 909ebaee706ff5c831612ea469c343be8a4fbd56..2a776ee4d5e0ec35bf1fc9789a4a4e1c7ae62581 100644 (file)
--- a/lib/driver/rc.h
+++ b/lib/driver/rc.h
@@ -41,7 +41,7 @@ public:
         * For Example, it might be 16bit codes with one bit make/break or special codes
         * for repeat.
         */
         * For Example, it might be 16bit codes with one bit make/break or special codes
         * for repeat.
         */

-       virtual void handleCode(int code)=0;
+       virtual void handleCode(long code)=0;

        /**
         * \brief Get user readable description.
         * \result The description.
        /**
         * \brief Get user readable description.
         * \result The description.

diff --git a/lib/driver/rcconsole.cpp b/lib/driver/rcconsole.cpp
index 7a625ffcfdc7312ca5bf22d9faacc03d07404517..53630ca96502c7dcc3335935870e76ab3264da13 100644 (file)
--- a/lib/driver/rcconsole.cpp
+++ b/lib/driver/rcconsole.cpp
@@ -90,7 +90,7 @@ void eRCConsoleDriver::keyPressed(int)
        }
 }
 
        }
 }
 

-void eRCConsole::handleCode(int code)
+void eRCConsole::handleCode(long code)

 {
        input->keyPressed(eRCKey(this, code, eRCKey::flagAscii));
 }
 {
        input->keyPressed(eRCKey(this, code, eRCKey::flagAscii));
 }

diff --git a/lib/driver/rcconsole.h b/lib/driver/rcconsole.h
index 0c1dd636f308443e1b696a69658e1cadf638e749..4af2a4c2134d80442f057163d0538800524290b4 100644 (file)
--- a/lib/driver/rcconsole.h
+++ b/lib/driver/rcconsole.h
@@ -35,7 +35,7 @@ public:
 class eRCConsole: public eRCDevice
 {
 public:
 class eRCConsole: public eRCDevice
 {
 public:

-       void handleCode(int code);
+       void handleCode(long code);

        eRCConsole(eRCDriver *driver);
        const char *getDescription() const;
        const char *getKeyDescription(const eRCKey &key) const;
        eRCConsole(eRCDriver *driver);
        const char *getDescription() const;
        const char *getKeyDescription(const eRCKey &key) const;

diff --git a/lib/driver/rcinput.cpp b/lib/driver/rcinput.cpp
index 107b337be95ae40deb7b9434f55afc88bd7fd84e..d10d94f3a8d251ab17a34ac9e0b22cd547e0f04c 100644 (file)
--- a/lib/driver/rcinput.cpp
+++ b/lib/driver/rcinput.cpp
@@ -11,7 +11,7 @@
 #include <lib/base/init_num.h>
 #include <lib/driver/input_fake.h>
 
 #include <lib/base/init_num.h>
 #include <lib/driver/input_fake.h>
 

-void eRCDeviceInputDev::handleCode(int rccode)
+void eRCDeviceInputDev::handleCode(long rccode)

 {
        struct input_event *ev = (struct input_event *)rccode;
        if (ev->type!=EV_KEY)
 {
        struct input_event *ev = (struct input_event *)rccode;
        if (ev->type!=EV_KEY)

diff --git a/lib/driver/rcinput.h b/lib/driver/rcinput.h
index 2e288baaa20cbd9f42921138bfeb7f909b173224..c7f56975cd31b18f93cf42efc7252d9b079afd53 100644 (file)
--- a/lib/driver/rcinput.h
+++ b/lib/driver/rcinput.h
@@ -7,7 +7,7 @@ class eRCDeviceInputDev: public eRCDevice
 {
        int iskeyboard;
 public:
 {
        int iskeyboard;
 public:

-       void handleCode(int code);
+       void handleCode(long code);

        eRCDeviceInputDev(eRCInputEventDriver *driver);
        const char *getDescription() const;
 };
        eRCDeviceInputDev(eRCInputEventDriver *driver);
        const char *getDescription() const;
 };

diff --git a/lib/gui/einput.cpp b/lib/gui/einput.cpp
index 30dc3f02adf840048c958866cc62811873085715..5cde53bbb579dd4d9b8f0e361dc74146ba275e59 100644 (file)
--- a/lib/gui/einput.cpp
+++ b/lib/gui/einput.cpp
@@ -94,9 +94,9 @@ int eInput::event(int event, void *data, void *data2)
        case evtAction:
                if (isVisible())
                {
        case evtAction:
                if (isVisible())
                {

-                       if ((int)data == ASCII_ACTIONS)
+                       if ((long)data == ASCII_ACTIONS)

                        {
                        {

-                               if ((int)data2 == gotAsciiCode)
+                               if ((long)data2 == gotAsciiCode)

                                {
                                        if (m_content)
                                        {
                                {
                                        if (m_content)
                                        {


@@ -105,9 +105,9 @@ int eInput::event(int event, void *data, void *data2)
                                        }
                                }
                        }
                                        }
                                }
                        }

-                       else if ((int)data == INPUT_ACTIONS)
+                       else if ((long)data == INPUT_ACTIONS)

                        {
                        {

-                               switch((int)data2)
+                               switch((long)data2)

                                {
                                case moveLeft:
                                        if (m_content)
                                {
                                case moveLeft:
                                        if (m_content)


@@ -146,8 +146,8 @@ int eInput::event(int event, void *data, void *data2)
                return 0;
        case evtKey:
        {
                return 0;
        case evtKey:
        {

-               int key = (int)data;
-               int flags = (int)data2;
+               long key = (long)data;
+               long flags = (long)data2;

                if (m_content && !(flags & 1)) // only make/repeat, no break
                        return m_content->haveKey(key, m_mode);
                break;
                if (m_content && !(flags & 1)) // only make/repeat, no break
                        return m_content->haveKey(key, m_mode);
                break;

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 73fbff3ba94a9ff1c76adf2f2c1c54326312fdc5..d4c653fe628cbda167f9c767895f7278a7818af8 100644 (file)
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -99,7 +99,7 @@ void eListbox::moveToEnd()
        }
 }
 
        }
 }
 

-void eListbox::moveSelection(int dir)
+void eListbox::moveSelection(long dir)

 {
                /* refuse to do anything without a valid list. */
        if (!m_content)
 {
                /* refuse to do anything without a valid list. */
        if (!m_content)


@@ -360,7 +360,7 @@ int eListbox::event(int event, void *data, void *data2)
        case evtAction:
                if (isVisible())
                {
        case evtAction:
                if (isVisible())
                {

-                       moveSelection((int)data2);
+                       moveSelection((long)data2);

                        return 1;
                }
                return 0;
                        return 1;
                }
                return 0;

diff --git a/lib/gui/elistbox.h b/lib/gui/elistbox.h
index da661670ef40025833e4becf2767397029faa645..102e50fbaac7cf2f493154c372169ecab7cd2934 100644 (file)
--- a/lib/gui/elistbox.h
+++ b/lib/gui/elistbox.h
@@ -102,7 +102,7 @@ public:
        }; */
 
        int getCurrentIndex();
        }; */
 
        int getCurrentIndex();

-       void moveSelection(int how);
+       void moveSelection(long how);

        void moveSelectionTo(int index);
        void moveToEnd();
        bool atBegin();
        void moveSelectionTo(int index);
        void moveToEnd();
        bool atBegin();