[haiku-commits] r38205 - haiku/trunk/src/preferences/joysticks

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 17 Aug 2010 20:08:38 +0200 (CEST)

Author: zooey
Date: 2010-08-17 20:08:38 +0200 (Tue, 17 Aug 2010)
New Revision: 38205
Changeset: http://dev.haiku-os.org/changeset/38205

Modified:
   haiku/trunk/src/preferences/joysticks/Jamfile
   haiku/trunk/src/preferences/joysticks/JoyWin.cpp
   haiku/trunk/src/preferences/joysticks/PortItem.cpp
Log:
* of course, gcc4 had more issues with the Joystick preflet

Modified: haiku/trunk/src/preferences/joysticks/Jamfile
===================================================================
--- haiku/trunk/src/preferences/joysticks/Jamfile       2010-08-17 18:03:12 UTC 
(rev 38204)
+++ haiku/trunk/src/preferences/joysticks/Jamfile       2010-08-17 18:08:38 UTC 
(rev 38205)
@@ -8,7 +8,7 @@
        Joysticks.cpp
        MessageWin.cpp
        PortItem.cpp
-       : be libdevice.so
+       : be libdevice.so $(TARGET_LIBSUPC++)
        : Joysticks.rdef
        ;
 

Modified: haiku/trunk/src/preferences/joysticks/JoyWin.cpp
===================================================================
--- haiku/trunk/src/preferences/joysticks/JoyWin.cpp    2010-08-17 18:03:12 UTC 
(rev 38204)
+++ haiku/trunk/src/preferences/joysticks/JoyWin.cpp    2010-08-17 18:08:38 UTC 
(rev 38205)
@@ -191,7 +191,7 @@
                                }
                        } else {
                                fConControllerL->DeselectAll();
-                               ShowMessage(SELECTGAMEPORTFIRST);
+                               ShowMessage((char*)SELECTGAMEPORTFIRST);
                        }
                break;
                }
@@ -204,7 +204,7 @@
                                //printf("invoke.. inte null\n");
                                _PerformProbe(item->Text());
                        } else
-                               ShowMessage(SELECTGAMEPORTFIRST);
+                               ShowMessage((char*)SELECTGAMEPORTFIRST);
                break;
                }
 
@@ -233,7 +233,7 @@
                                        
dir->CreateSymLink(strLinkPlace.String(),
                                                strLinkTo.String(), NULL);
                                } else
-                                       ShowMessage(SELECTGAMEPORTFIRST);
+                                       ShowMessage((char*)SELECTGAMEPORTFIRST);
                        }
 
                        fSystemUsedSelect = false;
@@ -256,7 +256,7 @@
                                        */
                                }
                        } else
-                               ShowMessage(SELECTGAMEPORTFIRST);
+                               ShowMessage((char*)SELECTGAMEPORTFIRST);
                break;
                }
                default:
@@ -276,8 +276,8 @@
 
 //---------------------- Private ---------------------------------//
 status_t
-JoyWin::_AddToList(BListView *list, uint32 command,
-       const char* rootPath, BEntry *rootEntry = NULL)
+JoyWin::_AddToList(BListView *list, uint32 command, const char* rootPath,
+       BEntry *rootEntry)
 {
        BDirectory root;
 

Modified: haiku/trunk/src/preferences/joysticks/PortItem.cpp
===================================================================
--- haiku/trunk/src/preferences/joysticks/PortItem.cpp  2010-08-17 18:03:12 UTC 
(rev 38204)
+++ haiku/trunk/src/preferences/joysticks/PortItem.cpp  2010-08-17 18:08:38 UTC 
(rev 38205)
@@ -3,7 +3,7 @@
  * Distributed under the terms of the MIT License.
  *
  * Authors:
- *             Fredrik Modéen                  fredrik@xxxxxxxxx 
+ *             Fredrik Modéen                  fredrik@xxxxxxxxx
  */
 
 #include "PortItem.h"
@@ -17,7 +17,7 @@
 {}
 
 void
-PortItem::DrawItem(BView *owner, BRect frame, bool complete = false)
+PortItem::DrawItem(BView *owner, BRect frame, bool complete)
 {
        BStringItem::DrawItem(owner, frame, complete);
 }
@@ -32,7 +32,7 @@
 BString
 PortItem::GetJoystickName()
 {
-       return fSelectedJoystick;       
+       return fSelectedJoystick;
 }
 
 
@@ -40,5 +40,5 @@
 PortItem::SetJoystickName(BString str)
 {
        fOldSelectedJoystick = fSelectedJoystick;
-       fSelectedJoystick = str;        
+       fSelectedJoystick = str;
 }


Other related posts:

  • » [haiku-commits] r38205 - haiku/trunk/src/preferences/joysticks - zooey