From Preetpal Kaur <preetpalok123@xxxxxxxxx>:
Preetpal Kaur has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3125 ;)
Change subject: Declare BString to get the Mouse Name
......................................................................
Declare BString to get the Mouse Name
Change-Id: I3476f58839202a6fd8c93e325a15045963a9b7b2
---
M src/preferences/input/MouseSettings.cpp
M src/preferences/input/MouseSettings.h
2 files changed, 18 insertions(+), 7 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/25/3125/1
diff --git a/src/preferences/input/MouseSettings.cpp
b/src/preferences/input/MouseSettings.cpp
index 9363d4a..a7adc57 100644
--- a/src/preferences/input/MouseSettings.cpp
+++ b/src/preferences/input/MouseSettings.cpp
@@ -29,10 +29,13 @@
static const bool kDefaultAcceptFirstClick = true;
-MouseSettings::MouseSettings()
+MouseSettings::MouseSettings(BString name)
:
fWindowPosition(-1, -1)
{
+ fname = name;
+ fprintf(stderr, "DEBUG_MOUSE->PREF->MouseSettings constructor: %s \n",
+ fname.String());
_RetrieveSettings();
fOriginalSettings = fSettings;
@@ -41,10 +44,11 @@
fOriginalAcceptFirstClick = fAcceptFirstClick;
}
-MouseSettings::MouseSettings(mouse_settings settings)
+MouseSettings::MouseSettings(mouse_settings settings, BString name)
:
fSettings(settings)
{
+ fname = name;
#ifdef DEBUG
Dump();
@@ -59,6 +63,8 @@
MouseSettings::~MouseSettings()
{
+ fprintf(stderr, "DEBUG_MOUSE->PREF->~MouseSettings deconstructor: %s
\n",
+ fname.String());
}
@@ -438,7 +444,7 @@
while (message.FindString("mouseDevice", i, &deviceName) ==
B_OK) {
message.FindData("mouseSettings", B_ANY_TYPE, i,
(const void**)&settings, &size);
- MouseSettings* mouseSettings = new
MouseSettings(*settings);
+ MouseSettings* mouseSettings = new
MouseSettings(*settings, deviceName);
fMouseSettingsObject.insert(std::pair<BString,
MouseSettings*>
(deviceName, mouseSettings));
i++;
@@ -448,7 +454,9 @@
else {
IsRetrievedSettingsDeprecated = true;
- fDeprecatedMouseSettings = new MouseSettings();
+ BString* s = new BString("");
+
+ fDeprecatedMouseSettings = new MouseSettings(*s);
fDeprecatedMouseSettings->_RetrieveSettings();
}
}
@@ -527,6 +535,7 @@
(*fDeprecatedMouseSettings);
if (RetrievedSettings != NULL) {
+ RetrievedSettings->fname = mouse_name;
fMouseSettingsObject.insert(std::pair<BString,
MouseSettings*>
(mouse_name, RetrievedSettings));
@@ -540,7 +549,7 @@
if (itr != fMouseSettingsObject.end())
return GetMouseSettings(mouse_name);
- MouseSettings* settings = new (std::nothrow) MouseSettings();
+ MouseSettings* settings = new (std::nothrow) MouseSettings(mouse_name);
if(settings !=NULL) {
fMouseSettingsObject.insert(std::pair<BString, MouseSettings*>
diff --git a/src/preferences/input/MouseSettings.h
b/src/preferences/input/MouseSettings.h
index 96459d6..b8284a5 100644
--- a/src/preferences/input/MouseSettings.h
+++ b/src/preferences/input/MouseSettings.h
@@ -19,6 +19,7 @@
#include <InterfaceDefs.h>
#include <Point.h>
#include <SupportDefs.h>
+#include <String.h>
#include "kb_mouse_settings.h"
@@ -27,8 +28,9 @@
class MouseSettings {
public:
- MouseSettings();
- MouseSettings(mouse_settings settings);
+ BString fname;
+ MouseSettings(BString name);
+ MouseSettings(mouse_settings settings, BString name);
~MouseSettings();
void Revert();
--
To view, visit https://review.haiku-os.org/c/haiku/+/3125
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I3476f58839202a6fd8c93e325a15045963a9b7b2
Gerrit-Change-Number: 3125
Gerrit-PatchSet: 1
Gerrit-Owner: Preetpal Kaur <preetpalok123@xxxxxxxxx>
Gerrit-MessageType: newchange
